X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=obt%2Fxevent.c;h=9732c8f9a27d24046b4c3f4db8e4842444546512;hb=8439c393d8c1dfb7db5cebd57d2e1e084e60234a;hp=e770ddae11b554822cc42da58b546c89d81a6495;hpb=03f45e79b8c92818f116bf92a7388b2f16f80caf;p=chaz%2Fopenbox

diff --git a/obt/xevent.c b/obt/xevent.c
index e770ddae..9732c8f9 100644
--- a/obt/xevent.c
+++ b/obt/xevent.c
@@ -85,7 +85,6 @@ void xevent_set_handler(ObtXEventHandler *h, gint type, Window win,
 {
     ObtXEventBinding *b;
 
-    g_assert(win);
     g_assert(func);
 
     /* make sure we have a spot for the event */
@@ -119,8 +118,14 @@ static void xevent_handler(const XEvent *e, gpointer data)
     ObtXEventHandler *h;
     ObtXEventBinding *b;
 
+    h = data;
+
     if (e->type < h->num_event_types) {
-        h = data;
+        const gint all = OBT_XEVENT_ALL_WINDOWS;
+        /* run the all_windows handler first */
+        b = g_hash_table_lookup(h->bindings[e->xany.type], &all);
+        if (b) b->func(e, b->data);
+        /* then run the per-window handler */
         b = g_hash_table_lookup(h->bindings[e->xany.type], &e->xany.window);
         if (b) b->func(e, b->data);
     }