X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.c;h=bac087876e9571748b8be8572b04946cdb0d063b;hb=b84a934ab7b3ebd68b8b90961146463ac17d396e;hp=ddc7fea213bd9a33058570cdf23b11a436925ff5;hpb=8852ee21b0e1e9060f77a93e02139d71893db90b;p=chaz%2Fopenbox

diff --git a/openbox/action.c b/openbox/action.c
index ddc7fea2..bac08787 100644
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -891,8 +891,8 @@ ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
                 if ((n = parse_find_node("dialog", node->xmlChildrenNode)))
                     act->data.cycle.dialog = parse_bool(doc, n);
             }
+            INTERACTIVE_LIMIT(act, uact);
         }
-        INTERACTIVE_LIMIT(act, uact);
         g_free(actname);
     }
     return act;
@@ -994,6 +994,10 @@ void action_activate(union ActionData *data)
 
 void action_focus(union ActionData *data)
 {
+    /* if using focus_delay, stop the timer now so that focus doesn't go moving
+       on us */
+    event_halt_focus_delay();
+
     client_focus(data->client.any.c);
 }
 
@@ -1380,6 +1384,10 @@ void action_showmenu(union ActionData *data)
 
 void action_cycle_windows(union ActionData *data)
 {
+    /* if using focus_delay, stop the timer now so that focus doesn't go moving
+       on us */
+    event_halt_focus_delay();
+
     focus_cycle(data->cycle.forward, data->cycle.linear,
                 data->cycle.dialog,
                 data->cycle.inter.final, data->cycle.inter.cancel);
@@ -1387,6 +1395,10 @@ void action_cycle_windows(union ActionData *data)
 
 void action_directional_focus(union ActionData *data)
 {
+    /* if using focus_delay, stop the timer now so that focus doesn't go moving
+       on us */
+    event_halt_focus_delay();
+
     focus_directional_cycle(data->interdiraction.direction,
                             data->interdiraction.dialog,
                             data->interdiraction.inter.final,