KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

X11: Fix race in window hovered query

Browse Source 
From upstream: ceb20c7f97.
This commit is contained in:
Luflosi 2020-07-11 18:18:33 +02:00
parent 40eb8455d0
commit 431d013d32
No known key found for this signature in database
GPG Key ID: 4E41E29EDCC345D0
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
glfw/x11_window.c vendored
View File

@ -2460,11 +2460,19 @@ int _glfwPlatformWindowHovered(_GLFWwindow* window)
int rootX, rootY, childX, childY; int rootX, rootY, childX, childY;
unsigned int mask; unsigned int mask;
if (!XQueryPointer(_glfw.x11.display, w, _glfwGrabErrorHandlerX11();
&root, &w, &rootX, &rootY, &childX, &childY, &mask))
{ const Bool result = XQueryPointer(_glfw.x11.display, w,
&root, &w, &rootX, &rootY,
&childX, &childY, &mask);
_glfwReleaseErrorHandlerX11();
if (_glfw.x11.errorCode == BadWindow)
w = _glfw.x11.root;
if (!result)
return false; return false;
}
if (w == window->x11.handle) if (w == window->x11.handle)
return true; return true;