/****************************************************************************
- * Copyright (c) 1998-2001,2002 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 *
/****************************************************************************
* Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 *
* and: Eric S. Raymond <esr@snark.thyrsus.com> *
+ * and: Thomas E. Dickey 1996-on *
****************************************************************************/
/*
#include <curses.priv.h>
+#if defined __HAIKU__ && defined __BEOS__
+#undef __BEOS__
+#endif
+
#ifdef __BEOS__
#undef false
#undef true
#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>
# include <sys/select.h>
# endif
#endif
+#ifdef __MINGW32__
+# include <sys/time.h>
+#endif
+#undef CUR
-MODULE_ID("$Id: lib_twait.c,v 1.46 2002/09/01 00:28:18 tom Exp $")
+MODULE_ID("$Id: lib_twait.c,v 1.71 2016/05/28 23:32:40 tom Exp $")
static long
-_nc_gettime(bool first)
+_nc_gettime(TimeType * t0, int first)
{
long res;
-#if HAVE_GETTIMEOFDAY
-# define PRECISE_GETTIME 1
- static struct timeval t0;
- struct timeval t1;
+#if PRECISE_GETTIME
+ TimeType t1;
gettimeofday(&t1, (struct timezone *) 0);
if (first) {
- t0 = t1;
+ *t0 = t1;
+ res = 0;
+ } else {
+ /* .tv_sec and .tv_usec are unsigned, be careful when subtracting */
+ if (t0->tv_usec > t1.tv_usec) {
+ t1.tv_usec += 1000000; /* Convert 1s in 1e6 microsecs */
+ t1.tv_sec--;
+ }
+ res = (t1.tv_sec - t0->tv_sec) * 1000
+ + (t1.tv_usec - t0->tv_usec) / 1000;
}
- res = (t1.tv_sec - t0.tv_sec) * 1000
- + (t1.tv_usec - t0.tv_usec) / 1000;
#else
-# define PRECISE_GETTIME 0
- static time_t t0;
time_t t1 = time((time_t *) 0);
if (first) {
- t0 = t1;
+ *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;
NCURSES_EXPORT(int)
_nc_eventlist_timeout(_nc_eventlist * evl)
{
- _nc_event **ev, **last;
int event_delay = -1;
if (evl != 0) {
+ int n;
- ev = evl->events;
- last = ev + evl->count;
+ for (n = 0; n < evl->count; ++n) {
+ _nc_event *ev = evl->events[n];
- while (ev < last) {
- if ((*ev)->type == _NC_EVENT_TIMEOUT_MSEC) {
- event_delay = (*ev)->data.timeout_msec;
+ if (ev->type == _NC_EVENT_TIMEOUT_MSEC) {
+ event_delay = (int) ev->data.timeout_msec;
if (event_delay < 0)
- event_delay = LONG_MAX; /* FIXME Is this defined? */
+ event_delay = INT_MAX; /* FIXME Is this defined? */
}
}
}
}
#endif /* NCURSES_WGETCH_EVENTS */
+#if (USE_FUNC_POLL || HAVE_SELECT)
+# define MAYBE_UNUSED
+#else
+# define MAYBE_UNUSED GCC_UNUSED
+#endif
+
+#if (USE_FUNC_POLL || HAVE_SELECT)
+# define MAYBE_UNUSED
+#else
+# define MAYBE_UNUSED GCC_UNUSED
+#endif
+
/*
* Wait a specified number of milliseconds, returning nonzero if the timer
* didn't expire before there is activity on the specified file descriptors.
* The file-descriptors are specified by the mode:
- * 0 - none (absolute time)
- * 1 - ncurses' normal input-descriptor
- * 2 - mouse descriptor, if any
- * 3 - either input or mouse.
- *
+ * TW_NONE 0 - none (absolute time)
+ * TW_INPUT 1 - ncurses' normal input-descriptor
+ * TW_MOUSE 2 - mouse descriptor, if any
+ * TW_ANY 3 - either input or mouse.
+ * TW_EVENT 4 -
* Experimental: if NCURSES_WGETCH_EVENTS is defined, (mode & 4) determines
* whether to pay attention to evl argument. If set, the smallest of
* millisecond and of timeout of evl is taken.
* descriptors.
*/
NCURSES_EXPORT(int)
-_nc_timed_wait(int mode,
+_nc_timed_wait(SCREEN *sp MAYBE_UNUSED,
+ int mode MAYBE_UNUSED,
int milliseconds,
int *timeleft
EVENTLIST_2nd(_nc_eventlist * evl))
{
- int fd;
int count;
- int result;
+ int result = TW_NONE;
+ TimeType t0;
+#if (USE_FUNC_POLL || HAVE_SELECT)
+ int fd;
+#endif
#ifdef NCURSES_WGETCH_EVENTS
int timeout_is_event = 0;
+ int n;
#endif
#if USE_FUNC_POLL
- struct pollfd fd_list[2];
+#define MIN_FDS 2
+ struct pollfd fd_list[MIN_FDS];
struct pollfd *fds = fd_list;
#elif defined(__BEOS__)
#elif HAVE_SELECT
- static fd_set set;
+ fd_set set;
+#endif
+
+#if USE_KLIBC_KBD
+ fd_set saved_set;
+ KBDKEYINFO ki;
+ struct timeval tv;
#endif
long starttime, returntime;
milliseconds, mode));
#ifdef NCURSES_WGETCH_EVENTS
- if (mode & 4) {
+ if (mode & TW_EVENT) {
int event_delay = _nc_eventlist_timeout(evl);
if (event_delay >= 0
}
#endif
-#if PRECISE_GETTIME
+#if PRECISE_GETTIME && HAVE_NANOSLEEP
retry:
#endif
- starttime = _nc_gettime(TRUE);
+ starttime = _nc_gettime(&t0, TRUE);
count = 0;
+ (void) count;
#ifdef NCURSES_WGETCH_EVENTS
- if ((mode & 4) && evl)
+ if ((mode & TW_EVENT) && evl)
evl->result_flags = 0;
#endif
memset(fd_list, 0, sizeof(fd_list));
#ifdef NCURSES_WGETCH_EVENTS
- if ((mode & 4) && evl)
- fds = typeMalloc(struct pollfd, 2 + 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 & 1) {
- fds[count].fd = SP->_ifd;
+ if (mode & TW_INPUT) {
+ fds[count].fd = sp->_ifd;
fds[count].events = POLLIN;
count++;
}
- if ((mode & 2)
- && (fd = SP->_mouse_fd) >= 0) {
+ if ((mode & TW_MOUSE)
+ && (fd = sp->_mouse_fd) >= 0) {
fds[count].fd = fd;
fds[count].events = POLLIN;
count++;
}
#ifdef NCURSES_WGETCH_EVENTS
- if ((mode & 4) && evl) {
- _nc_event **ev = evl->events;
- _nc_event **last = ev + evl->count;
-
- while (ev < last) {
- if ((*ev)->type == _NC_EVENT_FILE
- && ((*ev)->data.fev.flags & _NC_EVENT_FILE_READABLE)) {
- fds[count].fd = (*ev)->data.fev.fd;
+ if ((mode & TW_EVENT) && evl) {
+ for (n = 0; n < evl->count; ++n) {
+ _nc_event *ev = evl->events[n];
+
+ if (ev->type == _NC_EVENT_FILE
+ && (ev->data.fev.flags & _NC_EVENT_FILE_READABLE)) {
+ fds[count].fd = ev->data.fev.fd;
fds[count].events = POLLIN;
count++;
}
}
#endif
- result = poll(fds, count, milliseconds);
+ result = poll(fds, (size_t) count, milliseconds);
#ifdef NCURSES_WGETCH_EVENTS
- if ((mode & 4) && evl) {
- _nc_event **ev = evl->events;
- _nc_event **last = ev + evl->count;
+ if ((mode & TW_EVENT) && evl) {
int c;
if (!result)
count = 0;
- while (ev < last) {
- if ((*ev)->type == _NC_EVENT_FILE
- && ((*ev)->data.fev.flags & _NC_EVENT_FILE_READABLE)) {
- (*ev)->data.fev.result = 0;
+
+ for (n = 0; n < evl->count; ++n) {
+ _nc_event *ev = evl->events[n];
+
+ if (ev->type == _NC_EVENT_FILE
+ && (ev->data.fev.flags & _NC_EVENT_FILE_READABLE)) {
+ ev->data.fev.result = 0;
for (c = 0; c < count; c++)
- if (fds[c].fd == (*ev)->data.fev.fd
+ if (fds[c].fd == ev->data.fev.fd
&& fds[c].revents & POLLIN) {
- (*ev)->data.fev.result |= _NC_EVENT_FILE_READABLE;
+ ev->data.fev.result |= _NC_EVENT_FILE_READABLE;
evl->result_flags |= _NC_EVENT_FILE_READABLE;
}
- } else if ((*ev)->type == _NC_EVENT_TIMEOUT_MSEC
+ } else if (ev->type == _NC_EVENT_TIMEOUT_MSEC
&& !result && timeout_is_event) {
evl->result_flags |= _NC_EVENT_TIMEOUT_MSEC;
}
}
}
-
- if (fds != fd_list)
- free((char *) fds);
-
#endif
#elif defined(__BEOS__)
*
* FIXME: this assumes mode&1 if milliseconds < 0 (see lib_getch.c).
*/
- result = 0;
- if (mode & 1) {
+ result = TW_NONE;
+ if (mode & TW_INPUT) {
int step = (milliseconds < 0) ? 0 : 5000;
bigtime_t d;
bigtime_t useconds = milliseconds * 1000;
*/
FD_ZERO(&set);
- if (mode & 1) {
- FD_SET(SP->_ifd, &set);
- count = SP->_ifd + 1;
+#if !USE_KLIBC_KBD
+ if (mode & TW_INPUT) {
+ FD_SET(sp->_ifd, &set);
+ count = sp->_ifd + 1;
}
- if ((mode & 2)
- && (fd = SP->_mouse_fd) >= 0) {
+#endif
+ if ((mode & TW_MOUSE)
+ && (fd = sp->_mouse_fd) >= 0) {
FD_SET(fd, &set);
count = max(fd, count) + 1;
}
#ifdef NCURSES_WGETCH_EVENTS
- if ((mode & 4) && evl) {
- _nc_event **ev = evl->events;
- _nc_event **last = ev + evl->count;
-
- while (ev < last) {
- if ((*ev)->type == _NC_EVENT_FILE
- && ((*ev)->data.fev.flags & _NC_EVENT_FILE_READABLE)) {
- FD_SET((*ev)->data.fev.fd, &set);
- count = max((*ev)->data.fev.fd + 1, count);
+ if ((mode & TW_EVENT) && evl) {
+ for (n = 0; n < evl->count; ++n) {
+ _nc_event *ev = evl->events[n];
+
+ if (ev->type == _NC_EVENT_FILE
+ && (ev->data.fev.flags & _NC_EVENT_FILE_READABLE)) {
+ FD_SET(ev->data.fev.fd, &set);
+ count = max(ev->data.fev.fd + 1, count);
}
}
}
#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;
} else {
result = select(count, &set, NULL, NULL, NULL);
}
+#endif
#ifdef NCURSES_WGETCH_EVENTS
- if ((mode & 4) && evl) {
- _nc_event **ev = evl->events;
- _nc_event **last = ev + evl->count;
-
+ if ((mode & TW_EVENT) && evl) {
evl->result_flags = 0;
- while (ev < last) {
- if ((*ev)->type == _NC_EVENT_FILE
- && ((*ev)->data.fev.flags & _NC_EVENT_FILE_READABLE)) {
- (*ev)->data.fev.result = 0;
- if (FD_ISSET((*ev)->data.fev.fd, &set)) {
- (*ev)->data.fev.result |= _NC_EVENT_FILE_READABLE;
+ for (n = 0; n < evl->count; ++n) {
+ _nc_event *ev = evl->events[n];
+
+ if (ev->type == _NC_EVENT_FILE
+ && (ev->data.fev.flags & _NC_EVENT_FILE_READABLE)) {
+ ev->data.fev.result = 0;
+ if (FD_ISSET(ev->data.fev.fd, &set)) {
+ ev->data.fev.result |= _NC_EVENT_FILE_READABLE;
evl->result_flags |= _NC_EVENT_FILE_READABLE;
}
- } else if ((*ev)->type == _NC_EVENT_TIMEOUT_MSEC
+ } else if (ev->type == _NC_EVENT_TIMEOUT_MSEC
&& !result && timeout_is_event)
evl->result_flags |= _NC_EVENT_TIMEOUT_MSEC;
}
#endif /* USE_FUNC_POLL, etc */
- returntime = _nc_gettime(FALSE);
+ returntime = _nc_gettime(&t0, FALSE);
if (milliseconds >= 0)
- milliseconds -= (returntime - starttime);
+ milliseconds -= (int) (returntime - starttime);
#ifdef NCURSES_WGETCH_EVENTS
if (evl) {
- _nc_event **ev = evl->events;
- _nc_event **last = ev + evl->count;
-
evl->result_flags = 0;
- while (ev < last) {
- if ((*ev)->type == _NC_EVENT_TIMEOUT_MSEC) {
+ for (n = 0; n < evl->count; ++n) {
+ _nc_event *ev = evl->events[n];
+
+ if (ev->type == _NC_EVENT_TIMEOUT_MSEC) {
long diff = (returntime - starttime);
- if ((*ev)->data.timeout_msec <= diff)
- (*ev)->data.timeout_msec = 0;
+ if (ev->data.timeout_msec <= diff)
+ ev->data.timeout_msec = 0;
else
- (*ev)->data.timeout_msec -= diff;
+ ev->data.timeout_msec -= diff;
}
}
}
#endif
-#if PRECISE_GETTIME
+#if PRECISE_GETTIME && HAVE_NANOSLEEP
/*
* If the timeout hasn't expired, and we've gotten no data,
* this is probably a system where 'select()' needs to be left
* then come back for more.
*/
if (result == 0 && milliseconds > 100) {
- napms(100);
+ napms(100); /* FIXME: this won't be right if I recur! */
milliseconds -= 100;
goto retry;
}
if (result > 0) {
result = 0;
#if USE_FUNC_POLL
- for (count = 0; count < 2; count++) {
+ for (count = 0; count < MIN_FDS; count++) {
if ((mode & (1 << count))
&& (fds[count].revents & POLLIN)) {
result |= (1 << count);
}
}
#elif defined(__BEOS__)
- result = 1; /* redundant, but simple */
+ result = TW_INPUT; /* redundant, but simple */
#elif HAVE_SELECT
- if ((mode & 2)
- && (fd = SP->_mouse_fd) >= 0
+ if ((mode & TW_MOUSE)
+ && (fd = sp->_mouse_fd) >= 0
&& FD_ISSET(fd, &set))
- result |= 2;
- if ((mode & 1)
- && FD_ISSET(SP->_ifd, &set))
- result |= 1;
+ result |= TW_MOUSE;
+ if ((mode & TW_INPUT)
+ && FD_ISSET(sp->_ifd, &set))
+ result |= TW_INPUT;
#endif
} else
result = 0;
}
#ifdef NCURSES_WGETCH_EVENTS
- if ((mode & 4) && evl && evl->result_flags)
- result |= 4;
+ if ((mode & TW_EVENT) && evl && evl->result_flags)
+ result |= TW_EVENT;
+#endif
+
+#if USE_FUNC_POLL
+#ifdef NCURSES_WGETCH_EVENTS
+ if (fds != fd_list)
+ free((char *) fds);
+#endif
#endif
return (result);
projects / ncurses.git / blobdiff