[newlib-cygwin] Cygwin: console: fix key input for native console application

Corinna Vinschen corinna@sourceware.org
Wed Apr 3 16:46:00 GMT 2019


https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=6a06c6bc8f8492ea09aa3ae180fe94e4ac265611

commit 6a06c6bc8f8492ea09aa3ae180fe94e4ac265611
Author: Takashi Yano <takashi.yano@nifty.ne.jp>
Date:   Thu Apr 4 01:25:31 2019 +0900

    Cygwin: console: fix key input for native console application
    
    - After 24 bit color support patch, arrow keys and function keys
      do not work properly in native console applications if they
      are started in cygwin console. This patch fixes this issue.

Diff:
---
 winsup/cygwin/fhandler_console.cc | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc
index 6d42ed8..e3656a3 100644
--- a/winsup/cygwin/fhandler_console.cc
+++ b/winsup/cygwin/fhandler_console.cc
@@ -455,6 +455,15 @@ sig_exit:
 fhandler_console::input_states
 fhandler_console::process_input_message (void)
 {
+  if (wincap.has_con_24bit_colors ())
+    {
+      DWORD dwMode;
+      /* Enable xterm compatible mode in input */
+      GetConsoleMode (get_handle (), &dwMode);
+      dwMode |= ENABLE_VIRTUAL_TERMINAL_INPUT;
+      SetConsoleMode (get_handle (), dwMode);
+    }
+
   char tmp[60];
 
   if (!shared_console_info)
@@ -2881,6 +2890,14 @@ fhandler_console::fixup_after_fork_exec (bool execing)
 {
   set_unit ();
   setup_io_mutex ();
+  if (wincap.has_con_24bit_colors ())
+    {
+      DWORD dwMode;
+      /* Disable xterm compatible mode in input */
+      GetConsoleMode (get_handle (), &dwMode);
+      dwMode &= ~ENABLE_VIRTUAL_TERMINAL_INPUT;
+      SetConsoleMode (get_handle (), dwMode);
+    }
 }
 
 // #define WINSTA_ACCESS (WINSTA_READATTRIBUTES | STANDARD_RIGHTS_READ | STANDARD_RIGHTS_WRITE | WINSTA_CREATEDESKTOP | WINSTA_EXITWINDOWS)



More information about the Cygwin-cvs mailing list