--- sourceforge.net/trunk/rdesktop/xwin.c	2002/09/24 07:59:14	192
+++ sourceforge.net/trunk/rdesktop/xwin.c	2002/09/24 12:25:21	194
@@ -350,8 +350,6 @@
 	input_mask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
 		StructureNotifyMask | FocusChangeMask;
 
-	if (grab_keyboard)
-		input_mask |= EnterWindowMask | LeaveWindowMask;
 	if (sendmotion)
 		input_mask |= PointerMotionMask;
 	if (ownbackstore)
@@ -518,21 +516,18 @@
 					       MOUSE_FLAG_MOVE, xevent.xmotion.x, xevent.xmotion.y);
 				break;
 
-			case EnterNotify:
+			case FocusIn:
+				reset_modifier_keys();
 				if (grab_keyboard)
 					XGrabKeyboard(display, wnd, True,
 						      GrabModeAsync, GrabModeAsync, CurrentTime);
 				break;
 
-			case LeaveNotify:
+			case FocusOut:
 				if (grab_keyboard)
 					XUngrabKeyboard(display, CurrentTime);
 				break;
 
-			case FocusIn:
-				reset_modifier_keys();
-				break;
-
 			case Expose:
 				XCopyArea(display, backstore, wnd, gc,
 					  xevent.xexpose.x, xevent.xexpose.y,