From f17f20c13900f4575412b831061733d2ef9dc699 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Thu, 4 Jun 2009 09:57:34 +0000 Subject: [PATCH] * fhandler_console.cc (fhandler_console::read): Allow Ctrl-Space to emit a NUL byte. --- winsup/cygwin/ChangeLog | 6 +++++- winsup/cygwin/fhandler_console.cc | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 073c3e48e..fe3d94572 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,9 +1,13 @@ +2009-06-04 Corinna Vinschen + + * fhandler_console.cc (fhandler_console::read): Allow Ctrl-Space to + emit a NUL byte. + 2009-06-04 Dave Korn * thread.cc (__cygwin_lock_lock): Delete racy optimisation. (__cygwin_lock_unlock): Likewise. - 2009-06-03 IWAMURO Motnori * strfuncs.cc (sys_cp_mbstowcs): Fix condition. diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc index fe9307cfe..f3d26f40d 100644 --- a/winsup/cygwin/fhandler_console.cc +++ b/winsup/cygwin/fhandler_console.cc @@ -323,6 +323,10 @@ fhandler_console::read (void *pv, size_t& buflen) ? (dev_state->metabit ? "\377" : "\033\177") : "\177"; nread = strlen (toadd); } + /* Allow Ctrl-Space to emit ^@ */ + else if (input_rec.Event.KeyEvent.wVirtualKeyCode == VK_SPACE + && (control_key_state & CTRL_PRESSED)) + toadd = ""; else if (wch == 0 /* arrow/function keys */ || (input_rec.Event.KeyEvent.dwControlKeyState & ENHANCED_KEY))