--- sourceforge.net/trunk/rdesktop/xkeymap.c	2003/09/08 08:27:57	466
+++ sourceforge.net/trunk/rdesktop/xkeymap.c	2003/11/03 13:33:35	543
@@ -38,6 +38,7 @@
 #define KEYMAP_MAX_LINE_LENGTH 80
 
 extern Display *g_display;
+extern Window g_wnd;
 extern char keymapname[16];
 extern int keylayout;
 extern int g_win_button_size;
@@ -185,11 +186,6 @@
 			MASK_ADD_BITS(modifiers, MapLeftShiftMask);
 		}
 
-		if (strstr(line_rest, "numlock"))
-		{
-			MASK_ADD_BITS(modifiers, MapNumLockMask);
-		}
-
 		if (strstr(line_rest, "localstate"))
 		{
 			MASK_ADD_BITS(modifiers, MapLocalStateMask);
@@ -450,17 +446,44 @@
 	return ksname;
 }
 
+static BOOL
+is_modifier(uint8 scancode)
+{
+	switch (scancode)
+	{
+		case SCANCODE_CHAR_LSHIFT:
+		case SCANCODE_CHAR_RSHIFT:
+		case SCANCODE_CHAR_LCTRL:
+		case SCANCODE_CHAR_RCTRL:
+		case SCANCODE_CHAR_LALT:
+		case SCANCODE_CHAR_RALT:
+		case SCANCODE_CHAR_LWIN:
+		case SCANCODE_CHAR_RWIN:
+		case SCANCODE_CHAR_NUMLOCK:
+			return True;
+		default:
+			break;
+	}
+	return False;
+}
+
 void
-save_remote_modifiers()
+save_remote_modifiers(uint8 scancode)
 {
+	if (is_modifier(scancode))
+		return;
+
 	saved_remote_modifier_state = remote_modifier_state;
 }
 
 void
-restore_remote_modifiers(uint32 ev_time)
+restore_remote_modifiers(uint32 ev_time, uint8 scancode)
 {
 	key_translation dummy;
 
+	if (is_modifier(scancode))
+		return;
+
 	dummy.scancode = 0;
 	dummy.modifiers = saved_remote_modifier_state;
 	ensure_remote_modifiers(ev_time, dummy);
@@ -470,44 +493,8 @@
 ensure_remote_modifiers(uint32 ev_time, key_translation tr)
 {
 	/* If this key is a modifier, do nothing */
-	switch (tr.scancode)
-	{
-		case SCANCODE_CHAR_LSHIFT:
-		case SCANCODE_CHAR_RSHIFT:
-		case SCANCODE_CHAR_LCTRL:
-		case SCANCODE_CHAR_RCTRL:
-		case SCANCODE_CHAR_LALT:
-		case SCANCODE_CHAR_RALT:
-		case SCANCODE_CHAR_LWIN:
-		case SCANCODE_CHAR_RWIN:
-		case SCANCODE_CHAR_NUMLOCK:
-			return;
-		default:
-			break;
-	}
-
-	/* NumLock */
-	if (MASK_HAS_BITS(tr.modifiers, MapNumLockMask)
-	    != MASK_HAS_BITS(remote_modifier_state, MapNumLockMask))
-	{
-		/* The remote modifier state is not correct */
-		uint16 new_remote_state;
-
-		if (MASK_HAS_BITS(tr.modifiers, MapNumLockMask))
-		{
-			DEBUG_KBD(("Remote NumLock state is incorrect, activating NumLock.\n"));
-			new_remote_state = KBD_FLAG_NUMLOCK;
-			remote_modifier_state = MapNumLockMask;
-		}
-		else
-		{
-			DEBUG_KBD(("Remote NumLock state is incorrect, deactivating NumLock.\n"));
-			new_remote_state = 0;
-			remote_modifier_state = 0;
-		}
-
-		rdp_send_input(0, RDP_INPUT_SYNCHRONIZE, 0, new_remote_state, 0);
-	}
+	if (is_modifier(tr.scancode))
+		return;
 
 	/* Shift. Left shift and right shift are treated as equal; either is fine. */
 	if (MASK_HAS_BITS(tr.modifiers, MapShiftMask)
@@ -557,9 +544,35 @@
 }
 
 
+unsigned int
+read_keyboard_state()
+{
+	unsigned int state;
+	Window wdummy;
+	int dummy;
+
+	XQueryPointer(g_display, g_wnd, &wdummy, &wdummy, &dummy, &dummy, &dummy, &dummy, &state);
+	return state;
+}
+
+
+uint16
+ui_get_numlock_state(unsigned int state)
+{
+	uint16 numlock_state = 0;
+
+	if (get_key_state(state, XK_Num_Lock))
+		numlock_state = KBD_FLAG_NUMLOCK;
+
+	return numlock_state;
+}
+
+
 void
-reset_modifier_keys(unsigned int state)
+reset_modifier_keys()
 {
+	unsigned int state = read_keyboard_state();
+
 	/* reset keys */
 	uint32 ev_time;
 	ev_time = time(NULL);
@@ -586,6 +599,8 @@
 	if (MASK_HAS_BITS(remote_modifier_state, MapRightAltMask) &&
 	    !get_key_state(state, XK_Alt_R) && !get_key_state(state, XK_Mode_switch))
 		rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_RALT);
+
+	rdp_send_input(ev_time, RDP_INPUT_SYNCHRONIZE, 0, ui_get_numlock_state(state), 0);
 }
 
 
@@ -624,19 +639,6 @@
 		case SCANCODE_CHAR_RWIN:
 			MASK_CHANGE_BIT(remote_modifier_state, MapRightWinMask, pressed);
 			break;
-		case SCANCODE_CHAR_NUMLOCK:
-			/* KeyReleases for NumLocks are sent immediately. Toggle the
-			   modifier state only on Keypress */
-			if (pressed)
-			{
-				BOOL newNumLockState;
-				newNumLockState =
-					(MASK_HAS_BITS
-					 (remote_modifier_state, MapNumLockMask) == False);
-				MASK_CHANGE_BIT(remote_modifier_state,
-						MapNumLockMask, newNumLockState);
-			}
-			break;
 	}
 
 #ifdef WITH_DEBUG_KBD