ncurses 5.6 - patch 20070224

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

diff --git a/ncurses/base/lib_getch.c b/ncurses/base/lib_getch.c
index 84700cc7a1bf20be2d0863d76781ad24b4e8a2ef..e66602c28ce1c60fc8df896a626eaa82b65a7c66 100644 (file)
--- a/ncurses/base/lib_getch.c
+++ b/ncurses/base/lib_getch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2001,2002 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *

  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -29,6 +29,7 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *

+ *     and: Thomas E. Dickey                        1996-on                 *

  ****************************************************************************/
 
 /*
  ****************************************************************************/
 
 /*


@@ -40,7 +41,7 @@
 
 #include <curses.priv.h>
 
 
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_getch.c,v 1.71 2003/05/17 23:49:28 tom Exp $")
+MODULE_ID("$Id: lib_getch.c,v 1.77 2007/02/25 00:43:54 tom Exp $")

 
 #include <fifo_defs.h>
 
 
 #include <fifo_defs.h>
 


@@ -79,7 +80,7 @@ check_mouse_activity(int delay EVENTLIST_2nd(_nc_eventlist * evl))
     return rc;
 }
 
     return rc;
 }
 

-static inline int
+static NCURSES_INLINE int

 fifo_peek(void)
 {
     int ch = SP->_fifo[peek];
 fifo_peek(void)
 {
     int ch = SP->_fifo[peek];


@@ -89,7 +90,7 @@ fifo_peek(void)
     return ch;
 }
 
     return ch;
 }
 

-static inline int
+static NCURSES_INLINE int

 fifo_pull(void)
 {
     int ch;
 fifo_pull(void)
 {
     int ch;


@@ -109,7 +110,7 @@ fifo_pull(void)
     return ch;
 }
 
     return ch;
 }
 

-static inline int
+static NCURSES_INLINE int

 fifo_push(EVENTLIST_0th(_nc_eventlist * evl))
 {
     int n;
 fifo_push(EVENTLIST_0th(_nc_eventlist * evl))
 {
     int n;


@@ -205,7 +206,7 @@ fifo_push(EVENTLIST_0th(_nc_eventlist * evl))
     return ch;
 }
 
     return ch;
 }
 

-static inline void
+static NCURSES_INLINE void

 fifo_clear(void)
 {
     memset(SP->_fifo, 0, sizeof(SP->_fifo));
 fifo_clear(void)
 {
     memset(SP->_fifo, 0, sizeof(SP->_fifo));


@@ -233,15 +234,16 @@ _nc_wgetch(WINDOW *win,
     T((T_CALLED("_nc_wgetch(%p)"), win));
 
     *result = 0;
     T((T_CALLED("_nc_wgetch(%p)"), win));
 
     *result = 0;

-    if (!win)
+    if (win == 0 || SP == 0) {

        returnCode(ERR);
        returnCode(ERR);

+    }

 
     if (cooked_key_in_fifo()) {
        if (wgetch_should_refresh(win))
            wrefresh(win);
 
        *result = fifo_pull();
 
     if (cooked_key_in_fifo()) {
        if (wgetch_should_refresh(win))
            wrefresh(win);
 
        *result = fifo_pull();

-       returnCode(OK);
+       returnCode(*result >= KEY_MIN ? KEY_CODE_YES : OK);

     }
 #ifdef NCURSES_WGETCH_EVENTS
     if (evl && (evl->count == 0))
     }
 #ifdef NCURSES_WGETCH_EVENTS
     if (evl && (evl->count == 0))


@@ -280,12 +282,10 @@ _nc_wgetch(WINDOW *win,
        /* Return it first */
        if (rc == KEY_EVENT) {
            *result = rc;
        /* Return it first */
        if (rc == KEY_EVENT) {
            *result = rc;

-           returnCode(OK);
-       }
+       } else

 #endif
 #endif

