diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-08-16 11:50:10 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-08-16 11:50:10 +0200 |
commit | 7f4b50deb5a41bc88227ce925ecbb3fe713705c2 (patch) | |
tree | 1610ccb35951db123ff9f0eee50e58b00391e27b /nx-X11/programs/Xserver/hw/nxagent/Keystroke.c | |
parent | 360cb5dd9c307be05dfeee93b5303e257b389f1c (diff) | |
parent | ceeb53f0c591b2a0b69343208282cfc2c7872509 (diff) | |
download | nx-libs-7f4b50deb5a41bc88227ce925ecbb3fe713705c2.tar.gz nx-libs-7f4b50deb5a41bc88227ce925ecbb3fe713705c2.tar.bz2 nx-libs-7f4b50deb5a41bc88227ce925ecbb3fe713705c2.zip |
Merge branch 'uli42-pr/no_keystroke_passthrough' into 3.6.x
Attributes GH PR #823: https://github.com/ArcticaProject/nx-libs/pull/823
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Keystroke.c')
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Keystroke.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c index 662da6b04..966b4f842 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c @@ -480,6 +480,9 @@ static enum nxagentSpecialKeystroke find_keystroke(XKeyEvent *X) return ret; } +/* + * returns True if a special keystroke has been pressed. *result will contain the action. + */ Bool nxagentCheckSpecialKeystroke(XKeyEvent *X, enum HandleEventResult *result) { enum nxagentSpecialKeystroke stroke = find_keystroke(X); @@ -629,5 +632,5 @@ Bool nxagentCheckSpecialKeystroke(XKeyEvent *X, enum HandleEventResult *result) case KEYSTROKE_MAX: break; } - return (*result == doNothing); + return (*result != doNothing); } |