--- sourceforge.net/trunk/rdesktop/xkeymap.c	2002/09/11 11:45:20	118
+++ sourceforge.net/trunk/rdesktop/xkeymap.c	2002/09/17 16:57:07	183
@@ -25,6 +25,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <limits.h>
+#include <assert.h>
 #include "rdesktop.h"
 #include "scancodes.h"
 
@@ -202,29 +203,14 @@
 
 /* Before connecting and creating UI */
 void
-xkeymap_init1(void)
+xkeymap_init(void)
 {
+	unsigned int max_keycode;
 	int i;
 
-	/* Zeroing keymap */
-	for (i = 0; i < KEYMAP_SIZE; i++)
-	{
-		keymap[i].scancode = 0;
-		keymap[i].modifiers = 0;
-	}
-
 	if (strcmp(keymapname, "none"))
-	{
 		xkeymap_read(keymapname);
-	}
-
-}
 
-/* After connecting and creating UI */
-void
-xkeymap_init2(void)
-{
-	unsigned int max_keycode;
 	XDisplayKeycodes(display, &min_keycode, (int *) &max_keycode);
 }
 
@@ -238,7 +224,7 @@
 		case XK_Break:	/* toggle full screen */
 			if (pressed && (get_key_state(XK_Alt_L) || get_key_state(XK_Alt_R)))
 			{
-				toggle_fullscreen();
+				xwin_toggle_fullscreen();
 				return True;
 			}
 			break;
@@ -304,6 +290,15 @@
 	if ((keycode >= min_keycode) && (keycode <= 0x60))
 	{
 		tr.scancode = keycode - min_keycode;
+
+		/* The modifiers to send for this key should be
+		   obtained from the local state. Currently, only
+		   shift is implemented. */
+		if (state & ShiftMask)
+		{
+			tr.modifiers = MapLeftShiftMask;
+		}
+
 		fprintf(stderr, "Sending guessed scancode 0x%x\n", tr.scancode);
 	}
 	else
@@ -368,20 +363,34 @@
 			break;
 	}
 
-	/* Shift */
+	/* Shift. Left shift and right shift are treated as equal; either is fine. */
 	if (MASK_HAS_BITS(tr.modifiers, MapShiftMask)
 	    != MASK_HAS_BITS(remote_modifier_state, MapShiftMask))
 	{
 		/* The remote modifier state is not correct */
-		if (MASK_HAS_BITS(tr.modifiers, MapShiftMask))
+		if (MASK_HAS_BITS(tr.modifiers, MapLeftShiftMask))
 		{
-			/* Needs this modifier. Send down. */
+			/* Needs left shift. Send down. */
 			rdp_send_scancode(ev_time, RDP_KEYPRESS, SCANCODE_CHAR_LSHIFT);
 		}
+		else if (MASK_HAS_BITS(tr.modifiers, MapRightShiftMask))
+		{
+			/* Needs right shift. Send down. */
+			rdp_send_scancode(ev_time, RDP_KEYPRESS, SCANCODE_CHAR_RSHIFT);
+		}
 		else
 		{
-			/* Should not use this modifier. Send up. */
-			rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_LSHIFT);
+			/* Should not use this modifier. Send up for shift currently pressed. */
+			if (MASK_HAS_BITS(remote_modifier_state, MapLeftShiftMask))
+				/* Left shift is down */
+				rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_LSHIFT);
+			else
+			{
+				assert(MASK_HAS_BITS(remote_modifier_state, MapRightShiftMask));
+				/* Right shift is down */
+				rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_RSHIFT);
+			}
+
 		}
 	}
 
@@ -425,6 +434,34 @@
 }
 
 
+void
+reset_modifier_keys()
+{
+	/* reset keys */
+	uint32 ev_time;
+	ev_time = time(NULL);
+
+	if (MASK_HAS_BITS(remote_modifier_state, MapLeftShiftMask) && !get_key_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))
+		rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_RSHIFT);
+
+	if (MASK_HAS_BITS(remote_modifier_state, MapLeftCtrlMask) && !get_key_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))
+		rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_RCTRL);
+
+	if (MASK_HAS_BITS(remote_modifier_state, MapLeftAltMask) && !get_key_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))
+		rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_RALT);
+}
+
+
 static void
 update_modifier_state(uint16 modifiers, BOOL pressed)
 {