Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-10-03 13:20:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Catch BadWindow errors from incorrect _NET_SUPPORTING_WM_CHECK values

Browse Source
This commit is contained in:
sp3d 2014-02-11 04:07:56 +00:00
parent 7f4e947447
commit 566d18c59e
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/x11_init.c
View File

@ -334,6 +334,16 @@ static Atom getSupportedAtom(Atom* supportedAtoms,
return None; return None;
} }
// X error handler and state variable needed to catch BadWindow in detectEWMH
//
static Bool handlerRan;
static int setFlagOnXError(Display* display, XErrorEvent* err)
{
handlerRan = True;
return 0;
}
// Check whether the running window manager is EWMH-compliant // Check whether the running window manager is EWMH-compliant
// //
static void detectEWMH(void) static void detectEWMH(void)
@ -359,15 +369,28 @@ static void detectEWMH(void)
return; return;
} }
// Since we don't trust that the window ID is valid, we set an error handler
// In order to ensure the handler runs immediately, also make XLib
// synchronous for the duration
handlerRan = False;
int (*oldHandler)(Display*, XErrorEvent*) = XSetErrorHandler(setFlagOnXError);
XSynchronize(_glfw.x11.display, True);
// It should be the ID of a child window (of the root) // It should be the ID of a child window (of the root)
// Then we look for the same property on the child window // Then we look for the same property on the child window
if (_glfwGetWindowProperty(*windowFromRoot, unsigned long windowCount = _glfwGetWindowProperty(*windowFromRoot,
supportingWmCheck, supportingWmCheck,
XA_WINDOW, XA_WINDOW,
(unsigned char**) &windowFromChild) != 1) (unsigned char**) &windowFromChild);
XSetErrorHandler(oldHandler);
XSynchronize(_glfw.x11.display, False);
if (windowCount != 1 || handlerRan)
{ {
XFree(windowFromRoot); XFree(windowFromRoot);
XFree(windowFromChild); if (!handlerRan)
XFree(windowFromChild);
return; return;
} }