diff options
| -rw-r--r-- | app/cwm/calmwm.h | 3 | ||||
| -rw-r--r-- | app/cwm/client.c | 14 | ||||
| -rw-r--r-- | app/cwm/xevents.c | 28 |
3 files changed, 26 insertions, 19 deletions
diff --git a/app/cwm/calmwm.h b/app/cwm/calmwm.h index f36694f2c..93146d524 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.144 2012/05/16 01:04:36 okan Exp $ + * $OpenBSD: calmwm.h,v 1.145 2012/05/16 01:09:17 okan Exp $ */ #ifndef _CALMWM_H_ @@ -307,6 +307,7 @@ __dead void usage(void); void client_applysizehints(struct client_ctx *); struct client_ctx *client_current(void); void client_cycle(struct screen_ctx *, int); +void client_cycle_leave(struct screen_ctx *, struct client_ctx *); void client_delete(struct client_ctx *); void client_draw_border(struct client_ctx *); struct client_ctx *client_find(Window); diff --git a/app/cwm/client.c b/app/cwm/client.c index 09966c34d..89495c318 100644 --- a/app/cwm/client.c +++ b/app/cwm/client.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: client.c,v 1.93 2012/05/13 15:17:13 okan Exp $ + * $OpenBSD: client.c,v 1.94 2012/05/16 01:09:17 okan Exp $ */ #include <sys/param.h> @@ -644,6 +644,18 @@ client_cycle(struct screen_ctx *sc, int flags) client_ptrwarp(newcc); } +void +client_cycle_leave(struct screen_ctx *sc, struct client_ctx *cc) +{ + sc->cycling = 0; + + client_mtf(NULL); + if (cc) { + group_sticky_toggle_exit(cc); + XUngrabKeyboard(X_Dpy, CurrentTime); + } +} + static struct client_ctx * client_mrunext(struct client_ctx *cc) { diff --git a/app/cwm/xevents.c b/app/cwm/xevents.c index 23cb4a60b..93b4b138a 100644 --- a/app/cwm/xevents.c +++ b/app/cwm/xevents.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: xevents.c,v 1.58 2012/05/16 01:04:36 okan Exp $ + * $OpenBSD: xevents.c,v 1.59 2012/05/16 01:09:17 okan Exp $ */ /* @@ -70,6 +70,9 @@ void (*xev_handlers[LASTEvent])(XEvent *) = { [MappingNotify] = xev_handle_mappingnotify, }; +static KeySym modkeys[] = { XK_Alt_L, XK_Alt_R, XK_Super_L, XK_Super_R, + XK_Control_L, XK_Control_R }; + static void xev_handle_maprequest(XEvent *ee) { @@ -314,7 +317,7 @@ xev_handle_keypress(XEvent *ee) } /* - * This is only used for the alt suppression detection. + * This is only used for the modifier suppression detection. */ static void xev_handle_keyrelease(XEvent *ee) @@ -322,26 +325,17 @@ xev_handle_keyrelease(XEvent *ee) XKeyEvent *e = &ee->xkey; struct screen_ctx *sc; struct client_ctx *cc; - int keysym; + int i, keysym; sc = screen_fromroot(e->root); cc = client_current(); keysym = XkbKeycodeToKeysym(X_Dpy, e->keycode, 0, 0); - if (keysym != XK_Alt_L && keysym != XK_Alt_R) - return; - - sc->cycling = 0; - - /* - * XXX - better interface... xevents should not know about - * how/when to mtf. - */ - client_mtf(NULL); - - if (cc != NULL) { - group_sticky_toggle_exit(cc); - XUngrabKeyboard(X_Dpy, CurrentTime); + for (i = 0; i < nitems(modkeys); i++) { + if (keysym == modkeys[i]) { + client_cycle_leave(sc, cc); + break; + } } } |