add a reconfigure action, also reconfigure on SIGUSR2.

[chaz/openbox] / openbox / focus.c

diff --git a/openbox/focus.c b/openbox/focus.c
index dab6d573d2fe75e8376156c3c6cd38459631064c..36be7456659e74719596657a1545886dd1f1258c 100644 (file)
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -24,28 +24,30 @@ GList **focus_order; /* these lists are created when screen_startup
 static ObClient *focus_cycle_target;
 static Popup *focus_cycle_popup;
 
-void focus_startup()
+void focus_startup(gboolean reconfig)
 {
-
     focus_cycle_popup = popup_new(TRUE);
 
-    /* start with nothing focused */
-    focus_set_client(NULL);
+    if (!reconfig)
+        /* start with nothing focused */
+        focus_set_client(NULL);
 }
 
-void focus_shutdown()
+void focus_shutdown(gboolean reconfig)
 {
     guint i;
 
-    for (i = 0; i < screen_num_desktops; ++i)
-        g_list_free(focus_order[i]);
-    g_free(focus_order);
-
     popup_free(focus_cycle_popup);
 
-    /* reset focus to root */
-    XSetInputFocus(ob_display, PointerRoot, RevertToPointerRoot,
-                   event_lasttime);
+    if (!reconfig) {
+        for (i = 0; i < screen_num_desktops; ++i)
+            g_list_free(focus_order[i]);
+        g_free(focus_order);
+
+        /* reset focus to root */
+        XSetInputFocus(ob_display, PointerRoot, RevertToPointerRoot,
+                       event_lasttime);
+    }
 }
 
 static void push_to_top(ObClient *client)
@@ -80,7 +82,7 @@ void focus_set_client(ObClient *client)
 
     /* in the middle of cycling..? kill it. */
     if (focus_cycle_target)
-        focus_cycle(TRUE, TRUE, TRUE, TRUE);
+        focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE);
 
     old = focus_client;
     focus_client = client;
@@ -257,8 +259,8 @@ static void popup_cycle(ObClient *c, gboolean show)
     }
 }
 
-ObClient *focus_cycle(gboolean forward, gboolean linear, gboolean done,
-                      gboolean cancel)
+void focus_cycle(gboolean forward, gboolean linear,
+                 gboolean dialog, gboolean done, gboolean cancel)
 {
     static ObClient *first = NULL;
     static ObClient *t = NULL;
@@ -271,10 +273,9 @@ ObClient *focus_cycle(gboolean forward, gboolean linear, gboolean done,
             frame_adjust_focus(focus_cycle_target->frame, FALSE);
         if (focus_client)
             frame_adjust_focus(focus_client->frame, TRUE);
+        focus_cycle_target = NULL;
         goto done_cycle;
-    } else if (done) {
-        if (focus_cycle_target)
-            client_activate(focus_cycle_target, FALSE);
+    } else if (done && dialog) {
         goto done_cycle;
     }
 
@@ -313,12 +314,15 @@ ObClient *focus_cycle(gboolean forward, gboolean linear, gboolean done,
                 focus_cycle_target = ft;
                 frame_adjust_focus(focus_cycle_target->frame, TRUE);
             }
-            popup_cycle(ft, config_focus_popup);
-            return ft;
+            popup_cycle(ft, dialog);
+            return;
         }
     } while (it != start);
 
 done_cycle:
+    if (done && focus_cycle_target)
+        client_activate(focus_cycle_target, FALSE);
+
     t = NULL;
     first = NULL;
     focus_cycle_target = NULL;
@@ -327,7 +331,51 @@ done_cycle:
 
     popup_cycle(ft, FALSE);
 
-    return NULL;
+    return;
+}
+
+void focus_directional_cycle(ObDirection dir,
+                             gboolean dialog, gboolean done, gboolean cancel)
+{
+    static ObClient *first = NULL;
+    ObClient *ft;
+
+    if (cancel) {
+        if (focus_cycle_target)
+            frame_adjust_focus(focus_cycle_target->frame, FALSE);
+        if (focus_client)
+            frame_adjust_focus(focus_client->frame, TRUE);
+        focus_cycle_target = NULL;
+        goto done_cycle;
+    } else if (done && dialog) {
+        goto done_cycle;
+    }
+
+    if (!first) first = focus_client;
+    if (!focus_cycle_target) focus_cycle_target = focus_client;
+
+    if ((ft = client_find_directional(focus_cycle_target, dir))) {
+        if (ft != focus_cycle_target) {/* prevents flicker */
+            if (focus_cycle_target)
+                frame_adjust_focus(focus_cycle_target->frame, FALSE);
+            focus_cycle_target = ft;
+            frame_adjust_focus(focus_cycle_target->frame, TRUE);
+        }
+        popup_cycle(ft, dialog);
+    }
+    if (dialog)
+        return;
+
+done_cycle:
+    if (done && focus_cycle_target)
+        client_activate(focus_cycle_target, FALSE);
+
+    first = NULL;
+    focus_cycle_target = NULL;
+
+    popup_cycle(ft, FALSE);
+
+    return;
 }
 
 void focus_order_add_new(ObClient *c)