let you make an xevent listener for all windows

diff --git a/obt/xevent.c b/obt/xevent.c
index e770ddae11b554822cc42da58b546c89d81a6495..9732c8f9a27d24046b4c3f4db8e4842444546512 100644 (file)
--- 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);
     }

diff --git a/obt/xevent.h b/obt/xevent.h
index 4402ef0e6868a42edc93e34636478d4618529acb..a93a1a61a9b5bd750c998570ec93a7a50a3fa681 100644 (file)
--- a/obt/xevent.h
+++ b/obt/xevent.h
@@ -37,6 +37,7 @@ void              xevent_unref(ObtXEventHandler *h);
 void              xevent_register(ObtXEventHandler *h,
                                   struct _ObtMainLoop *loop);
 
+#define OBT_XEVENT_ALL_WINDOWS None
 
 void xevent_set_handler(ObtXEventHandler *h, gint type, Window win,
                         ObtXEventCallback func, gpointer data);