From 8f7b0b75b83c3651f92d6a6e6f8ff6c8f17de061 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Sat, 11 Mar 2017 00:21:53 +0100
Subject: Keystroke.c: arrange switch_all_screens and fullscreen close together

Both use the same keystroke 'f' (with different modifiers) for a very
similar function.
---
 etc/keystrokes.cfg                             |  2 +-
 nx-X11/programs/Xserver/hw/nxagent/Keystroke.c |  6 +++---
 nx-X11/programs/Xserver/hw/nxagent/Keystroke.h | 28 +++++++++++++-------------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/etc/keystrokes.cfg b/etc/keystrokes.cfg
index 007a18288..1716d6abe 100644
--- a/etc/keystrokes.cfg
+++ b/etc/keystrokes.cfg
@@ -2,6 +2,7 @@
 <keystrokes>
 <keystroke action="close_session" Control="1" AltMeta="1" key="t" />
 <keystroke action="switch_all_screens" Control="1"  AltMeta="1" key="f" />
+<keystroke action="fullscreen" Control="1" Shift="1" AltMeta="1" key="f" />
 <keystroke action="minimize" Control="1" AltMeta="1" key="m" />
 <keystroke action="resize" Control="1" AltMeta="1" key="r" />
 <keystroke action="defer" Control="1" AltMeta="1" key="e" />
@@ -11,7 +12,6 @@
 <keystroke action="regions_on_screen" Control="1" AltMeta="1" key="a" />
 <keystroke action="test_input" Control="1" AltMeta="1" key="x" />
 <keystroke action="deactivate_input_devices_grab" Control="1" AltMeta="1" key="y" />
-<keystroke action="fullscreen" Control="1" Shift="1" AltMeta="1" key="f" />
 <keystroke action="viewport_move_left" Control="1" Shift="1" AltMeta="1" key="Left" />
 <keystroke action="viewport_move_up" Control="1" AltMeta="1" key="Up" />
 <keystroke action="viewport_move_right" Control="1" AltMeta="1" key="Right" />
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
index 6cb28e938..fc4868d1c 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
@@ -70,6 +70,7 @@ char * nxagentSpecialKeystrokeNames[] = {
        "end_marker",
        "close_session",
        "switch_all_screens",
+       "fullscreen",
        "minimize",
        "left",
        "up",
@@ -85,7 +86,6 @@ char * nxagentSpecialKeystrokeNames[] = {
        "test_input",
        "deactivate_input_devices_grab",
 
-       "fullscreen",
        "viewport_move_left",
        "viewport_move_up",
        "viewport_move_right",
@@ -101,6 +101,8 @@ struct nxagentSpecialKeystrokeMap default_map[] = {
   {KEYSTROKE_CLOSE_SESSION, ControlMask, True, XK_T},
   {KEYSTROKE_SWITCH_ALL_SCREENS, ControlMask, True, XK_f},
   {KEYSTROKE_SWITCH_ALL_SCREENS, ControlMask, True, XK_F},
+  {KEYSTROKE_FULLSCREEN, ControlMask | ShiftMask, True, XK_f},
+  {KEYSTROKE_FULLSCREEN, ControlMask | ShiftMask, True, XK_F},
   {KEYSTROKE_MINIMIZE, ControlMask, True, XK_m},
   {KEYSTROKE_MINIMIZE, ControlMask, True, XK_M},
   {KEYSTROKE_LEFT, ControlMask, True, XK_Left},
@@ -125,8 +127,6 @@ struct nxagentSpecialKeystrokeMap default_map[] = {
   {KEYSTROKE_TEST_INPUT, ControlMask, True, XK_X},
   {KEYSTROKE_DEACTIVATE_INPUT_DEVICES_GRAB, ControlMask, True, XK_y},
   {KEYSTROKE_DEACTIVATE_INPUT_DEVICES_GRAB, ControlMask, True, XK_Y},
-  {KEYSTROKE_FULLSCREEN, ControlMask | ShiftMask, True, XK_f},
-  {KEYSTROKE_FULLSCREEN, ControlMask | ShiftMask, True, XK_F},
   {KEYSTROKE_VIEWPORT_MOVE_LEFT, ControlMask | ShiftMask, True, XK_Left},
   {KEYSTROKE_VIEWPORT_MOVE_LEFT, ControlMask | ShiftMask, True, XK_KP_Left},
   {KEYSTROKE_VIEWPORT_MOVE_UP, ControlMask | ShiftMask, True, XK_Up},
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.h b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.h
index 3f1c5885d..45f507d51 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.h
@@ -42,23 +42,23 @@ enum nxagentSpecialKeystroke {
        KEYSTROKE_END_MARKER = 0,
        KEYSTROKE_CLOSE_SESSION = 1,
        KEYSTROKE_SWITCH_ALL_SCREENS = 2,
-       KEYSTROKE_MINIMIZE = 3,
-       KEYSTROKE_LEFT = 4,
-       KEYSTROKE_UP = 5,
-       KEYSTROKE_RIGHT = 6,
-       KEYSTROKE_DOWN = 7,
-       KEYSTROKE_RESIZE = 8,
-       KEYSTROKE_DEFER = 9,
-       KEYSTROKE_IGNORE = 10,
-       KEYSTROKE_FORCE_SYNCHRONIZATION = 11,
+       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,
 
        /* stuff used for debugging, probably not useful for most people */
-       KEYSTROKE_DEBUG_TREE = 12,
-       KEYSTROKE_REGIONS_ON_SCREEN = 13,
-       KEYSTROKE_TEST_INPUT = 14,
-       KEYSTROKE_DEACTIVATE_INPUT_DEVICES_GRAB = 15,
+       KEYSTROKE_DEBUG_TREE = 13,
+       KEYSTROKE_REGIONS_ON_SCREEN = 14,
+       KEYSTROKE_TEST_INPUT = 15,
+       KEYSTROKE_DEACTIVATE_INPUT_DEVICES_GRAB = 16,
 
-       KEYSTROKE_FULLSCREEN = 16,
        KEYSTROKE_VIEWPORT_MOVE_LEFT = 17,
        KEYSTROKE_VIEWPORT_MOVE_UP = 18,
        KEYSTROKE_VIEWPORT_MOVE_RIGHT = 19,
-- 
cgit v1.2.3