From a4d7a04c45ceac0c33ddd7e32495db07906bdba0 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Thu, 18 May 2017 15:09:29 +0200 Subject: Events.c: do not ungrab keyboard on LeaveNotify when in autograb mode --- nx-X11/programs/Xserver/hw/nxagent/Events.c | 11 +++++++---- 1 file 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) -- cgit v1.2.3