--- sourceforge.net/trunk/rdesktop/xwin.c	2002/11/19 14:22:47	273
+++ sourceforge.net/trunk/rdesktop/xwin.c	2002/11/25 18:23:44	278
@@ -47,6 +47,7 @@
 static XIC IC;
 static XModifierKeymap *mod_map;
 static Cursor current_cursor;
+static Atom protocol_atom, kill_atom;
 
 /* endianness */
 static BOOL host_be;
@@ -308,7 +309,8 @@
 			error("Failed to get workarea.\n");
 			error("Perhaps your window manager does not support EWMH?\n");
 			error("Defaulting to geometry 800x600\n");
-			width = 800; height = 600;
+			width = 800;
+			height = 600;
 		}
 	}
 
@@ -435,6 +437,11 @@
 	focused = False;
 	mouse_in_wnd = False;
 
+	/* handle the WM_DELETE_WINDOW protocol */
+	protocol_atom = XInternAtom(display, "WM_PROTOCOLS", True);
+	kill_atom = XInternAtom(display, "WM_DELETE_WINDOW", True);
+	XSetWMProtocols(display, wnd, &kill_atom, 1);
+
 	return True;
 }
 
@@ -472,8 +479,9 @@
 	}
 }
 
-/* Process all events in Xlib queue */
-static void
+/* Process all events in Xlib queue 
+   Returns 0 after user quit, 1 otherwise */
+static int
 xwin_process_events(void)
 {
 	XEvent xevent;
@@ -501,6 +509,14 @@
 
 		switch (xevent.type)
 		{
+			case ClientMessage:
+				/* the window manager told us to quit */
+				if ((xevent.xclient.message_type == protocol_atom)
+				    && (xevent.xclient.data.l[0] == kill_atom))
+					/* Quit */
+					return 0;
+				break;
+
 			case KeyPress:
 				if (IC != NULL)
 					/* Multi_key compatible version */
@@ -644,9 +660,12 @@
 
 		}
 	}
+	/* Keep going */
+	return 1;
 }
 
-void
+/* Returns 0 after user quit, 1 otherwise */
+int
 ui_select(int rdp_socket)
 {
 	int n = (rdp_socket > x_socket) ? rdp_socket + 1 : x_socket + 1;
@@ -657,7 +676,9 @@
 	while (True)
 	{
 		/* Process any events already waiting */
-		xwin_process_events();
+		if (!xwin_process_events())
+			/* User quit */
+			return 0;
 
 		FD_ZERO(&rfds);
 		FD_SET(rdp_socket, &rfds);
@@ -673,7 +694,7 @@
 		}
 
 		if (FD_ISSET(rdp_socket, &rfds))
-			return;
+			return 1;
 	}
 }
 
@@ -1105,6 +1126,7 @@
 	FILL_RECTANGLE(x, y, cx, cy);
 }
 
+/* warning, this function only draws on wnd or backstore, not both */
 void
 ui_draw_glyph(int mixmode,
 	      /* dest */ int x, int y, int cx, int cy,
@@ -1119,7 +1141,10 @@
 	XSetStipple(display, gc, (Pixmap) glyph);
 	XSetTSOrigin(display, gc, x, y);
 
-	FILL_RECTANGLE(x, y, cx, cy);
+	if (ownbackstore)
+		XFillRectangle(display, backstore, gc, x, y, cx, cy);
+	else
+		XFillRectangle(display, wnd, gc, x, y, cx, cy);
 
 	XSetFillStyle(display, gc, FillSolid);
 }
@@ -1228,8 +1253,15 @@
 				break;
 		}
 	}
-
-
+	if (ownbackstore)
+	{
+		if (boxcx > 1)
+			XCopyArea(display, backstore, wnd, gc, boxx,
+				  boxy, boxcx, boxcy, boxx, boxy);
+		else
+			XCopyArea(display, backstore, wnd, gc, clipx,
+				  clipy, clipcx, clipcy, clipx, clipy);
+	}
 }
 
 void