From 8f7b0b75b83c3651f92d6a6e6f8ff6c8f17de061 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller 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. --- nx-X11/programs/Xserver/hw/nxagent/Keystroke.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'nx-X11/programs/Xserver/hw/nxagent/Keystroke.c') 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}, -- cgit v1.2.3