libs/newlib-cygwin
libs/newlib-cygwin
4
0
Fork 0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-02-28 03:27:46 +08:00
Code Issues Projects Releases Wiki Activity

Move get_nonascii_key into fhandler_console.

Browse Source 
* fhandler.h (fhandler_console): Move get_nonascii_key() from
	select.c into this class.
	* select.cc (peek_console): Move get_nonascii_key() into
	fhandler_console class.
This commit is contained in:
John Hood 2016-01-30 17:33:36 -05:00 committed by Corinna Vinschen
parent 3bc912c02b
commit b92b47b7bc
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
winsup/cygwin/fhandler.h
View File

@ -1469,6 +1469,7 @@ private:
bool set_unit (); bool set_unit ();
static bool need_invisible (); static bool need_invisible ();
static void free_console (); static void free_console ();
static const char *get_nonascii_key (INPUT_RECORD& input_rec, char *);
fhandler_console (void *) {} fhandler_console (void *) {}

4
winsup/cygwin/fhandler_console.cc
View File

@ -46,8 +46,6 @@ details. */
#define srTop (con.b.srWindow.Top + con.scroll_region.Top) #define srTop (con.b.srWindow.Top + con.scroll_region.Top)
#define srBottom ((con.scroll_region.Bottom < 0) ? con.b.srWindow.Bottom : con.b.srWindow.Top + con.scroll_region.Bottom) #define srBottom ((con.scroll_region.Bottom < 0) ? con.b.srWindow.Bottom : con.b.srWindow.Top + con.scroll_region.Bottom)
const char *get_nonascii_key (INPUT_RECORD&, char *);
const unsigned fhandler_console::MAX_WRITE_CHARS = 16384; const unsigned fhandler_console::MAX_WRITE_CHARS = 16384;
fhandler_console::console_state NO_COPY *fhandler_console::shared_console_info; fhandler_console::console_state NO_COPY *fhandler_console::shared_console_info;
@ -2389,7 +2387,7 @@ static const struct {
}; };
const char * const char *
get_nonascii_key (INPUT_RECORD& input_rec, char *tmp) fhandler_console::get_nonascii_key (INPUT_RECORD& input_rec, char *tmp)
{ {
#define NORMAL 0 #define NORMAL 0
#define SHIFT 1 #define SHIFT 1

3
winsup/cygwin/select.cc
View File

@ -839,7 +839,6 @@ fhandler_fifo::select_except (select_stuff *ss)
static int static int
peek_console (select_record *me, bool) peek_console (select_record *me, bool)
{ {
extern const char * get_nonascii_key (INPUT_RECORD& input_rec, char *);
fhandler_console *fh = (fhandler_console *) me->fh; fhandler_console *fh = (fhandler_console *) me->fh;
if (!me->read_selected) if (!me->read_selected)
@ -881,7 +880,7 @@ peek_console (select_record *me, bool)
{ {
if (irec.Event.KeyEvent.bKeyDown if (irec.Event.KeyEvent.bKeyDown
&& (irec.Event.KeyEvent.uChar.AsciiChar && (irec.Event.KeyEvent.uChar.AsciiChar
|| get_nonascii_key (irec, tmpbuf))) || fhandler_console::get_nonascii_key (irec, tmpbuf)))
return me->read_ready = true; return me->read_ready = true;
} }
else else