remove trailing whitespace

[chaz/openbox] / openbox / actions.c

diff --git a/openbox/actions.c b/openbox/actions.c
index 5f146b7eb890f26c8b743ed1528b721d807e4888..cfe0bddededc336fc0f7b4f6065a59e14de3e894 100644 (file)
--- a/openbox/actions.c
+++ b/openbox/actions.c
@@ -31,6 +31,7 @@ static void     actions_definition_ref(ObActionsDefinition *def);
 static void     actions_definition_unref(ObActionsDefinition *def);
 static gboolean actions_interactive_begin_act(ObActionsAct *act, guint state);
 static void     actions_interactive_end_act();
+static ObActionsAct* actions_build_act_from_string(const gchar *name);
 
 static ObActionsAct *interactive_act = NULL;
 static guint         interactive_initial_state = 0;
@@ -123,7 +124,7 @@ static void actions_definition_unref(ObActionsDefinition *def)
     }
 }
 
-ObActionsAct* actions_parse_string(const gchar *name)
+ObActionsAct* actions_build_act_from_string(const gchar *name)
 {
     GSList *it;
     ObActionsDefinition *def = NULL;
@@ -151,6 +152,17 @@ ObActionsAct* actions_parse_string(const gchar *name)
     return act;
 }
 
+ObActionsAct* actions_parse_string(const gchar *name)
+{
+    ObActionsAct *act = NULL;
+
+    if ((act = actions_build_act_from_string(name)))
+        if (act->def->setup)
+            act->options = act->def->setup(NULL, NULL, NULL);
+
+    return act;
+}
+
 ObActionsAct* actions_parse(ObParseInst *i,
                             xmlDocPtr doc,
                             xmlNodePtr node)
@@ -159,7 +171,7 @@ ObActionsAct* actions_parse(ObParseInst *i,
     ObActionsAct *act = NULL;
 
     if (parse_attr_string("name", node, &name)) {
-        if ((act = actions_parse_string(name)))
+        if ((act = actions_build_act_from_string(name)))
             /* there is more stuff to parse here */
             if (act->def->setup)
                 act->options = act->def->setup(i, doc, node->xmlChildrenNode);
@@ -236,19 +248,23 @@ void actions_run_acts(GSList *acts,
 
         actions_setup_data(&data, uact, state, x, y, button, con, client);
 
-        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))
+        /* if they have the same run function, then we'll assume they are
+           cooperating and not cancel eachother out */
+        if (!interactive_act || interactive_act->def->run != act->def->run) {
+            if (actions_act_is_interactive(act)) {
+                /* cancel the old one */
+                if (interactive_act)
+                    actions_interactive_cancel_act();
                 ok = actions_interactive_begin_act(act, state);
+            }
         }
 
         /* fire the action's run function with this data */
         if (ok) {
-            if (!act->def->run(&data, act->options))
-                actions_interactive_end_act();
-            else {
+            if (!act->def->run(&data, act->options)) {
+                if (actions_act_is_interactive(act))
+                    actions_interactive_end_act();
+            } else {
                 /* make sure its interactive if it returned TRUE */
                 g_assert(act->def->i_cancel && act->def->i_input);
 
@@ -279,6 +295,11 @@ static gboolean actions_interactive_begin_act(ObActionsAct *act, guint state)
         actions_act_ref(interactive_act);
 
         interactive_initial_state = state;
+
+        /* if using focus_delay, stop the timer now so that focus doesn't go
+           moving on us, which would kill the action */
+        event_halt_focus_delay();
+
         return TRUE;
     }
     else