aboutsummaryrefslogtreecommitdiffstats
path: root/menu.c
diff options
context:
space:
mode:
authorokan2011-03-22 11:09:52 +0000
committerokan2011-03-22 11:09:52 +0000
commitadaa4de0e92ee3b42c3fd00f4a4b21da1557a20e (patch)
treebbc42fe9bb26aedf9e50f108deddc217e9f3da1a /menu.c
parent2527daeefb04802c9bec454b58ad5094361a8f98 (diff)
downloadcwm-adaa4de0e92ee3b42c3fd00f4a4b21da1557a20e.tar.gz
we should re-focus the client and ungrab the ptr even if we don't have a
mouse based match (i.e. in the kbd no match case). update the comment as well. ok oga@
Diffstat (limited to 'menu.c')
-rw-r--r--menu.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/menu.c b/menu.c
index acdac85..1771cc0 100644
--- a/menu.c
+++ b/menu.c
@@ -171,13 +171,14 @@ menu_filter(struct screen_ctx *sc, struct menu_q *menuq, char *prompt,
}
}
out:
- if (dummy == 0 && mi->dummy) { /* no match */
- xfree (mi);
+ if (dummy == 0 && mi->dummy) { /* no mouse based match */
+ xfree(mi);
mi = NULL;
- xu_ptr_ungrab();
- XSetInputFocus(X_Dpy, focuswin, focusrevert, CurrentTime);
}
+ XSetInputFocus(X_Dpy, focuswin, focusrevert, CurrentTime);
+ xu_ptr_ungrab();
+
XUnmapWindow(X_Dpy, sc->menuwin);
XUngrabKeyboard(X_Dpy, CurrentTime);
@@ -390,7 +391,6 @@ menu_handle_release(XEvent *e, struct menu_ctx *mc, struct screen_ctx *sc,
int entry, i = 0;
entry = menu_calc_entry(sc, mc, e->xbutton.x, e->xbutton.y);
- xu_ptr_ungrab();
if (mc->hasprompt)
i = 1;