--- sourceforge.net/trunk/rdesktop/xwin.c	2002/08/26 17:14:04	102
+++ sourceforge.net/trunk/rdesktop/xwin.c	2002/09/11 11:11:27	116
@@ -429,9 +429,6 @@
 		attribs.override_redirect = False;
 	}
 
-	width = (width + 3) & ~3;	/* make width a multiple of 32 bits */
-
-
 	input_mask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
 		VisibilityChangeMask | FocusChangeMask;
 
@@ -589,20 +586,14 @@
 				ksname = get_ksname(keysym);
 				DEBUG_KBD(("\nKeyPress for (keysym 0x%lx, %s)\n", keysym, ksname));
 
-				if (inhibit_key(keysym))
-				{
-					DEBUG_KBD(("Inhibiting key\n"));
-					break;
-				}
-
 				tr = xkeymap_translate_key(keysym,
 							   xevent.xkey.keycode, xevent.xkey.state);
 
-				ensure_remote_modifiers(ev_time, tr);
-
 				if (tr.scancode == 0)
 					break;
 
+				ensure_remote_modifiers(ev_time, tr);
+
 				rdp_send_scancode(ev_time, RDP_KEYPRESS, tr.scancode);
 				break;
 			case KeyRelease:
@@ -613,9 +604,6 @@
 				DEBUG_KBD(("\nKeyRelease for (keysym 0x%lx, %s)\n", keysym,
 					   ksname));
 
-				if (inhibit_key(keysym))
-					break;
-
 				tr = xkeymap_translate_key(keysym,
 							   xevent.xkey.keycode, xevent.xkey.state);