--- sourceforge.net/trunk/rdesktop/xkeymap.c	2002/10/08 02:30:20	216
+++ sourceforge.net/trunk/rdesktop/xkeymap.c	2002/10/11 09:37:48	226
@@ -214,6 +214,12 @@
 xkeymap_init(void)
 {
 	unsigned int max_keycode;
+	char *mapname_ptr;
+
+	/* Make keymapname lowercase */
+	mapname_ptr = keymapname;
+	while (*mapname_ptr)
+		*mapname_ptr++ = tolower(*mapname_ptr);
 
 	if (strcmp(keymapname, "none"))
 	{
@@ -234,7 +240,8 @@
 		case XK_Break:
 		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)))
+			    && (get_key_state(state, XK_Control_L)
+				|| get_key_state(state, XK_Control_R)))
 			{
 				/* Ctrl-Alt-Break: toggle full screen */
 				if (pressed)
@@ -253,7 +260,7 @@
 				}
 				/* No break sequence */
 			}
-			else /* XK_Pause */
+			else	/* XK_Pause */
 			{
 				/* According to MS Keyboard Scan Code
 				   Specification, pressing Pause should result
@@ -265,18 +272,24 @@
 				   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);
+					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);
+					rdp_send_input(ev_time, RDP_INPUT_SCANCODE, RDP_KEYRELEASE,
+						       0x1d, 0);
 				}
 			}
 			return True;
@@ -488,16 +501,20 @@
 	uint32 ev_time;
 	ev_time = time(NULL);
 
-	if (MASK_HAS_BITS(remote_modifier_state, MapLeftShiftMask) && !get_key_state(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(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(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(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(state, XK_Alt_L))