--- sourceforge.net/trunk/rdesktop/xwin.c	2003/08/27 22:51:33	450
+++ sourceforge.net/trunk/rdesktop/xwin.c	2003/09/15 08:03:30	470
@@ -656,8 +656,8 @@
 	attribs.override_redirect = g_fullscreen;
 
 	g_wnd = XCreateWindow(g_display, RootWindowOfScreen(g_screen), 0, 0, wndwidth, wndheight,
-			    0, CopyFromParent, InputOutput, CopyFromParent,
-			    CWBackPixel | CWBackingStore | CWOverrideRedirect, &attribs);
+			      0, CopyFromParent, InputOutput, CopyFromParent,
+			      CWBackPixel | CWBackingStore | CWOverrideRedirect, &attribs);
 
 	XStoreName(g_display, g_wnd, g_title);
 
@@ -697,7 +697,7 @@
 	if (g_IM != NULL)
 	{
 		g_IC = XCreateIC(g_IM, XNInputStyle, (XIMPreeditNothing | XIMStatusNothing),
-			       XNClientWindow, g_wnd, XNFocusWindow, g_wnd, NULL);
+				 XNClientWindow, g_wnd, XNFocusWindow, g_wnd, NULL);
 
 		if ((g_IC != NULL)
 		    && (XGetICValues(g_IC, XNFilterEvents, &ic_input_mask, NULL) == NULL))
@@ -833,10 +833,10 @@
 				if (tr.scancode == 0)
 					break;
 
-				save_remote_modifiers();
+				save_remote_modifiers(tr.scancode);
 				ensure_remote_modifiers(ev_time, tr);
 				rdp_send_scancode(ev_time, RDP_KEYPRESS, tr.scancode);
-				restore_remote_modifiers();
+				restore_remote_modifiers(ev_time, tr.scancode);
 
 				break;
 
@@ -885,7 +885,8 @@
 						/* The close button, continue */
 						;
 					}
-					else if (xevent.xbutton.x >= g_width - g_win_button_size * 2)
+					else if (xevent.xbutton.x >=
+						 g_width - g_win_button_size * 2)
 					{
 						/* The maximize/restore button. Do not send to
 						   server.  It might be a good idea to change the
@@ -893,7 +894,8 @@
 						   that rdesktop inhibited this click */
 						break;
 					}
-					else if (xevent.xbutton.x >= g_width - g_win_button_size * 3)
+					else if (xevent.xbutton.x >=
+						 g_width - g_win_button_size * 3)
 					{
 						/* The minimize button. Iconify window. */
 						XIconifyWindow(g_display, g_wnd,