--- sourceforge.net/trunk/rdesktop/xwin.c	2002/09/14 13:47:24	123
+++ sourceforge.net/trunk/rdesktop/xwin.c	2002/09/15 11:53:50	158
@@ -459,8 +459,8 @@
 
 	XUnmapWindow(display, wnd);
 	attribs.override_redirect = fullscreen;
+	XMoveResizeWindow(display, wnd, 0, 0, newwidth, newheight);
 	XChangeWindowAttributes(display, wnd, CWOverrideRedirect, &attribs);
-	XResizeWindow(display, wnd, newwidth, newheight);
 	xwin_map_window();
 }
 
@@ -568,22 +568,21 @@
 					       MOUSE_FLAG_MOVE, xevent.xmotion.x, xevent.xmotion.y);
 				break;
 
-			case FocusIn:
-				/* fall through */
 			case EnterNotify:
 				if (grab_keyboard)
 					XGrabKeyboard(display, wnd, True,
 						      GrabModeAsync, GrabModeAsync, CurrentTime);
 				break;
 
-			case FocusOut:
-				xwin_reset_keys();
-				/* fall through */
 			case LeaveNotify:
 				if (grab_keyboard)
 					XUngrabKeyboard(display, CurrentTime);
 				break;
 
+			case FocusOut:
+				xwin_reset_keys();
+				break;
+
 			case Expose:
 				XCopyArea(display, backstore, wnd, gc,
 					  xevent.xexpose.x, xevent.xexpose.y,