aboutsummaryrefslogtreecommitdiff
path: root/contrib/ncurses/ncurses/tty/lib_twait.c
diff options
context:
space:
mode:
authorRong-En Fan <rafan@FreeBSD.org>2008-05-09 02:28:12 +0000
committerRong-En Fan <rafan@FreeBSD.org>2008-05-09 02:28:12 +0000
commitaa59d4d4c5dda7e1c6f9dc0cc6edc58992a525c7 (patch)
tree502fa0a691368fb8b60b62eef10b3f3332efe830 /contrib/ncurses/ncurses/tty/lib_twait.c
parentd8977eaf361f5fdc1261c3f3524988f661ed926e (diff)
downloadsrc-aa59d4d4c5dda7e1c6f9dc0cc6edc58992a525c7.tar.gz
src-aa59d4d4c5dda7e1c6f9dc0cc6edc58992a525c7.zip
Import ncurses 5.6-20080503 snapshot onto the vender branchvendor/ncurses/5.6-20080503
Notes
Notes: svn path=/vendor/ncurses/dist/; revision=178866 svn path=/vendor/ncurses/5.6-20080503/; revision=178868; tag=vendor/ncurses/5.6-20080503
Diffstat (limited to 'contrib/ncurses/ncurses/tty/lib_twait.c')
-rw-r--r--contrib/ncurses/ncurses/tty/lib_twait.c29
1 files changed, 11 insertions, 18 deletions
diff --git a/contrib/ncurses/ncurses/tty/lib_twait.c b/contrib/ncurses/ncurses/tty/lib_twait.c
index 1e4546dec0c0..6d46081862fd 100644
--- a/contrib/ncurses/ncurses/tty/lib_twait.c
+++ b/contrib/ncurses/ncurses/tty/lib_twait.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2007,2008 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 *
@@ -62,15 +62,7 @@
# endif
#endif
-MODULE_ID("$Id: lib_twait.c,v 1.54 2007/08/11 16:32:48 tom Exp $")
-
-#if HAVE_GETTIMEOFDAY
-# define PRECISE_GETTIME 1
-# define TimeType struct timeval
-#else
-# define PRECISE_GETTIME 0
-# define TimeType time_t
-#endif
+MODULE_ID("$Id: lib_twait.c,v 1.57 2008/05/03 21:35:57 tom Exp $")
static long
_nc_gettime(TimeType * t0, bool first)
@@ -145,7 +137,8 @@ _nc_eventlist_timeout(_nc_eventlist * evl)
* descriptors.
*/
NCURSES_EXPORT(int)
-_nc_timed_wait(int mode,
+_nc_timed_wait(SCREEN *sp,
+ int mode,
int milliseconds,
int *timeleft
EVENTLIST_2nd(_nc_eventlist * evl))
@@ -207,12 +200,12 @@ _nc_timed_wait(int mode,
#endif
if (mode & 1) {
- fds[count].fd = SP->_ifd;
+ fds[count].fd = sp->_ifd;
fds[count].events = POLLIN;
count++;
}
if ((mode & 2)
- && (fd = SP->_mouse_fd) >= 0) {
+ && (fd = sp->_mouse_fd) >= 0) {
fds[count].fd = fd;
fds[count].events = POLLIN;
count++;
@@ -315,11 +308,11 @@ _nc_timed_wait(int mode,
FD_ZERO(&set);
if (mode & 1) {
- FD_SET(SP->_ifd, &set);
- count = SP->_ifd + 1;
+ FD_SET(sp->_ifd, &set);
+ count = sp->_ifd + 1;
}
if ((mode & 2)
- && (fd = SP->_mouse_fd) >= 0) {
+ && (fd = sp->_mouse_fd) >= 0) {
FD_SET(fd, &set);
count = max(fd, count) + 1;
}
@@ -432,11 +425,11 @@ _nc_timed_wait(int mode,
result = 1; /* redundant, but simple */
#elif HAVE_SELECT
if ((mode & 2)
- && (fd = SP->_mouse_fd) >= 0
+ && (fd = sp->_mouse_fd) >= 0
&& FD_ISSET(fd, &set))
result |= 2;
if ((mode & 1)
- && FD_ISSET(SP->_ifd, &set))
+ && FD_ISSET(sp->_ifd, &set))
result |= 1;
#endif
} else