X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Factions.c;h=0c84489a679f75b1d16c965b3f7b39d1db60b298;hb=0be98fee4743c795b06aa23881b82eff5bab3ef6;hp=216c6fe14581922bac136cd86d4dc11effba419e;hpb=de1679e3e2f05a20d7ac7daaddb38db0f2e3172b;p=chaz%2Fopenbox

diff --git a/openbox/actions.c b/openbox/actions.c
index 216c6fe1..0c84489a 100644
--- a/openbox/actions.c
+++ b/openbox/actions.c
@@ -124,7 +124,7 @@ static void actions_definition_unref(ObActionsDefinition *def)
     }
 }
 
-ObActionsAct* actions_build_act_from_string(const gchar *name)
+static ObActionsAct* actions_build_act_from_string(const gchar *name)
 {
     GSList *it;
     ObActionsDefinition *def = NULL;
@@ -248,7 +248,9 @@ 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) {
+        /* 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)
@@ -259,9 +261,10 @@ void actions_run_acts(GSList *acts,
 
         /* 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);
 
@@ -272,12 +275,12 @@ void actions_run_acts(GSList *acts,
     }
 }
 
-gboolean actions_interactive_act_running()
+gboolean actions_interactive_act_running(void)
 {
     return interactive_act != NULL;
 }
 
-void actions_interactive_cancel_act()
+void actions_interactive_cancel_act(void)
 {
     if (interactive_act) {
         interactive_act->def->i_cancel(interactive_act->options);
@@ -292,13 +295,18 @@ 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
         return FALSE;
 }
 
-static void actions_interactive_end_act()
+static void actions_interactive_end_act(void)
 {
     if (interactive_act) {
         ungrab_keyboard();