From ad5b92588fbe36100cdc4ae7064883cd16e13a1e Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sun, 16 Oct 2011 11:10:14 -0400 Subject: Don't make desktop switching interactive when no mods used. (Fix bug #5203) Make mod state passing more consistent, and always give actions the full state instead of stripping sometimes. (They ended up expecting it stripped always). --- openbox/actions/cyclewindows.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'openbox/actions/cyclewindows.c') diff --git a/openbox/actions/cyclewindows.c b/openbox/actions/cyclewindows.c index 5f0db27c..a64d2256 100644 --- a/openbox/actions/cyclewindows.c +++ b/openbox/actions/cyclewindows.c @@ -181,8 +181,9 @@ static gboolean i_input_func(guint initial_state, gboolean *used) { Options *o = options; - guint mods; + guint mods, initial_mods; + initial_mods = obt_keyboard_only_modmasks(initial_state); mods = obt_keyboard_only_modmasks(e->xkey.state); if (e->type == KeyRelease) { /* remove from the state the mask of the modifier key being @@ -201,14 +202,14 @@ static gboolean i_input_func(guint initial_state, } /* There were no modifiers and they pressed enter */ - else if ((sym == XK_Return || sym == XK_KP_Enter) && !initial_state) { + else if ((sym == XK_Return || sym == XK_KP_Enter) && !initial_mods) { o->cancel = FALSE; o->state = e->xkey.state; return FALSE; } } /* They released the modifiers */ - else if (e->type == KeyRelease && initial_state && !(mods & initial_state)) + else if (e->type == KeyRelease && initial_mods && !(mods & initial_mods)) { o->cancel = FALSE; o->state = e->xkey.state; -- cgit v1.2.3