From 2aba0bc798f1b36537d0bf7d3c62b90c3c66b163 Mon Sep 17 00:00:00 2001 From: corinna Date: Fri, 24 Jun 2011 08:25:18 +0000 Subject: [PATCH] * fhandler_console.cc (fhandler_console::read): Don't generate ^@ on Ctrl+Alt+Space. --- winsup/cygwin/ChangeLog | 5 +++++ winsup/cygwin/fhandler_console.cc | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 6b9d56f1f5..bd87fd394a 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2011-06-24 Corinna Vinschen + + * fhandler_console.cc (fhandler_console::read): Don't generate ^@ on + Ctrl+Alt+Space. + 2011-06-22 Corinna Vinschen * fhandler_tty.cc (fhandler_pty_master::setup): Create pty pipes diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc index ce036a361c..eb4a41f163 100644 --- a/winsup/cygwin/fhandler_console.cc +++ b/winsup/cygwin/fhandler_console.cc @@ -457,7 +457,8 @@ restart: } /* Allow Ctrl-Space to emit ^@ */ else if (input_rec.Event.KeyEvent.wVirtualKeyCode == VK_SPACE - && (control_key_state & CTRL_PRESSED)) + && (control_key_state & CTRL_PRESSED) + && !(control_key_state & ALT_PRESSED)) toadd = ""; else if (wch == 0 /* arrow/function keys */ -- 2.11.0