Make AutoGrab work in more situations

Especially switchin to/from fullscreen with active AutoGrab was problematic. Works much smoother now.

Make AutoGrab work in more situations
063813d3 · Ulrich Sibiller · Mike Gabriel · 14d8e0a2 · 063813d3 · 063813d3
Commit 063813d3 authored Jun 27, 2019 by Ulrich Sibiller Committed by Mike Gabriel Aug 27, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 2 deletions

Events.c nx-X11/programs/Xserver/hw/nxagent/Events.c +1 -1

Window.c nx-X11/programs/Xserver/hw/nxagent/Window.c +10 -1

No files found.
--- a/nx-X11/programs/Xserver/hw/nxagent/Events.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c
@@ -1699,7 +1699,7 @@ FIXME: Don't enqueue the KeyRelease event if the key was

        #endif /* NXAGENT_FIXKEYS */

-        if (nxagentOption(AutoGrab))
+        if (nxagentOption(AutoGrab) && !nxagentFullscreenWindow)
        {
          XlibWindow w;
          int revert_to;

--- a/nx-X11/programs/Xserver/hw/nxagent/Window.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c
@@ -754,7 +754,12 @@ void nxagentSwitchFullscreen(ScreenPtr pScreen, Bool switchOn)
  else
  {
    nxagentFullscreenWindow = None;
-    nxagentUngrabPointerAndKeyboard(NULL);
+
+    /* if we had AutoGrab before entering fullscreen reactivate it now */
+    if (nxagentOption(AutoGrab))
+      nxagentGrabPointerAndKeyboard(NULL);
+    else
+      nxagentUngrabPointerAndKeyboard(NULL);
  }
 }

@@ -1005,6 +1010,10 @@ void nxagentSwitchAllScreens(ScreenPtr pScreen, Bool switchOn)
  XMoveResizeWindow(nxagentDisplay, nxagentInputWindows[0], 0, 0,
                        nxagentOption(Width), nxagentOption(Height));

+  /* if we had AutoGrab before entering fullscreen reactivate it now */
+  if (nxagentOption(AutoGrab))
+    nxagentGrabPointerAndKeyboard(NULL);
+
  nxagentSetPrintGeometry(pScreen -> myNum);
 }