X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.c;h=aad9202918238ceb29191660dd3c080f8f9aeefc;hb=0e9cfd7c77d8608a4be29f43413575d9553bf21c;hp=272d42b3d8cbaea8352b40e7431f141af154589d;hpb=5130c1c28ac35fc62a10d8743eef2e9fa21efb20;p=chaz%2Fopenbox

diff --git a/openbox/client.c b/openbox/client.c
index 272d42b3..aad92029 100644
--- 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);
@@ -3257,7 +3257,7 @@ void client_close(ObClient *self)
     if (!(self->functions & OB_CLIENT_FUNC_CLOSE)) return;
 
     if (self->prompt) {
-        prompt_hide(self->prompt);
+        prompt_cancel(self->prompt);
         return;
     }