diff options
author | Bram Moolenaar <Bram@vim.org> | 2017-08-12 16:39:05 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2017-08-12 16:39:05 +0200 |
commit | 589b1109c55409baf27f79920d8ffc95111eaa01 (patch) | |
tree | efe2a01927102431f2e5e1bb209ac4d6f03f2e4f /src/os_win32.c | |
parent | 37c45835945fc433a3bb85fcfc0b4fd58b1ee0e7 (diff) | |
download | vim-git-589b1109c55409baf27f79920d8ffc95111eaa01.tar.gz |
patch 8.0.0917: MS-Windows:CTRL-C handling in terminal window is wrongv8.0.0917
Problem: MS-Windows:CTRL-C handling in terminal window is wrong
Solution: Pass CTRL-C as a key. Turn CTRL-BREAK into a key stroke. (Yasuhiro
Matsumoto, closes #1965)
Diffstat (limited to 'src/os_win32.c')
-rw-r--r-- | src/os_win32.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/os_win32.c b/src/os_win32.c index 496f95f72..c6d9ad167 100644 --- a/src/os_win32.c +++ b/src/os_win32.c @@ -3741,6 +3741,9 @@ mch_free_acl(vim_acl_T acl) handler_routine( DWORD dwCtrlType) { + INPUT_RECORD ir; + DWORD out; + switch (dwCtrlType) { case CTRL_C_EVENT: @@ -3750,6 +3753,16 @@ handler_routine( case CTRL_BREAK_EVENT: g_fCBrkPressed = TRUE; + ctrl_break_was_pressed = TRUE; + /* ReadConsoleInput is blocking, send a key event to continue. */ + ir.EventType = KEY_EVENT; + ir.Event.KeyEvent.bKeyDown = TRUE; + ir.Event.KeyEvent.wRepeatCount = 1; + ir.Event.KeyEvent.wVirtualKeyCode = VK_CANCEL; + ir.Event.KeyEvent.wVirtualScanCode = 0; + ir.Event.KeyEvent.dwControlKeyState = 0; + ir.Event.KeyEvent.uChar.UnicodeChar = 0; + WriteConsoleInput(g_hConIn, &ir, 1, &out); return TRUE; /* fatal events: shut down gracefully */ |