#include "prompt.h"
#include "debug.h"
#include "grab.h"
+#include "obt/xqueue.h"
static GHashTable *window_map;
return ((ObClient*)self)->layer;
case OB_WINDOW_CLASS_MENUFRAME:
case OB_WINDOW_CLASS_INTERNAL:
- case OB_WINDOW_CLASS_PROMPT:
return OB_STACKING_LAYER_INTERNAL;
+ case OB_WINDOW_CLASS_PROMPT:
+ /* not used directly for stacking, prompts are managed as clients */
+ g_assert_not_reached();
+ break;
}
g_assert_not_reached();
return None;
if (children) XFree(children);
}
+static gboolean check_unmap(XEvent *e, gpointer data)
+{
+ const Window win = *(Window*)data;
+ return ((e->type == DestroyNotify && e->xdestroywindow.window == win) ||
+ (e->type == UnmapNotify && e->xunmap.window == win));
+}
+
void window_manage(Window win)
{
- XEvent e;
XWindowAttributes attrib;
gboolean no_manage = FALSE;
gboolean is_dockapp = FALSE;
/* 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 */
- if (XCheckTypedWindowEvent(obt_display, win, DestroyNotify, &e) ||
- XCheckTypedWindowEvent(obt_display, win, UnmapNotify, &e))
- {
- XPutBackEvent(obt_display, &e);
- ob_debug("Trying to manage unmapped window. Aborting that.\n");
+ if (xqueue_exists_local(check_unmap, &win)) {
+ ob_debug("Trying to manage unmapped window. Aborting that.");
no_manage = TRUE;
}
-
- if (!XGetWindowAttributes(obt_display, win, &attrib))
+ else if (!XGetWindowAttributes(obt_display, win, &attrib))
no_manage = TRUE;
else {
XWMHints *wmhints;
if (!no_manage) {
if (attrib.override_redirect) {
- ob_debug("not managing override redirect window 0x%x\n", win);
+ ob_debug("not managing override redirect window 0x%x", win);
grab_server(FALSE);
}
else if (is_dockapp) {
dock_manage(icon_win, win);
}
else
- client_manage(win);
+ client_manage(win, NULL);
}
else {
grab_server(FALSE);
- ob_debug("FAILED to manage window 0x%x\n", win);
+ ob_debug("FAILED to manage window 0x%x", win);
}
}