1 files changed, 34 insertions, 28 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.h b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.h
index 48ed65b35..13a83d0fe 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.h
@@ -29,8 +29,8 @@
 #include "Events.h"
 
 extern Bool nxagentCheckSpecialKeystroke(XKeyEvent*, enum HandleEventResult*);
-
-unsigned int nxagentAltMetaMask;
+extern void nxagentDumpKeystrokes(void);
+extern void nxagentInitKeystrokes(Bool force);
 
 /* keep this sorted, do not rely on any numerical value in this enum, and be aware
  * that KEYSTROKE_MAX may be used in a malloc */
@@ -39,39 +39,45 @@ unsigned int nxagentAltMetaMask;
  * Keystroke.c nxagentSpecialKeystrokeNames */
 enum nxagentSpecialKeystroke {
        /* 0 is used as end marker */
-       KEYSTROKE_END_MARKER = 0,
-       KEYSTROKE_CLOSE_SESSION = 1,
-       KEYSTROKE_SWITCH_ALL_SCREENS = 2,
-       KEYSTROKE_FULLSCREEN = 3,
-       KEYSTROKE_MINIMIZE = 4,
-       KEYSTROKE_LEFT = 5,
-       KEYSTROKE_UP = 6,
-       KEYSTROKE_RIGHT = 7,
-       KEYSTROKE_DOWN = 8,
-       KEYSTROKE_RESIZE = 9,
-       KEYSTROKE_DEFER = 10,
-       KEYSTROKE_IGNORE = 11,
-       KEYSTROKE_FORCE_SYNCHRONIZATION = 12,
+       KEYSTROKE_END_MARKER,
+       KEYSTROKE_CLOSE_SESSION,
+       KEYSTROKE_SWITCH_ALL_SCREENS,
+       KEYSTROKE_FULLSCREEN,
+       KEYSTROKE_MINIMIZE,
+       KEYSTROKE_DEFER,
+       KEYSTROKE_IGNORE,
+       KEYSTROKE_FORCE_SYNCHRONIZATION,
 
        /* stuff used for debugging, probably not useful for most people */
-       KEYSTROKE_DEBUG_TREE = 13,
-       KEYSTROKE_REGIONS_ON_SCREEN = 14,
-       KEYSTROKE_TEST_INPUT = 15,
-       KEYSTROKE_DEACTIVATE_INPUT_DEVICES_GRAB = 16,
+#ifdef DEBUG_TREE
+       KEYSTROKE_DEBUG_TREE,
+#endif
+#ifdef DUMP
+       KEYSTROKE_REGIONS_ON_SCREEN,
+#endif
+#ifdef NX_DEBUG_INPUT
+       KEYSTROKE_TEST_INPUT,
+       KEYSTROKE_DEACTIVATE_INPUT_DEVICES_GRAB,
+#endif
 
-       KEYSTROKE_VIEWPORT_MOVE_LEFT = 17,
-       KEYSTROKE_VIEWPORT_MOVE_UP = 18,
-       KEYSTROKE_VIEWPORT_MOVE_RIGHT = 19,
-       KEYSTROKE_VIEWPORT_MOVE_DOWN = 20,
+       /* all the viewport stuff */
+       KEYSTROKE_RESIZE,
+       KEYSTROKE_VIEWPORT_MOVE_LEFT,
+       KEYSTROKE_VIEWPORT_MOVE_UP,
+       KEYSTROKE_VIEWPORT_MOVE_RIGHT,
+       KEYSTROKE_VIEWPORT_MOVE_DOWN,
+       KEYSTROKE_VIEWPORT_SCROLL_LEFT,
+       KEYSTROKE_VIEWPORT_SCROLL_UP,
+       KEYSTROKE_VIEWPORT_SCROLL_RIGHT,
+       KEYSTROKE_VIEWPORT_SCROLL_DOWN,
 
-       KEYSTROKE_REREAD_KEYSTROKES = 21,
+       KEYSTROKE_REREAD_KEYSTROKES,
 
-       KEYSTROKE_NOTHING = 22,
+       KEYSTROKE_NOTHING,
 
-       /* insert more here, increment KEYSTROKE_MAX accordingly.
-        * then update string translation below */
+       /* insert more here and in the string translation */
 
-       KEYSTROKE_MAX = 23,
+       KEYSTROKE_MAX,
 };
 
 struct nxagentSpecialKeystrokeMap {