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

* fhandler_console.cc: Remove VK_DIVIDE detection.

Browse Source 
(get_nonascii_key): Simplify previous patch to return ascii char if it is
non-zero.  Add a second "temporary buffer" argument to help with thread safety.
* select.cc (peek_console): Pass a temporary buffer argument to
get_nonascii_key.
This commit is contained in:
Christopher Faylor
2000-07-30 17:58:48 +00:00
parent f0a69f46bb
commit a9867e1b58
3 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/select.cc
View File

@@ -597,7 +597,7 @@ fhandler_pipe::select_except (select_record *s)
static int
peek_console (select_record *me, int ignra)
{
extern const char * get_nonascii_key (INPUT_RECORD& input_rec);
extern const char * get_nonascii_key (INPUT_RECORD& input_rec, char *);
fhandler_console *fh = (fhandler_console *)me->fh;
if (!me->read_selected)
@@ -618,6 +618,7 @@ peek_console (select_record *me, int ignra)
INPUT_RECORD irec;
DWORD events_read;
HANDLE h;
char tmpbuf[17];
set_handle_or_return_if_not_open (h, me);
for (;;)
@@ -630,7 +631,7 @@ peek_console (select_record *me, int ignra)
if (irec.EventType == WINDOW_BUFFER_SIZE_EVENT)
kill_pgrp (fh->tc->getpgid (), SIGWINCH);
else if (irec.EventType == KEY_EVENT && irec.Event.KeyEvent.bKeyDown == TRUE &&
(irec.Event.KeyEvent.uChar.AsciiChar || get_nonascii_key (irec)))
(irec.Event.KeyEvent.uChar.AsciiChar || get_nonascii_key (irec, tmpbuf)))
return me->read_ready = 1;
/* Read and discard the event */