make control keys work in menus/dialogs/etc with the new obt code, using XLookup...

[chaz/openbox] / obt / xevent.c

diff --git a/obt/xevent.c b/obt/xevent.c
index e770ddae11b554822cc42da58b546c89d81a6495..1cc32a94d3eb32deeba960b59cee5eb688fb7c7f 100644 (file)
--- a/obt/xevent.c
+++ b/obt/xevent.c
@@ -44,7 +44,7 @@ static void xevent_handler(const XEvent *e, gpointer data);
 static guint window_hash(Window *w) { return *w; }
 static gboolean window_comp(Window *w1, Window *w2) { return *w1 == *w2; }
 
-ObtXEventHandler* xevent_new()
+ObtXEventHandler* xevent_new(void)
 {
     ObtXEventHandler *h;
 
@@ -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);
     }