diff options
| author | Okan Demirmen <okan@cvs.openbsd.org> | 2013-10-20 01:55:33 +0000 |
|---|---|---|
| committer | Okan Demirmen <okan@cvs.openbsd.org> | 2013-10-20 01:55:33 +0000 |
| commit | 011a88aacfe3a5bb917fae82f9eae58f2c439486 (patch) | |
| tree | ddb2ffb86ccd164646eecd06429d3f757bc96395 /app/cwm | |
| parent | 0bea80278588cecf866c90055c76243d2f7c2a64 (diff) | |
wrap key ungrab like btn ungrab, for it'll be used again
Diffstat (limited to 'app/cwm')
| -rw-r--r-- | app/cwm/calmwm.h | 3 | ||||
| -rw-r--r-- | app/cwm/conf.c | 4 | ||||
| -rw-r--r-- | app/cwm/xutil.c | 8 |
3 files changed, 11 insertions, 4 deletions
diff --git a/app/cwm/calmwm.h b/app/cwm/calmwm.h index 63308ee38..4bcd0fc56 100644 --- a/app/cwm/calmwm.h +++ b/app/cwm/calmwm.h @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: calmwm.h,v 1.222 2013/10/19 19:39:34 okan Exp $ + * $OpenBSD: calmwm.h,v 1.223 2013/10/20 01:55:32 okan Exp $ */ #ifndef _CALMWM_H_ @@ -516,6 +516,7 @@ int xu_getprop(Window, Atom, Atom, long, unsigned char **); int xu_get_wm_state(Window, int *); int xu_getstrprop(Window, Atom, char **); void xu_key_grab(Window, u_int, KeySym); +void xu_key_ungrab(Window); void xu_ptr_getpos(Window, int *, int *); int xu_ptr_grab(Window, u_int, Cursor); int xu_ptr_regrab(u_int, Cursor); diff --git a/app/cwm/conf.c b/app/cwm/conf.c index ae3fffad8..689cbf2ae 100644 --- a/app/cwm/conf.c +++ b/app/cwm/conf.c @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: conf.c,v 1.147 2013/10/19 19:39:34 okan Exp $ + * $OpenBSD: conf.c,v 1.148 2013/10/20 01:55:32 okan Exp $ */ #include <sys/param.h> @@ -663,7 +663,7 @@ conf_grab_kbd(Window win) { struct keybinding *kb; - XUngrabKey(X_Dpy, AnyKey, AnyModifier, win); + xu_key_ungrab(win); TAILQ_FOREACH(kb, &Conf.keybindingq, entry) xu_key_grab(win, kb->modmask, kb->keysym); diff --git a/app/cwm/xutil.c b/app/cwm/xutil.c index 7d7b13bd7..7006d2b82 100644 --- a/app/cwm/xutil.c +++ b/app/cwm/xutil.c @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: xutil.c,v 1.76 2013/10/19 19:39:34 okan Exp $ + * $OpenBSD: xutil.c,v 1.77 2013/10/20 01:55:32 okan Exp $ */ #include <sys/param.h> @@ -102,6 +102,12 @@ xu_key_grab(Window win, u_int mask, KeySym keysym) True, GrabModeAsync, GrabModeAsync); } +void +xu_key_ungrab(Window win) +{ + XUngrabKey(X_Dpy, AnyKey, AnyModifier, win); +} + int xu_getprop(Window win, Atom atm, Atom type, long len, unsigned char **p) { |