Mercurial > vim

diff src/os_win32.c @ 12074:ca55e69d9d1b v8.0.0917

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.0917: MS-Windows:CTRL-C handling in terminal window is wrong commit https://github.com/vim/vim/commit/589b1109c55409baf27f79920d8ffc95111eaa01 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Aug 12 16:39:05 2017 +0200 patch 8.0.0917: MS-Windows:CTRL-C handling in terminal window is wrong 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)
author Christian Brabandt <cb@256bit.org>
date Sat, 12 Aug 2017 16:45:04 +0200
parents 8ad282dee649
children d3732b29ac5f
line wrap: on
line diff
--- 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 */