nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

don't use XPutBackEvent and mess up timestamp order in the event queue

Browse source
This commit is contained in:
Dana Jansens 2010-04-23 11:50:24 -04:00
parent 72fe65fd22
commit bb97a20777
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
openbox/window.c
View file

@ -146,6 +146,13 @@ void window_manage_all(void)
if (children) XFree(children); if (children) XFree(children);
} }
static Bool check_unmap(Display *d, XEvent *e, XPointer arg)
{
const Window win = *(Window*)arg;
return ((e->type == DestroyNotify && e->xdestroywindow.window == win) ||
(e->type == UnmapNotify && e->xunmap.window == win));
}
void window_manage(Window win) void window_manage(Window win)
{ {
XEvent e; XEvent e;
@ -158,10 +165,7 @@ void window_manage(Window win)
/* check if it has already been unmapped by the time we started /* check if it has already been unmapped by the time we started
mapping. the grab does a sync so we don't have to here */ mapping. the grab does a sync so we don't have to here */
if (XCheckTypedWindowEvent(obt_display, win, DestroyNotify, &e) || if (XCheckIfEvent(obt_display, &e, check_unmap, (XPointer)&win)) {
XCheckTypedWindowEvent(obt_display, win, UnmapNotify, &e))
{
XPutBackEvent(obt_display, &e);
ob_debug("Trying to manage unmapped window. Aborting that."); ob_debug("Trying to manage unmapped window. Aborting that.");
no_manage = TRUE; no_manage = TRUE;
} }