--- sourceforge.net/trunk/rdesktop/xkeymap.c	2002/09/26 14:04:30	203
+++ sourceforge.net/trunk/rdesktop/xkeymap.c	2002/10/06 13:25:30	212
@@ -1,7 +1,7 @@
 /*
    rdesktop: A Remote Desktop Protocol client.
    User interface services - X keyboard mapping
-   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
@@ -36,6 +36,7 @@
 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;
@@ -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);
 }
@@ -219,14 +223,16 @@
 	switch (keysym)
 	{
 		case XK_Break:
-			if (get_key_state(state, XK_Alt_L) || get_key_state(state, XK_Alt_R))
+		case XK_Pause:
+			if ((get_key_state(state, XK_Alt_L) || get_key_state(state, XK_Alt_R))
+				&& (get_key_state(state, XK_Control_L) || get_key_state(state, XK_Control_R)))
 			{
-				/* toggle full screen */
+				/* Ctrl-Alt-Break: toggle full screen */
 				if (pressed)
 					xwin_toggle_fullscreen();
 
 			}
-			else
+			else if (keysym == XK_Break)
 			{
 				/* Send Break sequence E0 46 E0 C6 */
 				if (pressed)
@@ -238,37 +244,33 @@
 				}
 				/* No break sequence */
 			}
-
-			return True;
-			break;
-
-		case XK_Pause:
-			/* According to MS Keyboard Scan Code
-			   Specification, pressing Pause should result
-			   in E1 1D 45 E1 9D C5. I'm not exactly sure
-			   of how this is supposed to be sent via
-			   RDP. The code below seems to work, but with
-			   the side effect that Left Ctrl stays
-			   down. Therefore, we release it when Pause
-			   is released. */
-			if (pressed)
-			{
-				rdp_send_input(ev_time, RDP_INPUT_SCANCODE, RDP_KEYPRESS, 0xe1, 0);
-				rdp_send_input(ev_time, RDP_INPUT_SCANCODE, RDP_KEYPRESS, 0x1d, 0);
-				rdp_send_input(ev_time, RDP_INPUT_SCANCODE, RDP_KEYPRESS, 0x45, 0);
-				rdp_send_input(ev_time, RDP_INPUT_SCANCODE, RDP_KEYPRESS, 0xe1, 0);
-				rdp_send_input(ev_time, RDP_INPUT_SCANCODE, RDP_KEYPRESS, 0x9d, 0);
-				rdp_send_input(ev_time, RDP_INPUT_SCANCODE, RDP_KEYPRESS, 0xc5, 0);
-			}
-			else
+			else /* XK_Pause */
 			{
-				// Release Left Ctrl
-				rdp_send_input(ev_time, RDP_INPUT_SCANCODE, RDP_KEYRELEASE, 0x1d,
-					       0);
+				/* According to MS Keyboard Scan Code
+				   Specification, pressing Pause should result
+				   in E1 1D 45 E1 9D C5. I'm not exactly sure
+				   of how this is supposed to be sent via
+				   RDP. The code below seems to work, but with
+				   the side effect that Left Ctrl stays
+				   down. Therefore, we release it when Pause
+				   is released. */
+				if (pressed)
+				{
+					rdp_send_input(ev_time, RDP_INPUT_SCANCODE, RDP_KEYPRESS, 0xe1, 0);
+					rdp_send_input(ev_time, RDP_INPUT_SCANCODE, RDP_KEYPRESS, 0x1d, 0);
+					rdp_send_input(ev_time, RDP_INPUT_SCANCODE, RDP_KEYPRESS, 0x45, 0);
+					rdp_send_input(ev_time, RDP_INPUT_SCANCODE, RDP_KEYPRESS, 0xe1, 0);
+					rdp_send_input(ev_time, RDP_INPUT_SCANCODE, RDP_KEYPRESS, 0x9d, 0);
+					rdp_send_input(ev_time, RDP_INPUT_SCANCODE, RDP_KEYPRESS, 0xc5, 0);
+				}
+				else
+				{
+					/* Release Left Ctrl */
+					rdp_send_input(ev_time, RDP_INPUT_SCANCODE, RDP_KEYRELEASE, 0x1d,
+						       0);
+				}
 			}
-
 			return True;
-			break;
 
 		case XK_Meta_L:	/* Windows keys */
 		case XK_Super_L:
@@ -287,7 +289,6 @@
 				rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_LCTRL);
 			}
 			return True;
-			break;
 	}
 	return False;
 }
@@ -324,7 +325,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))