aboutsummaryrefslogtreecommitdiff
path: root/nx-X11
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2017-03-11 00:21:53 +0100
committerUlrich Sibiller <uli42@gmx.de>2017-03-13 21:24:52 +0100
commit8f7b0b75b83c3651f92d6a6e6f8ff6c8f17de061 (patch)
tree181346484ad3f139f8c5527d068e651067071e35 /nx-X11
parent8f0d885cd21f90722c19ad316623c57db7012fde (diff)
downloadnx-libs-8f7b0b75b83c3651f92d6a6e6f8ff6c8f17de061.tar.gz
nx-libs-8f7b0b75b83c3651f92d6a6e6f8ff6c8f17de061.tar.bz2
nx-libs-8f7b0b75b83c3651f92d6a6e6f8ff6c8f17de061.zip
Keystroke.c: arrange switch_all_screens and fullscreen close together
Both use the same keystroke 'f' (with different modifiers) for a very similar function.
Diffstat (limited to 'nx-X11')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Keystroke.c6
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Keystroke.h28
2 files changed, 17 insertions, 17 deletions
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,