--- sourceforge.net/trunk/rdesktop/xkeymap.c	2002/10/11 08:54:08	225
+++ sourceforge.net/trunk/rdesktop/xkeymap.c	2002/11/18 15:31:19	260
@@ -218,8 +218,11 @@
 
 	/* Make keymapname lowercase */
 	mapname_ptr = keymapname;
-	while (*mapname_ptr) 
-	    *mapname_ptr++ = tolower(*mapname_ptr);
+	while (*mapname_ptr)
+	{
+		*mapname_ptr = tolower(*mapname_ptr);
+		mapname_ptr++;
+	}
 
 	if (strcmp(keymapname, "none"))
 	{
@@ -237,53 +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)))
+			    && (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;
 
@@ -494,16 +497,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))