--- sourceforge.net/trunk/rdesktop/xkeymap.c	2002/10/11 09:38:49	227
+++ sourceforge.net/trunk/rdesktop/xkeymap.c	2003/01/30 11:20:30	300
@@ -27,8 +27,8 @@
 #include "rdesktop.h"
 #include "scancodes.h"
 
-#define KEYMAP_SIZE 4096
-#define KEYMAP_MASK (KEYMAP_SIZE - 1)
+#define KEYMAP_SIZE 0xffff+1
+#define KEYMAP_MASK 0xffff
 #define KEYMAP_MAX_LINE_LENGTH 80
 
 extern Display *display;
@@ -51,7 +51,7 @@
 	keysym = XStringToKeysym(keyname);
 	if (keysym == NoSymbol)
 	{
-		error("Bad keysym %s in keymap %s\n", keyname, mapname);
+		warning("Bad keysym %s in keymap %s\n", keyname, mapname);
 		return;
 	}
 
@@ -198,7 +198,7 @@
 			/* Automatically add uppercase key, with same modifiers 
 			   plus shift */
 			for (p = keyname; *p; p++)
-				*p = toupper(*p);
+				*p = toupper((int)*p);
 			MASK_ADD_BITS(modifiers, MapLeftShiftMask);
 			add_to_keymap(keyname, scancode, modifiers, mapname);
 		}
@@ -220,7 +220,7 @@
 	mapname_ptr = keymapname;
 	while (*mapname_ptr)
 	{
-		*mapname_ptr = tolower(*mapname_ptr);
+		*mapname_ptr = tolower((int)*mapname_ptr);
 		mapname_ptr++;
 	}
 
@@ -240,60 +240,53 @@
 {
 	switch (keysym)
 	{
-		case XK_Break:
-		case XK_Pause:
+		case XK_Return:
 			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)))
 			{
-				/* Ctrl-Alt-Break: toggle full screen */
+				/* Ctrl-Alt-Enter: toggle full screen */
 				if (pressed)
 					xwin_toggle_fullscreen();
+				return True;
+			}
+			break;
 
+		case XK_Break:
+			/* Send Break sequence E0 46 E0 C6 */
+			if (pressed)
+			{
+				rdp_send_scancode(ev_time, RDP_KEYPRESS,
+						  (SCANCODE_EXTENDED | 0x46));
+				rdp_send_scancode(ev_time, RDP_KEYPRESS,
+						  (SCANCODE_EXTENDED | 0xc6));
 			}
-			else if (keysym == XK_Break)
+			/* No release sequence */
+			return True;
+
+		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)
 			{
-				/* Send Break sequence E0 46 E0 C6 */
-				if (pressed)
-				{
-					rdp_send_scancode(ev_time, RDP_KEYPRESS,
-							  (SCANCODE_EXTENDED | 0x46));
-					rdp_send_scancode(ev_time, RDP_KEYPRESS,
-							  (SCANCODE_EXTENDED | 0xc6));
-				}
-				/* No break sequence */
+				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	/* XK_Pause */
+			else
 			{
-				/* 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);
-				}
+				/* Release Left Ctrl */
+				rdp_send_input(ev_time, RDP_INPUT_SCANCODE, RDP_KEYRELEASE,
+					       0x1d, 0);
 			}
 			return True;
 
@@ -351,7 +344,7 @@
 	}
 
 	if (keymap_loaded)
-		error("No translation for (keysym 0x%lx, %s)\n", keysym, get_ksname(keysym));
+		warning("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))