all repos — openbox @ b32181ac69d3aa18756348991028f809cb2ee046

openbox fork - make it a bit more like ryudo 

cancel interactive actions when anothr action runs properly
Dana Jansens danakj@orodu.net
commit

b32181ac69d3aa18756348991028f809cb2ee046

parent

0d0ce065df9ff1acc06fe63e4a0fe45c184de693

1 files changed, 6 insertions(+), 8 deletions(-)

jump to
M openbox/actions.c → openbox/actions.c 
@@ -236,10 +236,12 @@ gboolean ok = TRUE;
 
         actions_setup_data(&data, uact, state, x, y, button, con, client);
 
-        if (actions_act_is_interactive(act) &&
-            (!interactive_act || interactive_act->def != act->def))
-        {
-            ok = actions_interactive_begin_act(act, state);
+        if (!interactive_act || interactive_act->def != act->def) {
+            /* cancel the old one */
+            if (interactive_act)
+                actions_interactive_cancel_act();
+            if (actions_act_is_interactive(act))
+                ok = actions_interactive_begin_act(act, state);
         }
 
         /* fire the action's run function with this data */

@@ -272,10 +274,6 @@ }
 
 static gboolean actions_interactive_begin_act(ObActionsAct *act, guint state)
 {
-    /* cancel the old one */
-    if (interactive_act)
-        actions_interactive_cancel_act();
-
     if (grab_keyboard()) {
         interactive_act = act;
         actions_act_ref(interactive_act);