X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Ftty%2Flib_twait.c;h=3091719cd79ca126f1201b8decc000bab24a647a;hp=7402a10354fc694c5ac21ebc1d008c7d956614f4;hb=f5da57ad7eb397b1001e2fca9cb0e278a6564716;hpb=a8987e73ec254703634802b4f7ee30d3a485524d diff --git a/ncurses/tty/lib_twait.c b/ncurses/tty/lib_twait.c index 7402a103..3091719c 100644 --- a/ncurses/tty/lib_twait.c +++ b/ncurses/tty/lib_twait.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2002,2003 Free Software Foundation, Inc. * + * Copyright (c) 1998-2008,2009 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 * @@ -29,6 +29,7 @@ /**************************************************************************** * Author: Zeyd M. Ben-Halim 1992,1995 * * and: Eric S. Raymond * + * and: Thomas E. Dickey 1996-on * ****************************************************************************/ /* @@ -42,6 +43,10 @@ #include +#if defined __HAIKU__ && defined __BEOS__ +#undef __BEOS__ +#endif + #ifdef __BEOS__ #undef false #undef true @@ -60,39 +65,39 @@ # include # endif #endif +#ifdef __MINGW32__ +# include +#endif +#undef CUR -MODULE_ID("$Id: lib_twait.c,v 1.49 2003/11/30 00:34:36 Philippe.Blain Exp $") +MODULE_ID("$Id: lib_twait.c,v 1.60 2009/04/18 21:01:13 tom Exp $") static long -_nc_gettime(bool first) +_nc_gettime(TimeType * t0, bool 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) { /* Convert 1s in 1e6 microsecs */ - t1.tv_usec += 1000000; + 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 = (t1 - *t0) * 1000; #endif TR(TRACE_IEVENT, ("%s time: %ld msec", first ? "get" : "elapsed", res)); return res; @@ -102,19 +107,18 @@ _nc_gettime(bool first) NCURSES_EXPORT(int) _nc_eventlist_timeout(_nc_eventlist * evl) { - _nc_event **ev, **last; int event_delay = -1; + int n; if (evl != 0) { - 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 = ev->data.timeout_msec; if (event_delay < 0) - event_delay = LONG_MAX; /* FIXME Is this defined? */ + event_delay = INT_MAX; /* FIXME Is this defined? */ } } } @@ -122,15 +126,27 @@ _nc_eventlist_timeout(_nc_eventlist * evl) } #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. @@ -141,25 +157,31 @@ _nc_eventlist_timeout(_nc_eventlist * evl) * 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 long starttime, returntime; @@ -168,7 +190,7 @@ _nc_timed_wait(int mode, milliseconds, mode)); #ifdef NCURSES_WGETCH_EVENTS - if (mode & 4) { + if (mode & TW_EVENT) { int event_delay = _nc_eventlist_timeout(evl); if (event_delay >= 0 @@ -179,15 +201,15 @@ _nc_timed_wait(int mode, } #endif -#if PRECISE_GETTIME +#if PRECISE_GETTIME && HAVE_NANOSLEEP retry: #endif - starttime = _nc_gettime(TRUE); + starttime = _nc_gettime(&t0, TRUE); count = 0; #ifdef NCURSES_WGETCH_EVENTS - if ((mode & 4) && evl) + if ((mode & TW_EVENT) && evl) evl->result_flags = 0; #endif @@ -195,30 +217,29 @@ _nc_timed_wait(int mode, 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) + fds = typeMalloc(struct pollfd, MIN_FDS + evl->count); #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++; } @@ -226,27 +247,28 @@ _nc_timed_wait(int mode, } #endif - result = poll(fds, count, milliseconds); + result = poll(fds, (unsigned) 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; } @@ -270,8 +292,8 @@ _nc_timed_wait(int mode, * * 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; @@ -307,25 +329,24 @@ _nc_timed_wait(int mode, */ FD_ZERO(&set); - if (mode & 1) { - FD_SET(SP->_ifd, &set); - count = SP->_ifd + 1; + if (mode & TW_INPUT) { + FD_SET(sp->_ifd, &set); + count = sp->_ifd + 1; } - if ((mode & 2) - && (fd = SP->_mouse_fd) >= 0) { + 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); } } } @@ -341,20 +362,19 @@ _nc_timed_wait(int mode, } #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; } @@ -363,24 +383,23 @@ _nc_timed_wait(int mode, #endif /* USE_FUNC_POLL, etc */ - returntime = _nc_gettime(FALSE); + returntime = _nc_gettime(&t0, FALSE); if (milliseconds >= 0) milliseconds -= (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; } } @@ -418,29 +437,29 @@ _nc_timed_wait(int mode, 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 return (result);