ncurses 5.7 - patch 20090419

[ncurses.git] / ncurses / base / lib_getch.c

diff --git a/ncurses/base/lib_getch.c b/ncurses/base/lib_getch.c
index 22173242852452310b403dc4166abfb5e69e4766..63e64fa44496375cfd78c48b814261f2b760060a 100644 (file)
--- a/ncurses/base/lib_getch.c
+++ b/ncurses/base/lib_getch.c
@@ -42,7 +42,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_getch.c,v 1.100 2009/02/15 00:36:00 tom Exp $")
+MODULE_ID("$Id: lib_getch.c,v 1.102 2009/04/18 20:32:33 tom Exp $")
 
 #include <fifo_defs.h>
 
@@ -94,9 +94,9 @@ _nc_use_meta(WINDOW *win)
 }
 
 #ifdef NCURSES_WGETCH_EVENTS
-#define TWAIT_MASK 7
+#define TWAIT_MASK (TW_ANY | TW_EVENT)
 #else
-#define TWAIT_MASK 3
+#define TWAIT_MASK TW_ANY
 #endif
 
 /*
@@ -119,7 +119,7 @@ check_mouse_activity(SCREEN *sp, int delay EVENTLIST_2nd(_nc_eventlist * evl))
        && (sp->_sysmouse_head < sp->_sysmouse_tail)
        && (rc == 0)
        && (errno == EINTR)) {
-       rc |= 2;
+       rc |= TW_MOUSE;
     }
 #endif
     return rc;
@@ -183,9 +183,9 @@ fifo_push(SCREEN *sp EVENTLIST_2nd(_nc_eventlist * evl))
     } else
        mask = 0;
 
-    if (mask & 4) {
+    if (mask & TW_EVENT) {
        T(("fifo_push: ungetch KEY_EVENT"));
-       _nc_ungetch(sp, KEY_EVENT);
+       safe_ungetch(sp, KEY_EVENT);
        return KEY_EVENT;
     }
 #elif USE_GPM_SUPPORT || USE_EMX_MOUSE || USE_SYSMOUSE
@@ -195,7 +195,7 @@ fifo_push(SCREEN *sp EVENTLIST_2nd(_nc_eventlist * evl))
 #endif
 
 #if USE_GPM_SUPPORT || USE_EMX_MOUSE
-    if ((sp->_mouse_fd >= 0) && (mask & 2)) {
+    if ((sp->_mouse_fd >= 0) && (mask & TW_MOUSE)) {
        sp->_mouse_event(sp);
        ch = KEY_MOUSE;
        n = 1;
@@ -270,12 +270,12 @@ recur_wrefresh(WINDOW *win)
 {
 #ifdef USE_PTHREADS
     SCREEN *sp = _nc_screen_of(win);
-    if (_nc_use_pthreads && sp != SP) {
+    if (_nc_use_pthreads && sp != CURRENT_SCREEN) {
        SCREEN *save_SP;
 
        /* temporarily switch to the window's screen to check/refresh */
        _nc_lock_global(curses);
-       save_SP = SP;
+       save_SP = CURRENT_SCREEN;
        _nc_set_screen(sp);
        recur_wrefresh(win);
        _nc_set_screen(save_SP);
@@ -296,12 +296,12 @@ recur_wgetnstr(WINDOW *win, char *buf)
 
     if (sp != 0) {
 #ifdef USE_PTHREADS
-       if (_nc_use_pthreads && sp != SP) {
+       if (_nc_use_pthreads && sp != CURRENT_SCREEN) {
            SCREEN *save_SP;
 
            /* temporarily switch to the window's screen to get cooked input */
            _nc_lock_global(curses);
-           save_SP = SP;
+           save_SP = CURRENT_SCREEN;
            _nc_set_screen(sp);
            rc = recur_wgetnstr(win, buf);
            _nc_set_screen(save_SP);
@@ -372,9 +372,9 @@ _nc_wgetch(WINDOW *win,
 #ifdef NCURSES_WGETCH_EVENTS
        if (rc != KEY_EVENT)
 #endif
-           _nc_ungetch(sp, '\n');
+           safe_ungetch(sp, '\n');
        for (bufp = buf + strlen(buf); bufp > buf; bufp--)
-           _nc_ungetch(sp, bufp[-1]);
+           safe_ungetch(sp, bufp[-1]);
 
 #ifdef NCURSES_WGETCH_EVENTS
        /* Return it first */
@@ -412,7 +412,7 @@ _nc_wgetch(WINDOW *win,
            rc = check_mouse_activity(sp, delay EVENTLIST_2nd(evl));
 
 #ifdef NCURSES_WGETCH_EVENTS
-           if (rc & 4) {
+           if (rc & TW_EVENT) {
                *result = KEY_EVENT;
                returnCode(KEY_CODE_YES);
            }
@@ -437,7 +437,7 @@ _nc_wgetch(WINDOW *win,
         * increase the wait with mouseinterval().
         */
        int runcount = 0;
-       int rc;
+       int rc = 0;
 
        do {
            ch = kgetch(sp EVENTLIST_2nd(evl));
@@ -452,11 +452,11 @@ _nc_wgetch(WINDOW *win,
            (ch == KEY_MOUSE
             && (((rc = check_mouse_activity(sp, sp->_maxclick
                                             EVENTLIST_2nd(evl))) != 0
-                 && !(rc & 4))
+                 && !(rc & TW_EVENT))
                 || !sp->_mouse_parse(sp, runcount)));
 #ifdef NCURSES_WGETCH_EVENTS
-       if ((rc & 4) && !ch == KEY_EVENT) {
-           _nc_ungetch(sp, ch);
+       if ((rc & TW_EVENT) && !(ch == KEY_EVENT)) {
+           safe_ungetch(sp, ch);
            ch = KEY_EVENT;
        }
 #endif
@@ -464,12 +464,12 @@ _nc_wgetch(WINDOW *win,
 #ifdef NCURSES_WGETCH_EVENTS
            /* mouse event sequence ended by an event, report event */
            if (ch == KEY_EVENT) {
-               _nc_ungetch(sp, KEY_MOUSE);     /* FIXME This interrupts a gesture... */
+               safe_ungetch(sp, KEY_MOUSE);    /* FIXME This interrupts a gesture... */
            } else
 #endif
            {
                /* mouse event sequence ended by keystroke, store keystroke */
-               _nc_ungetch(sp, ch);
+               safe_ungetch(sp, ch);
                ch = KEY_MOUSE;
            }
        }
@@ -655,7 +655,7 @@ kgetch(SCREEN *sp EVENTLIST_2nd(_nc_eventlist * evl))
            TR(TRACE_IEVENT, ("waiting for rest of sequence"));
            rc = check_mouse_activity(sp, timeleft EVENTLIST_2nd(evl));
 #ifdef NCURSES_WGETCH_EVENTS
-           if (rc & 4) {
+           if (rc & TW_EVENT) {
                TR(TRACE_IEVENT, ("interrupted by a user event"));
                /* FIXME Should have preserved remainder timeleft for reuse... */
                peek = head;    /* Restart interpreting later */