--- sourceforge.net/trunk/rdesktop/xkeymap.c	2002/09/25 11:17:59	199
+++ sourceforge.net/trunk/rdesktop/xkeymap.c	2002/09/26 14:11:59	205
@@ -36,11 +36,12 @@
 extern int keylayout;
 extern BOOL enable_compose;
 
+static BOOL keymap_loaded;
 static key_translation keymap[KEYMAP_SIZE];
 static int min_keycode;
 static uint16 remote_modifier_state = 0;
 
-static void update_modifier_state(uint16 modifiers, BOOL pressed);
+static void update_modifier_state(uint8 scancode, BOOL pressed);
 
 static void
 add_to_keymap(char *keyname, uint8 scancode, uint16 modifiers, char *mapname)
@@ -206,7 +207,10 @@
 	unsigned int max_keycode;
 
 	if (strcmp(keymapname, "none"))
-		xkeymap_read(keymapname);
+	{
+		if (xkeymap_read(keymapname))
+			keymap_loaded = True;
+	}
 
 	XDisplayKeycodes(display, &min_keycode, (int *) &max_keycode);
 }
@@ -214,12 +218,12 @@
 /* Handles, for example, multi-scancode keypresses (which is not
    possible via keymap-files) */
 BOOL
-handle_special_keys(uint32 keysym, uint32 ev_time, BOOL pressed)
+handle_special_keys(uint32 keysym, unsigned int state, uint32 ev_time, BOOL pressed)
 {
 	switch (keysym)
 	{
 		case XK_Break:
-			if (get_key_state(XK_Alt_L) || get_key_state(XK_Alt_R))
+			if (get_key_state(state, XK_Alt_L) || get_key_state(state, XK_Alt_R))
 			{
 				/* toggle full screen */
 				if (pressed)
@@ -324,7 +328,8 @@
 		return tr;
 	}
 
-	DEBUG_KBD(("No translation for (keysym 0x%lx, %s)\n", keysym, get_ksname(keysym)));
+	if (keymap_loaded)
+		error("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))
@@ -471,35 +476,35 @@
 
 
 void
-reset_modifier_keys(void)
+reset_modifier_keys(unsigned int state)
 {
 	/* reset keys */
 	uint32 ev_time;
 	ev_time = time(NULL);
 
-	if (MASK_HAS_BITS(remote_modifier_state, MapLeftShiftMask) && !get_key_state(XK_Shift_L))
+	if (MASK_HAS_BITS(remote_modifier_state, MapLeftShiftMask) && !get_key_state(state, XK_Shift_L))
 		rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_LSHIFT);
 
-	if (MASK_HAS_BITS(remote_modifier_state, MapRightShiftMask) && !get_key_state(XK_Shift_R))
+	if (MASK_HAS_BITS(remote_modifier_state, MapRightShiftMask) && !get_key_state(state, XK_Shift_R))
 		rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_RSHIFT);
 
-	if (MASK_HAS_BITS(remote_modifier_state, MapLeftCtrlMask) && !get_key_state(XK_Control_L))
+	if (MASK_HAS_BITS(remote_modifier_state, MapLeftCtrlMask) && !get_key_state(state, XK_Control_L))
 		rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_LCTRL);
 
-	if (MASK_HAS_BITS(remote_modifier_state, MapRightCtrlMask) && !get_key_state(XK_Control_R))
+	if (MASK_HAS_BITS(remote_modifier_state, MapRightCtrlMask) && !get_key_state(state, XK_Control_R))
 		rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_RCTRL);
 
-	if (MASK_HAS_BITS(remote_modifier_state, MapLeftAltMask) && !get_key_state(XK_Alt_L))
+	if (MASK_HAS_BITS(remote_modifier_state, MapLeftAltMask) && !get_key_state(state, XK_Alt_L))
 		rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_LALT);
 
 	if (MASK_HAS_BITS(remote_modifier_state, MapRightAltMask) &&
-	    !get_key_state(XK_Alt_R) && !get_key_state(XK_Mode_switch))
+	    !get_key_state(state, XK_Alt_R) && !get_key_state(state, XK_Mode_switch))
 		rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_RALT);
 }
 
 
 static void
-update_modifier_state(uint16 modifiers, BOOL pressed)
+update_modifier_state(uint8 scancode, BOOL pressed)
 {
 #ifdef WITH_DEBUG_KBD
 	uint16 old_modifier_state;
@@ -507,7 +512,7 @@
 	old_modifier_state = remote_modifier_state;
 #endif
 
-	switch (modifiers)
+	switch (scancode)
 	{
 		case SCANCODE_CHAR_LSHIFT:
 			MASK_CHANGE_BIT(remote_modifier_state, MapLeftShiftMask, pressed);
@@ -561,7 +566,7 @@
 
 /* Send keyboard input */
 void
-rdp_send_scancode(uint32 time, uint16 flags, uint16 scancode)
+rdp_send_scancode(uint32 time, uint16 flags, uint8 scancode)
 {
 	update_modifier_state(scancode, !(flags & RDP_KEYRELEASE));