Merge branch 'ash'

3 files changed, 97 insertions, 9 deletions

diff --git a/scripts/defconfig.mingw32 b/scripts/defconfig.mingw32
index 1669380ac..ff4b006cb 100644
--- a/scripts/defconfig.mingw32
+++ b/scripts/defconfig.mingw32
@@ -101,7 +101,7 @@ CONFIG_MD5_SIZE_VS_SPEED=2
 CONFIG_FEATURE_EDITING=y
 CONFIG_FEATURE_EDITING_MAX_LEN=1024
 # CONFIG_FEATURE_EDITING_VI is not set
-CONFIG_FEATURE_EDITING_HISTORY=0
+CONFIG_FEATURE_EDITING_HISTORY=64
 # CONFIG_FEATURE_EDITING_SAVEHISTORY is not set
 CONFIG_FEATURE_TAB_COMPLETION=y
 # CONFIG_FEATURE_USERNAME_COMPLETION is not set
diff --git a/win32/termios.c b/win32/termios.c
index 6d85ff98e..e2dc96361 100644
--- a/win32/termios.c
+++ b/win32/termios.c
@@ -12,25 +12,54 @@ int tcgetattr(int fd UNUSED_PARAM, struct termios *t UNUSED_PARAM)
 
 int64_t FAST_FUNC read_key(int fd, char *buf, int timeout UNUSED_PARAM)
 {
-        static int initialized = 0;
         HANDLE cin = GetStdHandle(STD_INPUT_HANDLE);
         INPUT_RECORD record;
-        DWORD nevent_out;
+        DWORD nevent_out, mode;
+        int ret = -1;
 
         if (fd != 0)
                 bb_error_msg_and_die("read_key only works on stdin");
         if (cin == INVALID_HANDLE_VALUE)
                 return -1;
-        if (!initialized) {
-                SetConsoleMode(cin, ENABLE_ECHO_INPUT);
-                initialized = 1;
-        }
+        GetConsoleMode(cin, &mode);
+        SetConsoleMode(cin, 0);
 
         while (1) {
                 if (!ReadConsoleInput(cin, &record, 1, &nevent_out))
-                        return -1;
+                        goto done;
                 if (record.EventType != KEY_EVENT || !record.Event.KeyEvent.bKeyDown)
                         continue;
-                return record.Event.KeyEvent.uChar.AsciiChar;
+                if (!record.Event.KeyEvent.uChar.AsciiChar) {
+                        DWORD state = record.Event.KeyEvent.dwControlKeyState;
+                        switch (record.Event.KeyEvent.wVirtualKeyCode) {
+                        case VK_DELETE: return KEYCODE_DELETE;
+                        case VK_INSERT: return KEYCODE_INSERT;
+                        case VK_UP: return KEYCODE_UP;
+                        case VK_DOWN: return KEYCODE_DOWN;
+                        case VK_RIGHT:
+                                if (state & (RIGHT_CTRL_PRESSED|LEFT_CTRL_PRESSED))
+                                        return KEYCODE_CTRL_RIGHT;
+                                return KEYCODE_RIGHT;
+                        case VK_LEFT:
+                                if (state & (RIGHT_CTRL_PRESSED|LEFT_CTRL_PRESSED))
+                                        return KEYCODE_CTRL_LEFT;
+                                return KEYCODE_LEFT;
+                        case VK_HOME: return KEYCODE_HOME;
+                        case VK_END: return KEYCODE_END;
+                        case VK_PRIOR: return KEYCODE_PAGEUP;
+                        case VK_NEXT: return KEYCODE_PAGEDOWN;
+                        case VK_CAPITAL:
+                        case VK_SHIFT:
+                        case VK_CONTROL:
+                        case VK_MENU:
+                                break;
+                        }
+                        continue;
+                }
+                ret = record.Event.KeyEvent.uChar.AsciiChar;
+                break;
         }
+ done:
+        SetConsoleMode(cin, mode);
+        return ret;
 }
diff --git a/win32/winansi.c b/win32/winansi.c
index e2e7010fb..d95bd473b 100644
--- a/win32/winansi.c
+++ b/win32/winansi.c
@@ -91,6 +91,48 @@ static void erase_in_line(void)
                 NULL);
 }
 
+static void erase_till_end_of_screen(void)
+{
+        CONSOLE_SCREEN_BUFFER_INFO sbi;
+        COORD pos;
+
+        if (!console)
+                return;
+
+        GetConsoleScreenBufferInfo(console, &sbi);
+        FillConsoleOutputCharacterA(console, ' ',
+                sbi.dwSize.X - sbi.dwCursorPosition.X, sbi.dwCursorPosition,
+                NULL);
+
+        pos.X = 0;
+        for (pos.Y = sbi.dwCursorPosition.Y+1; pos.Y < sbi.dwSize.Y; pos.Y++)
+                FillConsoleOutputCharacterA(console, ' ', sbi.dwSize.X,
+                                            pos, NULL);
+}
+
+static void move_cursor_back(int n)
+{
+        CONSOLE_SCREEN_BUFFER_INFO sbi;
+
+        if (!console)
+                return;
+
+        GetConsoleScreenBufferInfo(console, &sbi);
+        sbi.dwCursorPosition.X -= n;
+        SetConsoleCursorPosition(console, sbi.dwCursorPosition);
+}
+
+static void move_cursor(int x, int y)
+{
+        COORD pos;
+
+        if (!console)
+                return;
+
+        pos.X = x;
+        pos.Y = y;
+        SetConsoleCursorPosition(console, pos);
+}
 
 static const char *set_attr(const char *str)
 {
@@ -230,6 +272,23 @@ static const char *set_attr(const char *str)
 
                 set_console_attr();
                 break;
+        case 'D':
+                move_cursor_back(strtol(str, (char **)&str, 10));
+                break;
+        case 'H':
+                if (!len)
+                        move_cursor(0, 0);
+                else {
+                        int row = strtol(str, (char **)&str, 10);
+                        if (*str == ';') {
+                                int col = strtol(str+1, (char **)&str, 10);
+                                move_cursor(col, row);
+                        }
+                }
+                break;
+        case 'J':
+                erase_till_end_of_screen();
+                break;
         case 'K':
                 erase_in_line();
                 break;