ncurses 6.0 - patch 20170212

[ncurses.git] / ncurses / tty / lib_twait.c

diff --git a/ncurses/tty/lib_twait.c b/ncurses/tty/lib_twait.c
index 023ba70b799d303dcdc8b6d381335d87d7e94102..6b4d4ecf3f54a45a05fc30242187800474b03092 100644 (file)
--- a/ncurses/tty/lib_twait.c
+++ b/ncurses/tty/lib_twait.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2015,2016 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            *
@@ -53,6 +53,11 @@
 #include <OS.h>
 #endif
 
+#if USE_KLIBC_KBD
+#define INCL_KBD
+#include <os2.h>
+#endif
+
 #if USE_FUNC_POLL
 # if HAVE_SYS_TIME_H
 #  include <sys/time.h>
@@ -70,7 +75,7 @@
 #endif
 #undef CUR
 
-MODULE_ID("$Id: lib_twait.c,v 1.62 2011/10/22 16:34:50 tom Exp $")
+MODULE_ID("$Id: lib_twait.c,v 1.71 2016/05/28 23:32:40 tom Exp $")
 
 static long
 _nc_gettime(TimeType * t0, int first)
@@ -97,7 +102,7 @@ _nc_gettime(TimeType * t0, int first)
     if (first) {
        *t0 = t1;
     }
-    res = (t1 - *t0) * 1000;
+    res = (long) ((t1 - *t0) * 1000);
 #endif
     TR(TRACE_IEVENT, ("%s time: %ld msec", first ? "get" : "elapsed", res));
     return res;
@@ -108,15 +113,15 @@ NCURSES_EXPORT(int)
 _nc_eventlist_timeout(_nc_eventlist * evl)
 {
     int event_delay = -1;
-    int n;
 
     if (evl != 0) {
+       int n;
 
        for (n = 0; n < evl->count; ++n) {
            _nc_event *ev = evl->events[n];
 
            if (ev->type == _NC_EVENT_TIMEOUT_MSEC) {
-               event_delay = ev->data.timeout_msec;
+               event_delay = (int) ev->data.timeout_msec;
                if (event_delay < 0)
                    event_delay = INT_MAX;      /* FIXME Is this defined? */
            }
@@ -184,6 +189,12 @@ _nc_timed_wait(SCREEN *sp MAYBE_UNUSED,
     fd_set set;
 #endif
 
+#if USE_KLIBC_KBD
+    fd_set saved_set;
+    KBDKEYINFO ki;
+    struct timeval tv;
+#endif
+
     long starttime, returntime;
 
     TR(TRACE_IEVENT, ("start twait: %d milliseconds, mode: %d",
@@ -207,6 +218,7 @@ _nc_timed_wait(SCREEN *sp MAYBE_UNUSED,
     starttime = _nc_gettime(&t0, TRUE);
 
     count = 0;
+    (void) count;
 
 #ifdef NCURSES_WGETCH_EVENTS
     if ((mode & TW_EVENT) && evl)
@@ -217,8 +229,12 @@ _nc_timed_wait(SCREEN *sp MAYBE_UNUSED,
     memset(fd_list, 0, sizeof(fd_list));
 
 #ifdef NCURSES_WGETCH_EVENTS
-    if ((mode & TW_EVENT) && evl)
-       fds = typeMalloc(struct pollfd, MIN_FDS + evl->count);
+    if ((mode & TW_EVENT) && evl) {
+       if (fds == fd_list)
+           fds = typeMalloc(struct pollfd, MIN_FDS + evl->count);
+       if (fds == 0)
+           return TW_NONE;
+    }
 #endif
 
     if (mode & TW_INPUT) {
@@ -274,10 +290,6 @@ _nc_timed_wait(SCREEN *sp MAYBE_UNUSED,
            }
        }
     }
-
-    if (fds != fd_list)
-       free((char *) fds);
-
 #endif
 
 #elif defined(__BEOS__)
@@ -329,10 +341,12 @@ _nc_timed_wait(SCREEN *sp MAYBE_UNUSED,
      */
     FD_ZERO(&set);
 
+#if !USE_KLIBC_KBD
     if (mode & TW_INPUT) {
        FD_SET(sp->_ifd, &set);
        count = sp->_ifd + 1;
     }
+#endif
     if ((mode & TW_MOUSE)
        && (fd = sp->_mouse_fd) >= 0) {
        FD_SET(fd, &set);
@@ -352,6 +366,31 @@ _nc_timed_wait(SCREEN *sp MAYBE_UNUSED,
     }
 #endif
 
+#if USE_KLIBC_KBD
+    for (saved_set = set;; set = saved_set) {
+       if ((mode & TW_INPUT)
+           && (sp->_extended_key
+               || (KbdPeek(&ki, 0) == 0
+                   && (ki.fbStatus & KBDTRF_FINAL_CHAR_IN)))) {
+           FD_ZERO(&set);
+           FD_SET(sp->_ifd, &set);
+           result = 1;
+           break;
+       }
+
+       tv.tv_sec = 0;
+       tv.tv_usec = (milliseconds == 0) ? 0 : (10 * 1000);
+
+       if ((result = select(count, &set, NULL, NULL, &tv)) != 0)
+           break;
+
+       /* Time out ? */
+       if (milliseconds >= 0 && _nc_gettime(&t0, FALSE) >= milliseconds) {
+           result = 0;
+           break;
+       }
+    }
+#else
     if (milliseconds >= 0) {
        struct timeval ntimeout;
        ntimeout.tv_sec = milliseconds / 1000;
@@ -360,6 +399,7 @@ _nc_timed_wait(SCREEN *sp MAYBE_UNUSED,
     } else {
        result = select(count, &set, NULL, NULL, NULL);
     }
+#endif
 
 #ifdef NCURSES_WGETCH_EVENTS
     if ((mode & TW_EVENT) && evl) {
@@ -462,5 +502,12 @@ _nc_timed_wait(SCREEN *sp MAYBE_UNUSED,
        result |= TW_EVENT;
 #endif
 
+#if USE_FUNC_POLL
+#ifdef NCURSES_WGETCH_EVENTS
+    if (fds != fd_list)
+       free((char *) fds);
+#endif
+#endif
+
     return (result);
 }