aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.0.0917: MS-Windows:CTRL-C handling in terminal window is wrong

Browse Source 
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)
This commit is contained in:
Bram Moolenaar 2017-08-12 16:39:05 +02:00
parent 37c4583594
commit 589b1109c5
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/os_win32.c
View File

@ -3741,6 +3741,9 @@ mch_free_acl(vim_acl_T acl)
handler_routine( handler_routine(
DWORD dwCtrlType) DWORD dwCtrlType)
{ {
INPUT_RECORD ir;
DWORD out;
switch (dwCtrlType) switch (dwCtrlType)
{ {
case CTRL_C_EVENT: case CTRL_C_EVENT:
@ -3750,6 +3753,16 @@ handler_routine(
case CTRL_BREAK_EVENT: case CTRL_BREAK_EVENT:
g_fCBrkPressed = TRUE; 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; return TRUE;
/* fatal events: shut down gracefully */ /* fatal events: shut down gracefully */

9
src/terminal.c
View File

@ -1207,12 +1207,8 @@ terminal_loop(void)
may_send_sigint(c, curbuf->b_term->tl_job->jv_pid, 0); may_send_sigint(c, curbuf->b_term->tl_job->jv_pid, 0);
#endif #endif
#ifdef WIN3264 #ifdef WIN3264
/* On Windows we do not know whether the job can handle CTRL-C itself /* On Windows winpty handles CTRL-C, don't send a CTRL_C_EVENT.
* or not. Therefore CTRL-C only sends a CTRL_C_EVENT to avoid killing
* the shell instead of a command running in the shell.
* Use CTRL-BREAK to kill the job. */ * Use CTRL-BREAK to kill the job. */
if (c == Ctrl_C)
mch_signal_job(curbuf->b_term->tl_job, (char_u *)"int");
if (ctrl_break_was_pressed) if (ctrl_break_was_pressed)
mch_signal_job(curbuf->b_term->tl_job, (char_u *)"kill"); mch_signal_job(curbuf->b_term->tl_job, (char_u *)"kill");
#endif #endif
@ -1544,7 +1540,8 @@ term_channel_closed(channel_T *ch)
ch_log(NULL, "terminal job finished, opening window"); ch_log(NULL, "terminal job finished, opening window");
vim_snprintf(buf, sizeof(buf), vim_snprintf(buf, sizeof(buf),
term->tl_opencmd == NULL term->tl_opencmd == NULL
? "botright sbuf %d" : term->tl_opencmd, fnum); ? "botright sbuf %d"
: (char *)term->tl_opencmd, fnum);
do_cmdline_cmd((char_u *)buf); do_cmdline_cmd((char_u *)buf);
} }
else else

2
src/version.c
View File

@ -769,6 +769,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
917,
/**/ /**/
916, 916,
/**/ /**/