diff --git a/curspriv.h b/curspriv.h index a923e73e..21102772 100644 --- a/curspriv.h +++ b/curspriv.h @@ -15,7 +15,7 @@ * See the file maintain.er for details of the current maintainer. * ************************************************************************/ -/* $Id: curspriv.h,v 1.64 2006/04/15 16:51:46 wmcbrine Exp $ */ +/* $Id: curspriv.h,v 1.65 2006/04/15 16:55:28 wmcbrine Exp $ */ /* CURSPRIV.H @@ -277,7 +277,7 @@ int PDC_query_adapter_type(void); #ifdef XCURSES int XCurses_display_cursor(int, int, int, int, int); -int XCurses_rawgetch(int); +int XCurses_rawgetch(void); bool XCurses_kbhit(void); int XCurses_get_input_fd(void); int XCursesInstruct(int); diff --git a/pdcurses/util.c b/pdcurses/util.c index b156a334..01471df6 100644 --- a/pdcurses/util.c +++ b/pdcurses/util.c @@ -32,7 +32,7 @@ #undef delay_output #undef flushinp -RCSID("$Id: util.c,v 1.32 2006/04/14 15:34:50 wmcbrine Exp $"); +RCSID("$Id: util.c,v 1.33 2006/04/15 16:55:28 wmcbrine Exp $"); /*man-start************************************************************** @@ -258,7 +258,7 @@ int flushinp(void) #ifdef XCURSES while (XCurses_kbhit()) - XCurses_rawgetch(0); + XCurses_rawgetch(); #endif c_gindex = 1; /* set indices to kill buffer */ c_pindex = 0; diff --git a/x11/pdckbd.c b/x11/pdckbd.c index 5da7c7dd..82f83ff9 100644 --- a/x11/pdckbd.c +++ b/x11/pdckbd.c @@ -18,7 +18,7 @@ #define CURSES_LIBRARY 1 #include -RCSID("$Id: pdckbd.c,v 1.20 2006/03/29 20:06:41 wmcbrine Exp $"); +RCSID("$Id: pdckbd.c,v 1.21 2006/04/15 16:55:28 wmcbrine Exp $"); /*man-start************************************************************** @@ -144,7 +144,7 @@ int PDC_rawgetch(void) && !PDC_breakout()) return -1; - return XCurses_rawgetch(0); + return XCurses_rawgetch(); } /*man-start************************************************************** diff --git a/x11/process/x11curses.c b/x11/process/x11curses.c index 5a5acbc9..07539d8d 100644 --- a/x11/process/x11curses.c +++ b/x11/process/x11curses.c @@ -22,7 +22,7 @@ #include -RCSID("$Id: x11curses.c,v 1.30 2006/04/13 17:19:44 wmcbrine Exp $"); +RCSID("$Id: x11curses.c,v 1.31 2006/04/15 16:55:28 wmcbrine Exp $"); extern AppData app_data; @@ -142,7 +142,7 @@ int XCurses_refresh_scrollbar(void) return OK; } -int XCurses_rawgetch(int delaytenths) +int XCurses_rawgetch(void) { unsigned long newkey = 0; int key = 0; @@ -152,18 +152,13 @@ int XCurses_rawgetch(int delaytenths) while (1) { - if (delaytenths && !XCurses_kbhit()) - key = -1; - else - { - if (read_socket(key_sock, buf, sizeof(unsigned long)) < 0) - XCursesExitCursesProcess(2, - "exiting from XCurses_rawchar"); + if (read_socket(key_sock, buf, sizeof(unsigned long)) < 0) + XCursesExitCursesProcess(2, + "exiting from XCurses_rawchar"); - memcpy((char *)&newkey, buf, sizeof(unsigned long)); - pdc_key_modifier = (newkey >> 24) & 0xFF; - key = (int)(newkey & 0x00FFFFFF); - } + memcpy((char *)&newkey, buf, sizeof(unsigned long)); + pdc_key_modifier = (newkey >> 24) & 0xFF; + key = (int)(newkey & 0x00FFFFFF); if (key == KEY_MOUSE) {