JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* fhandler_console.cc (fhandler_console::read): Detect AltGr more

Browse Source 
robustly on WinNT.
This commit is contained in:
Corinna Vinschen
2001-06-22 20:08:06 +00:00
parent b643afa4c7
commit 26da27a5f6
2 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@@ -1,3 +1,8 @@
Thu Jun 21 22:01:39 2001 Marius Gedminas <mgedmin@delfi.lt>
* fhandler_console.cc (fhandler_console::read): Detect AltGr more
robustly on WinNT.
2001-06-22 Robert COllins <rbbtcollins@hotmail.com> 2001-06-22 Robert COllins <rbbtcollins@hotmail.com>
* thread.cc (__pthread_cond_timedwait): Lock the waiting mutex before * thread.cc (__pthread_cond_timedwait): Lock the waiting mutex before

22
winsup/cygwin/fhandler_console.cc
View File

@@ -289,6 +289,8 @@ fhandler_console::read (void *pv, size_t buflen)
#define ich (input_rec.Event.KeyEvent.uChar.AsciiChar) #define ich (input_rec.Event.KeyEvent.uChar.AsciiChar)
#define wch (input_rec.Event.KeyEvent.uChar.UnicodeChar) #define wch (input_rec.Event.KeyEvent.uChar.UnicodeChar)
#define ALT_PRESSED (LEFT_ALT_PRESSED | RIGHT_ALT_PRESSED)
#define CTRL_PRESSED (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)
if (wch == 0 || if (wch == 0 ||
/* arrow/function keys */ /* arrow/function keys */
@@ -306,8 +308,22 @@ fhandler_console::read (void *pv, size_t buflen)
converting a CTRL-U. */ converting a CTRL-U. */
if ((unsigned char)ich > 0x7f) if ((unsigned char)ich > 0x7f)
con_to_str (tmp + 1, tmp + 1, 1); con_to_str (tmp + 1, tmp + 1, 1);
/* Determine if the keystroke is modified by META. */ /* Determine if the keystroke is modified by META. The tricky
if (!(input_rec.Event.KeyEvent.dwControlKeyState & meta_mask)) part is to distinguish whether the right Alt key should be
recognized as Alt, or as AltGr. */
bool meta;
if (os_being_run == winNT)
/* WinNT: AltGr is reported as Ctrl+Alt, and Ctrl+Alt is
treated just like AltGr. However, if Ctrl+Alt+key generates
an ASCII control character, interpret is as META. */
meta = (control_key_state & ALT_PRESSED) != 0
&& ((control_key_state & CTRL_PRESSED) == 0
|| (ich >= 0 && ich <= 0x1f || ich == 0x7f));
else
/* Win9x: there's no way to distinguish Alt from AltGr, so rely
on meta_mask heuristic (see fhandler_console constructor). */
meta = (control_key_state & meta_mask) != 0;
if (!meta)
toadd = tmp + 1; toadd = tmp + 1;
else else
{ {
@@ -319,6 +335,8 @@ fhandler_console::read (void *pv, size_t buflen)
} }
#undef ich #undef ich
#undef wch #undef wch
#undef ALT_PRESSED
#undef CTRL_PRESSED
break; break;
case MOUSE_EVENT: case MOUSE_EVENT: