key input works for ObPrompt windows now

[chaz/openbox] / openbox / client.c

diff --git a/openbox/client.c b/openbox/client.c
index 272d42b3d8cbaea8352b40e7431f141af154589d..33be03dec4c419eecc84c3bcef7f4b1d03ad4366 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -189,10 +189,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(obt_display, window,
                             CWEventMask|CWDontPropagate, &attrib_set);