Skip to content

W
wine-winehq
Commit ac3a684d authored by Hugh McMaster's avatar Hugh McMaster Committed by Alexandre Julliard
Browse files
Options

kernel32: Reset insert key toggle when Insert Mode changes.

parent 52e68a78
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 1 deletion
dlls/kernel32/editline.c
View file @ ac3a684d
...@@ -913,7 +913,7 @@ WCHAR* CONSOLE_Readline(HANDLE hConsoleIn, BOOL can_pos_cursor) ...@@ -913,7 +913,7 @@ WCHAR* CONSOLE_Readline(HANDLE hConsoleIn, BOOL can_pos_cursor)
const KeyEntry* ke; const KeyEntry* ke;
unsigned ofs; unsigned ofs;
void (*func)(struct WCEL_Context* ctx); void (*func)(struct WCEL_Context* ctx);
DWORD mode, ks; DWORD mode, input_mode, ks;
int use_emacs; int use_emacs;
memset(&ctx, 0, sizeof(ctx)); memset(&ctx, 0, sizeof(ctx));
...@@ -928,6 +928,7 @@ WCHAR* CONSOLE_Readline(HANDLE hConsoleIn, BOOL can_pos_cursor) ...@@ -928,6 +928,7 @@ WCHAR* CONSOLE_Readline(HANDLE hConsoleIn, BOOL can_pos_cursor)
!GetConsoleScreenBufferInfo(ctx.hConOut, &ctx.csbi)) !GetConsoleScreenBufferInfo(ctx.hConOut, &ctx.csbi))
return NULL; return NULL;
if (!GetConsoleMode(hConsoleIn, &mode)) mode = 0; if (!GetConsoleMode(hConsoleIn, &mode)) mode = 0;
input_mode = mode;
ctx.shall_echo = (mode & ENABLE_ECHO_INPUT) ? 1 : 0; ctx.shall_echo = (mode & ENABLE_ECHO_INPUT) ? 1 : 0;
ctx.insert = (mode & (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS)) == (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS) ? 1 : 0; ctx.insert = (mode & (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS)) == (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS) ? 1 : 0;
if (!GetConsoleMode(ctx.hConOut, &mode)) mode = 0; if (!GetConsoleMode(ctx.hConOut, &mode)) mode = 0;
...@@ -982,6 +983,11 @@ WCHAR* CONSOLE_Readline(HANDLE hConsoleIn, BOOL can_pos_cursor) ...@@ -982,6 +983,11 @@ WCHAR* CONSOLE_Readline(HANDLE hConsoleIn, BOOL can_pos_cursor)
} }
GetConsoleMode(hConsoleIn, &mode); GetConsoleMode(hConsoleIn, &mode);
if (input_mode != mode)
{
input_mode = mode;
ctx.insertkey = 0;
}
ctx.insert = (mode & (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS)) == ctx.insert = (mode & (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS)) ==
(ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS); (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS);
if (ctx.insertkey) if (ctx.insertkey)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment