Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-06 08:32:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed FD stuff for WIN32.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/trunk@194 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet
1999-01-07 17:20:03 +00:00
parent 268771388c
commit 18fa377d51
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Fl_win32.cxx
+5 -13
View File
@@ -1,5 +1,5 @@
// //
// "$Id: Fl_win32.cxx,v 1.22 1999/01/07 16:43:04 mike Exp $" // "$Id: Fl_win32.cxx,v 1.23 1999/01/07 17:20:03 mike Exp $"
// //
// WIN32-specific code for the Fast Light Tool Kit (FLTK). // WIN32-specific code for the Fast Light Tool Kit (FLTK).
// //
@@ -48,12 +48,10 @@
#define POLLIN 1 #define POLLIN 1
#define POLLOUT 4 #define POLLOUT 4
#define POLLERR 8 #define POLLERR 8
struct pollfd {int fd; short events; short revents;};
#define MAXFD 8 #define MAXFD 8
#if !HAVE_POLL
static fd_set fdsets[3]; static fd_set fdsets[3];
static int maxfd;
#endif
static int nfds; static int nfds;
static struct pollfd fds[MAXFD]; static struct pollfd fds[MAXFD];
static struct { static struct {
@@ -66,12 +64,9 @@ void Fl::add_fd(int n, int events, void (*cb)(int, void*), void *v) {
if (nfds < MAXFD) {i = nfds; nfds++;} else {i = MAXFD-1;} if (nfds < MAXFD) {i = nfds; nfds++;} else {i = MAXFD-1;}
fds[i].fd = n; fds[i].fd = n;
fds[i].events = events; fds[i].events = events;
#if !HAVE_POLL
if (events & POLLIN) FD_SET(n, &fdsets[0]); if (events & POLLIN) FD_SET(n, &fdsets[0]);
if (events & POLLOUT) FD_SET(n, &fdsets[1]); if (events & POLLOUT) FD_SET(n, &fdsets[1]);
if (events & POLLERR) FD_SET(n, &fdsets[2]); if (events & POLLERR) FD_SET(n, &fdsets[2]);
if (n > maxfd) maxfd = n;
#endif
fd[i].cb = cb; fd[i].cb = cb;
fd[i].arg = v; fd[i].arg = v;
} }
@@ -87,12 +82,9 @@ void Fl::remove_fd(int n) {
else {if (j<i) {fd[j]=fd[i]; fds[j]=fds[i];} j++;} else {if (j<i) {fd[j]=fd[i]; fds[j]=fds[i];} j++;}
} }
nfds = j; nfds = j;
#if !HAVE_POLL
FD_CLR(n, &fdsets[0]); FD_CLR(n, &fdsets[0]);
FD_CLR(n, &fdsets[1]); FD_CLR(n, &fdsets[1]);
FD_CLR(n, &fdsets[2]); FD_CLR(n, &fdsets[2]);
if (n == maxfd) maxfd--;
#endif
} }
MSG fl_msg; MSG fl_msg;
@@ -107,7 +99,7 @@ int fl_ready() {
fdt[0] = fdsets[0]; fdt[0] = fdsets[0];
fdt[1] = fdsets[1]; fdt[1] = fdsets[1];
fdt[2] = fdsets[2]; fdt[2] = fdsets[2];
return ::select(maxfd+1,&fdt[0],&fdt[1],&fdt[2],&t); return ::select(0,&fdt[0],&fdt[1],&fdt[2],&t);
} }
double fl_wait(int timeout_flag, double time) { double fl_wait(int timeout_flag, double time) {
@@ -127,7 +119,7 @@ double fl_wait(int timeout_flag, double time) {
fdt[1] = fdsets[1]; fdt[1] = fdsets[1];
fdt[2] = fdsets[2]; fdt[2] = fdsets[2];
if (::select(maxfd+1,&fdt[0],&fdt[1],&fdt[2],&t)) { if (::select(0,&fdt[0],&fdt[1],&fdt[2],&t)) {
// We got something - do the callback! // We got something - do the callback!
for (int i = 0; i < nfds; i ++) { for (int i = 0; i < nfds; i ++) {
int f = fds[i].fd; int f = fds[i].fd;
@@ -870,5 +862,5 @@ void Fl_Window::make_current() {
} }
// //
// End of "$Id: Fl_win32.cxx,v 1.22 1999/01/07 16:43:04 mike Exp $". // End of "$Id: Fl_win32.cxx,v 1.23 1999/01/07 17:20:03 mike Exp $".
// //