--- sourceforge.net/trunk/rdesktop/xwin.c	2004/01/23 08:35:52	580
+++ sourceforge.net/trunk/rdesktop/xwin.c	2004/02/14 23:20:24	606
@@ -23,6 +23,7 @@
 #include <unistd.h>
 #include <time.h>
 #include <errno.h>
+#include <strings.h>
 #include "rdesktop.h"
 #include "xproto.h"
 
@@ -63,7 +64,7 @@
 
 /* software backing store */
 static BOOL g_ownbackstore;
-static Pixmap g_backstore = NULL;
+static Pixmap g_backstore = 0;
 
 /* Moving in single app mode */
 static BOOL g_moving_wnd;
@@ -894,7 +895,7 @@
 	if (g_gc == NULL)
 		g_gc = XCreateGC(g_display, g_wnd, 0, NULL);
 
-	if ((g_ownbackstore) && (g_backstore == NULL))
+	if ((g_ownbackstore) && (g_backstore == 0))
 	{
 		g_backstore = XCreatePixmap(g_display, g_wnd, g_width, g_height, g_depth);
 
@@ -1271,11 +1272,14 @@
 int
 ui_select(int rdp_socket)
 {
-	int n = (rdp_socket > g_x_socket) ? rdp_socket + 1 : g_x_socket + 1;
+	int n;
 	fd_set rfds, wfds;
+	struct timeval tv;
+	BOOL s_timeout = False;
 
 	while (True)
 	{
+		n = (rdp_socket > g_x_socket) ? rdp_socket : g_x_socket;
 		/* Process any events already waiting */
 		if (!xwin_process_events())
 			/* User quit */
@@ -1291,19 +1295,35 @@
 		if (g_dsp_busy)
 		{
 			FD_SET(g_dsp_fd, &wfds);
-			n = (g_dsp_fd + 1 > n) ? g_dsp_fd + 1 : n;
+			n = (g_dsp_fd > n) ? g_dsp_fd : n;
 		}
 #endif
+		/* default timeout */
+		tv.tv_sec = 60;
+		tv.tv_usec = 0;
 
-		switch (select(n, &rfds, &wfds, NULL, NULL))
+		/* add redirection handles */
+		rdpdr_add_fds(&n, &rfds, &wfds, &tv, &s_timeout);
+
+		n++;
+
+		switch (select(n, &rfds, &wfds, NULL, &tv))
 		{
 			case -1:
 				error("select: %s\n", strerror(errno));
 
 			case 0:
+				/* TODO: if tv.tv_sec just times out
+				 * we will segfault.
+				 * FIXME:
+				 */
+				//s_timeout = True;
+				//rdpdr_check_fds(&rfds, &wfds, (BOOL) True);
 				continue;
 		}
 
+		rdpdr_check_fds(&rfds, &wfds, (BOOL) False);
+
 		if (FD_ISSET(rdp_socket, &rfds))
 			return 1;