-
-       *result = fifo_pull();
-       returnCode(OK);
+           *result = fifo_pull();
+       returnCode(*result >= KEY_MIN ? KEY_CODE_YES : OK);

     }
 
     if (win->_use_keypad != SP->_keypad_on)
     }
 
     if (win->_use_keypad != SP->_keypad_on)


@@ -295,28 +295,29 @@ _nc_wgetch(WINDOW *win,
        wrefresh(win);
 
     if (!win->_notimeout && (win->_delay >= 0 || SP->_cbreak > 1)) {
        wrefresh(win);
 
     if (!win->_notimeout && (win->_delay >= 0 || SP->_cbreak > 1)) {

-       int delay;
+       if (head == -1) {       /* fifo is empty */
+           int delay;
+           int rc;

 
 

-       TR(TRACE_IEVENT, ("timed delay in wgetch()"));
-       if (SP->_cbreak > 1)
-           delay = (SP->_cbreak - 1) * 100;
-       else
-           delay = win->_delay;
+           TR(TRACE_IEVENT, ("timed delay in wgetch()"));
+           if (SP->_cbreak > 1)
+               delay = (SP->_cbreak - 1) * 100;
+           else
+               delay = win->_delay;

 
 #ifdef NCURSES_WGETCH_EVENTS
 
 #ifdef NCURSES_WGETCH_EVENTS

-       if (event_delay >= 0 && delay > event_delay)
-           delay = event_delay;
+           if (event_delay >= 0 && delay > event_delay)
+               delay = event_delay;

 #endif
 
 #endif
 

-       TR(TRACE_IEVENT, ("delay is %d milliseconds", delay));
+           TR(TRACE_IEVENT, ("delay is %d milliseconds", delay));

 
 

-       if (head == -1) {       /* fifo is empty */
-           int rc = check_mouse_activity(delay EVENTLIST_2nd(evl));
+           rc = check_mouse_activity(delay EVENTLIST_2nd(evl));

 
 #ifdef NCURSES_WGETCH_EVENTS
            if (rc & 4) {
                *result = KEY_EVENT;
 
 #ifdef NCURSES_WGETCH_EVENTS
            if (rc & 4) {
                *result = KEY_EVENT;

-               returnCode(OK);
+               returnCode(KEY_CODE_YES);

            }
 #endif
            if (!rc)
            }
 #endif
            if (!rc)


@@ -466,7 +467,7 @@ wgetch(WINDOW *win)
     T((T_CALLED("wgetch(%p)"), win));
     code = _nc_wgetch(win,
                      &value,
     T((T_CALLED("wgetch(%p)"), win));
     code = _nc_wgetch(win,
                      &value,

-                     SP->_use_meta
+                     (SP ? SP->_use_meta : 0)

                      EVENTLIST_2nd((_nc_eventlist *) 0));
     if (code != ERR)
        code = value;
                      EVENTLIST_2nd((_nc_eventlist *) 0));
     if (code != ERR)
        code = value;


@@ -491,7 +492,7 @@ wgetch(WINDOW *win)
 static int
 kgetch(EVENTLIST_0th(_nc_eventlist * evl))
 {
 static int
 kgetch(EVENTLIST_0th(_nc_eventlist * evl))
 {

-    struct tries *ptr;
+    TRIES *ptr;

     int ch = 0;
     int timeleft = ESCDELAY;
 
     int ch = 0;
     int timeleft = ESCDELAY;
 


@@ -558,7 +559,7 @@ kgetch(EVENTLIST_0th(_nc_eventlist * evl))
 #ifdef NCURSES_WGETCH_EVENTS
            if (rc & 4) {
                TR(TRACE_IEVENT, ("interrupted by a user event"));
 #ifdef NCURSES_WGETCH_EVENTS
            if (rc & 4) {
                TR(TRACE_IEVENT, ("interrupted by a user event"));

-               /* FIXME Should have preserved remainder timeleft for reusal... */
+               /* FIXME Should have preserved remainder timeleft for reuse... */

                peek = head;    /* Restart interpreting later */
                return KEY_EVENT;
            }
                peek = head;    /* Restart interpreting later */
                return KEY_EVENT;
            }