--- sourceforge.net/trunk/rdesktop/xwin.c	2002/10/04 14:25:37	210
+++ sourceforge.net/trunk/rdesktop/xwin.c	2002/11/25 18:23:44	278
@@ -29,8 +29,11 @@
 extern BOOL sendmotion;
 extern BOOL fullscreen;
 extern BOOL grab_keyboard;
+extern BOOL hide_decorations;
 extern char title[];
 BOOL enable_compose = False;
+BOOL focused;
+BOOL mouse_in_wnd;
 
 Display *display;
 static int x_socket;
@@ -44,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;
@@ -53,6 +57,20 @@
 static BOOL ownbackstore;
 static Pixmap backstore;
 
+/* MWM decorations */
+#define MWM_HINTS_DECORATIONS   (1L << 1)
+#define PROP_MOTIF_WM_HINTS_ELEMENTS    5
+typedef struct
+{
+	unsigned long flags;
+	unsigned long functions;
+	unsigned long decorations;
+	long inputMode;
+	unsigned long status;
+}
+PropMotifWmHints;
+
+
 #define FILL_RECTANGLE(x,y,cx,cy)\
 { \
 	XFillRectangle(display, wnd, gc, x, y, cx, cy); \
@@ -89,6 +107,28 @@
 #define SET_FUNCTION(rop2)	{ if (rop2 != ROP2_COPY) XSetFunction(display, gc, rop2_map[rop2]); }
 #define RESET_FUNCTION(rop2)	{ if (rop2 != ROP2_COPY) XSetFunction(display, gc, GXcopy); }
 
+void
+mwm_hide_decorations(void)
+{
+	PropMotifWmHints motif_hints;
+	Atom hintsatom;
+
+	/* setup the property */
+	motif_hints.flags = MWM_HINTS_DECORATIONS;
+	motif_hints.decorations = 0;
+
+	/* get the atom for the property */
+	hintsatom = XInternAtom(display, "_MOTIF_WM_HINTS", False);
+	if (!hintsatom)
+	{
+		error("Failed to get atom _MOTIF_WM_HINTS\n");
+		return;
+	}
+
+	XChangeProperty(display, wnd, hintsatom, hintsatom, 32, PropModeReplace,
+			(unsigned char *) &motif_hints, PROP_MOTIF_WM_HINTS_ELEMENTS);
+}
+
 static void
 translate8(uint8 * data, uint8 * out, uint8 * end)
 {
@@ -259,6 +299,21 @@
 	host_be = !(BOOL) (*(uint8 *) (&test));
 	xserver_be = (ImageByteOrder(display) == MSBFirst);
 
+	if ((width == 0) || (height == 0))
+	{
+		/* Fetch geometry from _NET_WORKAREA */
+		uint32 xpos, ypos;
+
+		if (get_current_workarea(&xpos, &ypos, &width, &height) < 0)
+		{
+			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;
+		}
+	}
+
 	if (fullscreen)
 	{
 		width = WidthOfScreen(screen);
@@ -326,6 +381,9 @@
 
 	XStoreName(display, wnd, title);
 
+	if (hide_decorations)
+		mwm_hide_decorations();
+
 	classhints = XAllocClassHint();
 	if (classhints != NULL)
 	{
@@ -351,6 +409,10 @@
 		input_mask |= PointerMotionMask;
 	if (ownbackstore)
 		input_mask |= ExposureMask;
+	if (fullscreen || grab_keyboard)
+		input_mask |= EnterWindowMask;
+	if (grab_keyboard)
+		input_mask |= LeaveWindowMask;
 
 	if (IM != NULL)
 	{
@@ -372,8 +434,13 @@
 	}
 	while (xevent.type != VisibilityNotify);
 
-	if (fullscreen)
-		XSetInputFocus(display, wnd, RevertToPointerRoot, CurrentTime);
+	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;
 }
@@ -412,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;
@@ -441,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 */
@@ -463,7 +539,8 @@
 						      str, sizeof(str), &keysym, NULL);
 				}
 
-				DEBUG_KBD(("KeyPress for (keysym 0x%lx, %s)\n", keysym, get_ksname(keysym)));
+				DEBUG_KBD(("KeyPress for (keysym 0x%lx, %s)\n", keysym,
+					   get_ksname(keysym)));
 
 				ev_time = time(NULL);
 				if (handle_special_keys(keysym, xevent.xkey.state, ev_time, True))
@@ -519,18 +596,46 @@
 				break;
 
 			case FocusIn:
-				XQueryPointer(display, wnd, &wdummy, &wdummy, &dummy, &dummy, &dummy, &dummy, &state);
+				if (xevent.xfocus.mode == NotifyGrab)
+					break;
+				focused = True;
+				XQueryPointer(display, wnd, &wdummy, &wdummy, &dummy, &dummy,
+					      &dummy, &dummy, &state);
 				reset_modifier_keys(state);
-				if (grab_keyboard)
+				if (grab_keyboard && mouse_in_wnd)
 					XGrabKeyboard(display, wnd, True,
 						      GrabModeAsync, GrabModeAsync, CurrentTime);
 				break;
 
 			case FocusOut:
+				if (xevent.xfocus.mode == NotifyUngrab)
+					break;
+				focused = False;
 				if (xevent.xfocus.mode == NotifyWhileGrabbed)
 					XUngrabKeyboard(display, CurrentTime);
 				break;
 
+			case EnterNotify:
+				/* we only register for this event when in fullscreen mode */
+				/* or grab_keyboard */
+				mouse_in_wnd = True;
+				if (fullscreen)
+				{
+					XSetInputFocus(display, wnd, RevertToPointerRoot,
+						       CurrentTime);
+					break;
+				}
+				if (focused)
+					XGrabKeyboard(display, wnd, True,
+						      GrabModeAsync, GrabModeAsync, CurrentTime);
+				break;
+
+			case LeaveNotify:
+				/* we only register for this event when grab_keyboard */
+				mouse_in_wnd = False;
+				XUngrabKeyboard(display, CurrentTime);
+				break;
+
 			case Expose:
 				XCopyArea(display, backstore, wnd, gc,
 					  xevent.xexpose.x, xevent.xexpose.y,
@@ -555,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;
@@ -568,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);
@@ -584,7 +694,7 @@
 		}
 
 		if (FD_ISSET(rdp_socket, &rfds))
-			return;
+			return 1;
 	}
 }
 
@@ -1016,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,
@@ -1030,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);
 }
@@ -1100,7 +1214,7 @@
 				else
 				{
 					error("this shouldn't be happening\n");
-					break;
+					exit(1);
 				}
 				/* this will move pointer from start to first character after FF command */
 				length -= i + 3;
@@ -1139,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