--- sourceforge.net/trunk/rdesktop/xkeymap.c	2002/07/31 06:49:34	85
+++ sourceforge.net/trunk/rdesktop/xkeymap.c	2002/09/14 13:47:24	123
@@ -41,6 +41,8 @@
 static int min_keycode;
 static uint16 remote_modifier_state = 0;
 
+static void update_modifier_state(uint16 modifiers, BOOL pressed);
+
 static void
 add_to_keymap(char *keyname, uint8 scancode, uint16 modifiers, char *mapname)
 {
@@ -175,6 +177,11 @@
 			MASK_ADD_BITS(modifiers, MapLocalStateMask);
 		}
 
+		if (strstr(line_rest, "inhibit"))
+		{
+			MASK_ADD_BITS(modifiers, MapInhibitMask);
+		}
+
 		add_to_keymap(keyname, scancode, modifiers, mapname);
 
 		if (strstr(line_rest, "addupper"))
@@ -195,30 +202,52 @@
 
 /* Before connecting and creating UI */
 void
-xkeymap_init1(void)
+xkeymap_init(void)
 {
+	unsigned int max_keycode;
 	int i;
 
-	/* Zeroing keymap */
-	for (i = 0; i < KEYMAP_SIZE; i++)
-	{
-		keymap[i].scancode = 0;
-		keymap[i].modifiers = 0;
-	}
-
 	if (strcmp(keymapname, "none"))
-	{
 		xkeymap_read(keymapname);
-	}
 
+	XDisplayKeycodes(display, &min_keycode, (int *) &max_keycode);
 }
 
-/* After connecting and creating UI */
-void
-xkeymap_init2(void)
+/* Handles, for example, multi-scancode keypresses (which is not
+   possible via keymap-files) */
+BOOL
+handle_special_keys(KeySym keysym, uint32 ev_time, BOOL pressed)
 {
-	unsigned int max_keycode;
-	XDisplayKeycodes(display, &min_keycode, (int *) &max_keycode);
+	switch (keysym)
+	{
+		case XK_Break:	/* toggle full screen */
+			if (pressed && (get_key_state(XK_Alt_L) || get_key_state(XK_Alt_R)))
+			{
+				xwin_toggle_fullscreen();
+				return True;
+			}
+			break;
+
+		case XK_Meta_L:	/* Windows keys */
+		case XK_Super_L:
+		case XK_Hyper_L:
+		case XK_Meta_R:
+		case XK_Super_R:
+		case XK_Hyper_R:
+			if (pressed)
+			{
+				rdp_send_scancode(ev_time, RDP_KEYPRESS, SCANCODE_CHAR_LCTRL);
+				rdp_send_scancode(ev_time, RDP_KEYPRESS, SCANCODE_CHAR_ESC);
+			}
+			else
+			{
+				rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_ESC);
+				rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_LCTRL);
+			}
+			return True;
+			break;
+	}
+	return False;
 }
 
 
@@ -229,6 +258,13 @@
 
 	tr = keymap[keysym & KEYMAP_MASK];
 
+	if (tr.modifiers & MapInhibitMask)
+	{
+		DEBUG_KBD(("Inhibiting key\n"));
+		tr.scancode = 0;
+		return tr;
+	}
+
 	if (tr.modifiers & MapLocalStateMask)
 	{
 		/* The modifiers to send for this key should be obtained
@@ -247,17 +283,17 @@
 		return tr;
 	}
 
-	printf("No translation for (keysym 0x%lx, %s)\n", keysym, get_ksname(keysym));
+	fprintf(stderr, "No translation for (keysym 0x%lx, %s)\n", keysym, get_ksname(keysym));
 
 	/* not in keymap, try to interpret the raw scancode */
 	if ((keycode >= min_keycode) && (keycode <= 0x60))
 	{
 		tr.scancode = keycode - min_keycode;
-		printf("Sending guessed scancode 0x%x\n", tr.scancode);
+		fprintf(stderr, "Sending guessed scancode 0x%x\n", tr.scancode);
 	}
 	else
 	{
-		printf("No good guess for keycode 0x%x found\n", keycode);
+		fprintf(stderr, "No good guess for keycode 0x%x found\n", keycode);
 	}
 
 	return tr;
@@ -296,22 +332,6 @@
 	return ksname;
 }
 
-BOOL
-inhibit_key(KeySym keysym)
-{
-	switch (keysym)
-	{
-		case XK_Caps_Lock:
-			return True;
-			break;
-		case XK_Multi_key:
-			return True;
-			break;
-		default:
-			break;
-	}
-	return False;
-}
 
 void
 ensure_remote_modifiers(uint32 ev_time, key_translation tr)
@@ -372,30 +392,33 @@
 	    != MASK_HAS_BITS(remote_modifier_state, MapNumLockMask))
 	{
 		/* The remote modifier state is not correct */
-		DEBUG_KBD(("Remote NumLock state is incorrect. Toggling\n"));
+		uint16 new_remote_state = 0;
+
 		if (MASK_HAS_BITS(tr.modifiers, MapNumLockMask))
 		{
-			/* Needs this modifier. Toggle */
-			rdp_send_scancode(ev_time, RDP_KEYPRESS, SCANCODE_CHAR_NUMLOCK);
-			rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_NUMLOCK);
+			DEBUG_KBD(("Remote NumLock state is incorrect, activating NumLock.\n"));
+			new_remote_state |= KBD_FLAG_NUMLOCK;
 		}
 		else
 		{
-			/* Should not use this modifier. Toggle */
-			rdp_send_scancode(ev_time, RDP_KEYPRESS, SCANCODE_CHAR_NUMLOCK);
-			rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_NUMLOCK);
+			DEBUG_KBD(("Remote NumLock state is incorrect, deactivating NumLock.\n"));
 		}
-	}
 
+		rdp_send_input(0, RDP_INPUT_SYNCHRONIZE, 0, new_remote_state, 0);
+		update_modifier_state(SCANCODE_CHAR_NUMLOCK, True);
+	}
 }
 
 
 static void
 update_modifier_state(uint16 modifiers, BOOL pressed)
 {
+#ifdef WITH_DEBUG_KBD
+	uint16 old_modifier_state;
+
+	old_modifier_state = remote_modifier_state;
+#endif
 
-	DEBUG_KBD(("Before updating modifier_state:0x%x, pressed=0x%x\n",
-		   remote_modifier_state, pressed));
 	switch (modifiers)
 	{
 		case SCANCODE_CHAR_LSHIFT:
@@ -436,7 +459,15 @@
 			}
 			break;
 	}
-	DEBUG_KBD(("After updating modifier_state:0x%x\n", remote_modifier_state));
+
+#ifdef WITH_DEBUG_KBD
+	if (old_modifier_state != remote_modifier_state)
+	{
+		DEBUG_KBD(("Before updating modifier_state:0x%x, pressed=0x%x\n",
+			   old_modifier_state, pressed));
+		DEBUG_KBD(("After updating modifier_state:0x%x\n", remote_modifier_state));
+	}
+#endif
 
 }