key input works for ObPrompt windows now

[chaz/openbox] / openbox / client.c

diff --git a/openbox/client.c b/openbox/client.c
index cd26debb5fbff3d5d9c73c1c82e202941da45d34..500562b0423a329e894f8fc6a2f3724978a0557d 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -270,10 +270,10 @@ void client_manage(Window window, ObPrompt *prompt)
 
     map_time = event_get_server_time();
 
-    /* choose the events we want to receive on the CLIENT window */
-    attrib_set.event_mask = CLIENT_EVENTMASK;
-    if (prompt)
-        attrib_set.event_mask |= KeyPressMask;
+    /* choose the events we want to receive on the CLIENT window
+       (ObPrompt windows can request events too) */
+    attrib_set.event_mask = CLIENT_EVENTMASK |
+        (prompt ? prompt->event_mask : 0);
     attrib_set.do_not_propagate_mask = CLIENT_NOPROPAGATEMASK;
     XChangeWindowAttributes(ob_display, window,
                             CWEventMask|CWDontPropagate, &attrib_set);