--- sourceforge.net/trunk/rdesktop/xwin.c	2002/10/04 14:25:37	210
+++ sourceforge.net/trunk/rdesktop/xwin.c	2002/11/18 15:35:41	261
@@ -31,6 +31,8 @@
 extern BOOL grab_keyboard;
 extern char title[];
 BOOL enable_compose = False;
+BOOL focused;
+BOOL mouse_in_wnd;
 
 Display *display;
 static int x_socket;
@@ -351,6 +353,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 +378,8 @@
 	}
 	while (xevent.type != VisibilityNotify);
 
-	if (fullscreen)
-		XSetInputFocus(display, wnd, RevertToPointerRoot, CurrentTime);
+	focused = False;
+	mouse_in_wnd = False;
 
 	return True;
 }
@@ -463,7 +469,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 +526,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,