--- sourceforge.net/trunk/rdesktop/xkeymap.c	2003/01/30 11:20:30	300
+++ sourceforge.net/trunk/rdesktop/xkeymap.c	2003/02/20 12:14:13	333
@@ -18,9 +18,13 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#ifdef RDP2VNC
+#include "vnc/x11stubs.h"
+#else
 #include <X11/Xlib.h>
-#define XK_MISCELLANY
-#include <X11/keysymdef.h>
+#include <X11/keysym.h>
+#endif
+
 #include <ctype.h>
 #include <limits.h>
 #include <time.h>
@@ -34,6 +38,7 @@
 extern Display *display;
 extern char keymapname[16];
 extern int keylayout;
+extern int win_button_size;
 extern BOOL enable_compose;
 
 static BOOL keymap_loaded;
@@ -51,7 +56,7 @@
 	keysym = XStringToKeysym(keyname);
 	if (keysym == NoSymbol)
 	{
-		warning("Bad keysym %s in keymap %s\n", keyname, mapname);
+		DEBUG_KBD(("Bad keysym \"%s\" in keymap %s (ignoring)\n", keyname, mapname));
 		return;
 	}
 
@@ -198,7 +203,7 @@
 			/* Automatically add uppercase key, with same modifiers 
 			   plus shift */
 			for (p = keyname; *p; p++)
-				*p = toupper((int)*p);
+				*p = toupper((int) *p);
 			MASK_ADD_BITS(modifiers, MapLeftShiftMask);
 			add_to_keymap(keyname, scancode, modifiers, mapname);
 		}
@@ -220,7 +225,7 @@
 	mapname_ptr = keymapname;
 	while (*mapname_ptr)
 	{
-		*mapname_ptr = tolower((int)*mapname_ptr);
+		*mapname_ptr = tolower((int) *mapname_ptr);
 		mapname_ptr++;
 	}
 
@@ -307,6 +312,13 @@
 				rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_LCTRL);
 			}
 			return True;
+
+		case XK_space:
+			/* Prevent access to the Windows system menu in single app mode */
+			if (win_button_size
+			    && (get_key_state(state, XK_Alt_L) || get_key_state(state, XK_Alt_R)))
+				return True;
+
 	}
 	return False;
 }
@@ -423,6 +435,29 @@
 			break;
 	}
 
+	/* NumLock */
+	if (MASK_HAS_BITS(tr.modifiers, MapNumLockMask)
+	    != MASK_HAS_BITS(remote_modifier_state, MapNumLockMask))
+	{
+		/* The remote modifier state is not correct */
+		uint16 new_remote_state;
+
+		if (MASK_HAS_BITS(tr.modifiers, MapNumLockMask))
+		{
+			DEBUG_KBD(("Remote NumLock state is incorrect, activating NumLock.\n"));
+			new_remote_state = KBD_FLAG_NUMLOCK;
+			remote_modifier_state = MapNumLockMask;
+		}
+		else
+		{
+			DEBUG_KBD(("Remote NumLock state is incorrect, deactivating NumLock.\n"));
+			new_remote_state = 0;
+			remote_modifier_state = 0;
+		}
+
+		rdp_send_input(0, RDP_INPUT_SYNCHRONIZE, 0, new_remote_state, 0);
+	}
+
 	/* 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))
@@ -467,26 +502,7 @@
 		}
 	}
 
-	/* NumLock */
-	if (MASK_HAS_BITS(tr.modifiers, MapNumLockMask)
-	    != MASK_HAS_BITS(remote_modifier_state, MapNumLockMask))
-	{
-		/* The remote modifier state is not correct */
-		uint16 new_remote_state = 0;
 
-		if (MASK_HAS_BITS(tr.modifiers, MapNumLockMask))
-		{
-			DEBUG_KBD(("Remote NumLock state is incorrect, activating NumLock.\n"));
-			new_remote_state |= KBD_FLAG_NUMLOCK;
-		}
-		else
-		{
-			DEBUG_KBD(("Remote NumLock state is incorrect, deactivating NumLock.\n"));
-		}
-
-		rdp_send_input(0, RDP_INPUT_SYNCHRONIZE, 0, new_remote_state, 0);
-		update_modifier_state(SCANCODE_CHAR_NUMLOCK, True);
-	}
 }