thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.0.1112: test_mswin_event() can hang

Browse Source 
Problem:    test_mswin_event() can hang.
Solution:   Add the "execute" argument to process events right away.
            (Christopher Plewright, closes #11760)
This commit is contained in:
Christopher Plewright
2022-12-30 16:54:58 +00:00
committed by Bram Moolenaar
parent 96dd34e534
commit 7b0afc1d76
6 changed files with 613 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/os_win32.c
View File

@@ -1106,31 +1106,6 @@ decode_key_event(
break;
}
// special cases
if ((nModifs & CTRL) != 0 && (nModifs & ~CTRL) == 0
&& (pker->uChar.UnicodeChar == NUL
|| pker->uChar.UnicodeChar == 0xfffd))
{
// Ctrl-6 is Ctrl-^
if (pker->wVirtualKeyCode == '6')
{
*pch = Ctrl_HAT;
return TRUE;
}
// Ctrl-2 is Ctrl-@
else if (pker->wVirtualKeyCode == '2')
{
*pch = NUL;
return TRUE;
}
// Ctrl-- is Ctrl-_
else if (pker->wVirtualKeyCode == 0xBD)
{
*pch = Ctrl__;
return TRUE;
}
}
// Shift-TAB
if (pker->wVirtualKeyCode == VK_TAB && (nModifs & SHIFT_PRESSED))
{
@@ -1277,13 +1252,23 @@ encode_key_event(dict_T *args, INPUT_RECORD *ir)
ker.wVirtualKeyCode = vkCode;
win32_kbd_patch_key(&ker);
for (int i = ARRAY_LENGTH(VirtKeyMap);
--i >= 0 && !ker.uChar.UnicodeChar; )
for (int i = ARRAY_LENGTH(VirtKeyMap); i >= 0; --i)
{
if (VirtKeyMap[i].wVirtKey == vkCode)
{
ker.uChar.UnicodeChar = 0xfffd; // REPLACEMENT CHARACTER
break;
}
}
// The following are treated specially in Vim.
// Ctrl-6 is Ctrl-^
// Ctrl-2 is Ctrl-@
// Ctrl-- is Ctrl-_
if ((vkCode == 0xBD || vkCode == '2' || vkCode == '6')
&& (ker.dwControlKeyState & CTRL))
ker.uChar.UnicodeChar = 0xfffd; // REPLACEMENT CHARACTER
ir->Event.KeyEvent = ker;
vim_free(event);
}
@@ -1919,10 +1904,23 @@ test_mswin_event(char_u *event, dict_T *args)
INPUT_RECORD ir;
BOOL input_encoded = FALSE;
BOOL execute = FALSE;
if (STRCMP(event, "key") == 0)
input_encoded = encode_key_event(args, &ir);
{
execute = dict_get_bool(args, "execute", FALSE);
if (dict_has_key(args, "event"))
input_encoded = encode_key_event(args, &ir);
else if (!execute)
{
semsg(_(e_missing_argument_str), "event");
return FALSE;
}
}
else if (STRCMP(event, "mouse") == 0)
{
execute = TRUE;
input_encoded = encode_mouse_event(args, &ir);
}
else
{
semsg(_(e_invalid_value_for_argument_str_str), "event", event);
@@ -1935,8 +1933,16 @@ test_mswin_event(char_u *event, dict_T *args)
if (input_encoded)
lpEventsWritten = write_input_record_buffer(&ir, 1);
if (STRCMP(event, "mouse") == 0)
// Set flags to execute the event, ie. like feedkeys mode X.
if (execute)
{
int save_msg_scroll = msg_scroll;
// Avoid a 1 second delay when the keys start Insert mode.
msg_scroll = FALSE;
ch_log(NULL, "test_mswin_event() executing");
exec_normal(TRUE, TRUE, TRUE);
msg_scroll |= save_msg_scroll;
}
# endif
return lpEventsWritten;
@@ -2426,6 +2432,15 @@ mch_inchar(
c = tgetch(&modifiers, &ch2);
// Some chars need adjustment when the Ctrl modifier is used.
++no_reduce_keys;
c = may_adjust_key_for_ctrl(modifiers, c);
--no_reduce_keys;
// remove the SHIFT modifier for keys where it's already included,
// e.g., '(' and '*'
modifiers = may_remove_shift_modifier(modifiers, c);
if (typebuf_changed(tb_change_cnt))
{
// "buf" may be invalid now if a client put something in the