We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Patch to only attempt to grab the X11 window if it is actually mapped

xgrab-map.diff (text/plain), 1.55 KB, created by Lee Salzman on 2020-11-13 18:33:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lee Salzman

Created: 2020-11-13 18:33:05 UTC

Size: 1.55 KB

patch

obsolete

>diff --git a/src/video/x11/SDL_x11events.c b/src/video/x11/SDL_x11events.c
>--- a/src/video/x11/SDL_x11events.c
>+++ b/src/video/x11/SDL_x11events.c
>@@ -431,12 +431,15 @@ X11_DispatchFocusOut(_THIS, SDL_WindowDa
> }
> 
> static void
> X11_DispatchMapNotify(SDL_WindowData *data)
> {
>-    SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_RESTORED, 0, 0);
>-    SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_SHOWN, 0, 0);
>+    SDL_Window *window = data->window;
>+    SDL_SendWindowEvent(window, SDL_WINDOWEVENT_RESTORED, 0, 0);
>+    SDL_SendWindowEvent(window, SDL_WINDOWEVENT_SHOWN, 0, 0);
>+    if (!(window->flags & SDL_WINDOW_HIDDEN) && (window->flags & SDL_WINDOW_INPUT_FOCUS))
>+        SDL_UpdateWindowGrab(window);
> }
> 
> static void
> X11_DispatchUnmapNotify(SDL_WindowData *data)
> {
>diff --git a/src/video/x11/SDL_x11window.c b/src/video/x11/SDL_x11window.c
>--- a/src/video/x11/SDL_x11window.c
>+++ b/src/video/x11/SDL_x11window.c
>@@ -1574,10 +1574,14 @@ X11_SetWindowGrab(_THIS, SDL_Window * wi
>        the cursor so we don't pan around the virtual desktop.
>      */
>     oldstyle_fullscreen = X11_IsWindowLegacyFullscreen(_this, window);
> 
>     if (oldstyle_fullscreen || grabbed) {
>+        /* If the window is unmapped, XGrab calls return GrabNotViewable */
>+        if (window->flags & SDL_WINDOW_HIDDEN)
>+            return;
>+
>         /* Try to grab the mouse */
>         if (!data->videodata->broken_pointer_grab) {
>             const unsigned int mask = ButtonPressMask | ButtonReleaseMask | PointerMotionMask | FocusChangeMask;
>             int attempts;
>             int result;

Actions: View | Diff

Attachments on bug 5352: 4520

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.