aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2019-05-08 21:49:50 +0200
committerUlrich Sibiller <uli42@gmx.de>2019-05-10 19:13:31 +0200
commit79a2b7b241e61dae4c2ae7a3896f98243e41ff3b (patch)
treed248277404fe9ce595613cbe97ac6061d6df324d
parenta31d2801405834bd52bed6a73b030d124151203b (diff)
downloadnx-libs-79a2b7b241e61dae4c2ae7a3896f98243e41ff3b.tar.gz
nx-libs-79a2b7b241e61dae4c2ae7a3896f98243e41ff3b.tar.bz2
nx-libs-79a2b7b241e61dae4c2ae7a3896f98243e41ff3b.zip
Remove useless "ignore" keystroke for Ctrl-Alt-Backspace
nxagent does not react on that anyway (see xkb/xkbDflts.h)
-rw-r--r--etc/keystrokes.cfg1
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Keystroke.c2
2 files changed, 0 insertions, 3 deletions
diff --git a/etc/keystrokes.cfg b/etc/keystrokes.cfg
index c57d2efbb..856369839 100644
--- a/etc/keystrokes.cfg
+++ b/etc/keystrokes.cfg
@@ -5,7 +5,6 @@
<keystroke action="fullscreen" Control="1" Shift="1" AltMeta="1" key="f" />
<keystroke action="minimize" Control="1" AltMeta="1" key="m" />
<keystroke action="defer" Control="1" AltMeta="1" key="e" />
-<keystroke action="ignore" Control="1" AltMeta="1" key="BackSpace" />
<keystroke action="force_synchronization" Control="1" AltMeta="1" key="j" />
<keystroke action="resize" Control="1" AltMeta="1" key="r" />
<keystroke action="viewport_move_left" Control="1" Shift="1" AltMeta="1" key="Left" />
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
index 6def29ae4..3e02d318d 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
@@ -113,8 +113,6 @@ struct nxagentSpecialKeystrokeMap default_map[] = {
{KEYSTROKE_FULLSCREEN, ControlMask | ShiftMask, True, XK_f},
{KEYSTROKE_MINIMIZE, ControlMask, True, XK_m},
{KEYSTROKE_DEFER, ControlMask, True, XK_e},
- {KEYSTROKE_IGNORE, ControlMask, True, XK_BackSpace},
- {KEYSTROKE_IGNORE, 0, False, XK_Terminate_Server},
{KEYSTROKE_FORCE_SYNCHRONIZATION, ControlMask, True, XK_j},
#ifdef DUMP
{KEYSTROKE_REGIONS_ON_SCREEN, ControlMask, True, XK_a},