--- sourceforge.net/trunk/rdesktop/xwin.c	2002/09/25 11:07:12	196
+++ sourceforge.net/trunk/rdesktop/xwin.c	2002/10/02 13:51:16	209
@@ -1,7 +1,7 @@
 /*
    rdesktop: A Remote Desktop Protocol client.
    User interface services - X Window System
-   Copyright (C) Matthew Chapman 1999-2001
+   Copyright (C) Matthew Chapman 1999-2002
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -42,6 +42,7 @@
 static int bpp;
 static XIM IM;
 static XIC IC;
+static XModifierKeymap *mod_map;
 static Cursor current_cursor;
 
 /* endianness */
@@ -183,15 +184,11 @@
 }
 
 BOOL
-get_key_state(int keysym)
+get_key_state(unsigned int state, uint32 keysym)
 {
-	int keysymMask = 0, modifierpos, key;
-	Window wDummy1, wDummy2;
-	int iDummy3, iDummy4, iDummy5, iDummy6;
-	unsigned int current_state;
+	int modifierpos, key, keysymMask = 0;
 	int offset;
 
-	XModifierKeymap *map = XGetModifierMapping(display);
 	KeyCode keycode = XKeysymToKeycode(display, keysym);
 
 	if (keycode == NoSymbol)
@@ -199,21 +196,16 @@
 
 	for (modifierpos = 0; modifierpos < 8; modifierpos++)
 	{
-		offset = map->max_keypermod * modifierpos;
+		offset = mod_map->max_keypermod * modifierpos;
 
-		for (key = 0; key < map->max_keypermod; key++)
+		for (key = 0; key < mod_map->max_keypermod; key++)
 		{
-			if (map->modifiermap[offset + key] == keycode)
-				keysymMask = 1 << modifierpos;
+			if (mod_map->modifiermap[offset + key] == keycode)
+				keysymMask |= 1 << modifierpos;
 		}
 	}
 
-	XQueryPointer(display, DefaultRootWindow(display), &wDummy1,
-		      &wDummy2, &iDummy3, &iDummy4, &iDummy5, &iDummy6, &current_state);
-
-	XFreeModifiermap(map);
-
-	return (current_state & keysymMask) ? True : False;
+	return (state & keysymMask) ? True : False;
 }
 
 BOOL
@@ -286,6 +278,8 @@
 		XFillRectangle(display, backstore, gc, 0, 0, width, height);
 	}
 
+	mod_map = XGetModifierMapping(display);
+
 	if (enable_compose)
 		IM = XOpenIM(display, NULL, NULL, NULL);
 
@@ -299,6 +293,8 @@
 	if (IM != NULL)
 		XCloseIM(IM);
 
+	XFreeModifiermap(mod_map);
+
 	if (ownbackstore)
 		XFreePixmap(display, backstore);
 
@@ -349,7 +345,7 @@
 	}
 
 	input_mask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
-		StructureNotifyMask | FocusChangeMask;
+		VisibilityChangeMask | FocusChangeMask;
 
 	if (sendmotion)
 		input_mask |= PointerMotionMask;
@@ -369,12 +365,12 @@
 	XSelectInput(display, wnd, input_mask);
 	XMapWindow(display, wnd);
 
-	/* wait for MapNotify */
+	/* wait for VisibilityNotify */
 	do
 	{
-		XMaskEvent(display, StructureNotifyMask, &xevent);
+		XMaskEvent(display, VisibilityChangeMask, &xevent);
 	}
-	while (xevent.type != MapNotify);
+	while (xevent.type != VisibilityNotify);
 
 	if (fullscreen)
 		XSetInputFocus(display, wnd, RevertToPointerRoot, CurrentTime);
@@ -425,9 +421,11 @@
 	uint16 button, flags;
 	uint32 ev_time;
 	key_translation tr;
-	char *ksname = NULL;
 	char str[256];
 	Status status;
+	unsigned int state;
+	Window wdummy;
+	int dummy;
 
 	while (XPending(display) > 0)
 	{
@@ -439,7 +437,6 @@
 			continue;
 		}
 
-		ev_time = time(NULL);
 		flags = 0;
 
 		switch (xevent.type)
@@ -466,10 +463,10 @@
 						      str, sizeof(str), &keysym, NULL);
 				}
 
-				ksname = get_ksname(keysym);
-				DEBUG_KBD(("KeyPress for (keysym 0x%lx, %s)\n", keysym, ksname));
+				DEBUG_KBD(("KeyPress for (keysym 0x%lx, %s)\n", keysym, get_ksname(keysym)));
 
-				if (handle_special_keys(keysym, ev_time, True))
+				ev_time = time(NULL);
+				if (handle_special_keys(keysym, xevent.xkey.state, ev_time, True))
 					break;
 
 				tr = xkeymap_translate_key(keysym,
@@ -482,15 +479,16 @@
 
 				rdp_send_scancode(ev_time, RDP_KEYPRESS, tr.scancode);
 				break;
+
 			case KeyRelease:
 				XLookupString((XKeyEvent *) & xevent, str,
 					      sizeof(str), &keysym, NULL);
 
-				ksname = get_ksname(keysym);
 				DEBUG_KBD(("\nKeyRelease for (keysym 0x%lx, %s)\n", keysym,
-					   ksname));
+					   get_ksname(keysym)));
 
-				if (handle_special_keys(keysym, ev_time, False))
+				ev_time = time(NULL);
+				if (handle_special_keys(keysym, xevent.xkey.state, ev_time, False))
 					break;
 
 				tr = xkeymap_translate_key(keysym,
@@ -511,24 +509,25 @@
 				if (button == 0)
 					break;
 
-				rdp_send_input(ev_time, RDP_INPUT_MOUSE,
+				rdp_send_input(time(NULL), RDP_INPUT_MOUSE,
 					       flags | button, xevent.xbutton.x, xevent.xbutton.y);
 				break;
 
 			case MotionNotify:
-				rdp_send_input(ev_time, RDP_INPUT_MOUSE,
+				rdp_send_input(time(NULL), RDP_INPUT_MOUSE,
 					       MOUSE_FLAG_MOVE, xevent.xmotion.x, xevent.xmotion.y);
 				break;
 
 			case FocusIn:
-				reset_modifier_keys();
+				XQueryPointer(display, wnd, &wdummy, &wdummy, &dummy, &dummy, &dummy, &dummy, &state);
+				reset_modifier_keys(state);
 				if (grab_keyboard)
 					XGrabKeyboard(display, wnd, True,
 						      GrabModeAsync, GrabModeAsync, CurrentTime);
 				break;
 
 			case FocusOut:
-				if (grab_keyboard)
+				if (xevent.xfocus.mode == NotifyWhileGrabbed)
 					XUngrabKeyboard(display, CurrentTime);
 				break;
 
@@ -546,6 +545,12 @@
 				if (xevent.xmapping.request == MappingKeyboard
 				    || xevent.xmapping.request == MappingModifier)
 					XRefreshKeyboardMapping(&xevent.xmapping);
+
+				if (xevent.xmapping.request == MappingModifier)
+				{
+					XFreeModifiermap(mod_map);
+					mod_map = XGetModifierMapping(display);
+				}
 				break;
 
 		}