--- sourceforge.net/trunk/rdesktop/xwin.c	2003/09/25 22:23:42	472
+++ sourceforge.net/trunk/rdesktop/xwin.c	2003/10/09 03:28:04	481
@@ -34,15 +34,13 @@
 extern char g_title[];
 extern int g_server_bpp;
 extern int g_win_button_size;
-BOOL g_enable_compose = False;
-BOOL g_focused;
-BOOL g_mouse_in_wnd;
 
 Display *g_display;
 Time g_last_gesturetime;
 static int g_x_socket;
 static Screen *g_screen;
 Window g_wnd;
+BOOL g_enable_compose = False;
 static GC g_gc;
 static Visual *g_visual;
 static int g_depth;
@@ -52,6 +50,8 @@
 static XModifierKeymap *g_mod_map;
 static Cursor g_current_cursor;
 static Atom g_protocol_atom, g_kill_atom;
+static BOOL g_focused;
+static BOOL g_mouse_in_wnd;
 
 /* endianness */
 static BOOL g_host_be;
@@ -66,6 +66,11 @@
 static int g_move_x_offset = 0;
 static int g_move_y_offset = 0;
 
+#ifdef WITH_RDPSND
+extern int g_dsp_fd;
+extern BOOL g_dsp_busy;
+#endif
+
 /* MWM decorations */
 #define MWM_HINTS_DECORATIONS   (1L << 1)
 #define PROP_MOTIF_WM_HINTS_ELEMENTS    5
@@ -1078,9 +1083,7 @@
 ui_select(int rdp_socket)
 {
 	int n = (rdp_socket > g_x_socket) ? rdp_socket + 1 : g_x_socket + 1;
-	fd_set rfds;
-
-	FD_ZERO(&rfds);
+	fd_set rfds, wfds;
 
 	while (True)
 	{
@@ -1090,10 +1093,20 @@
 			return 0;
 
 		FD_ZERO(&rfds);
+		FD_ZERO(&wfds);
 		FD_SET(rdp_socket, &rfds);
 		FD_SET(g_x_socket, &rfds);
 
-		switch (select(n, &rfds, NULL, NULL, NULL))
+#ifdef WITH_RDPSND
+		/* FIXME: there should be an API for registering fds */
+		if (g_dsp_busy)
+		{
+			FD_SET(g_dsp_fd, &wfds);
+			n = (g_dsp_fd + 1 > n) ? g_dsp_fd + 1 : n;
+                }
+#endif
+
+		switch (select(n, &rfds, &wfds, NULL, NULL))
 		{
 			case -1:
 				error("select: %s\n", strerror(errno));
@@ -1104,6 +1117,11 @@
 
 		if (FD_ISSET(rdp_socket, &rfds))
 			return 1;
+
+#ifdef WITH_RDPSND
+		if (g_dsp_busy && FD_ISSET(g_dsp_fd, &wfds))
+			wave_out_play();
+#endif
 	}
 }