aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2017-05-18 15:09:29 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-08-27 14:10:16 +0200
commita4d7a04c45ceac0c33ddd7e32495db07906bdba0 (patch)
tree999412c27be3a5b188b1a8eaab3d610e3be26405
parent6dcdc578f450c71933d7f7c40383358f73e45358 (diff)
downloadnx-libs-a4d7a04c45ceac0c33ddd7e32495db07906bdba0.tar.gz
nx-libs-a4d7a04c45ceac0c33ddd7e32495db07906bdba0.tar.bz2
nx-libs-a4d7a04c45ceac0c33ddd7e32495db07906bdba0.zip
Events.c: do not ungrab keyboard on LeaveNotify when in autograb mode
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Events.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c
index c9f5324a0..76a324fdb 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Events.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c
@@ -1846,11 +1846,14 @@ FIXME: Don't enqueue the KeyRelease event if the key was
nxagentLastEnteredWindow = NULL;
}
- if (X.xcrossing.window == nxagentDefaultWindows[0] &&
- X.xcrossing.detail != NotifyInferior &&
- X.xcrossing.mode == NotifyNormal)
+ if (!nxagentOption(AutoGrab))
{
- nxagentUngrabPointerAndKeyboard(&X);
+ if (X.xcrossing.window == nxagentDefaultWindows[0] &&
+ X.xcrossing.detail != NotifyInferior &&
+ X.xcrossing.mode == NotifyNormal)
+ {
+ nxagentUngrabPointerAndKeyboard(&X);
+ }
}
if (X.xcrossing.detail != NotifyInferior)