X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=36be7456659e74719596657a1545886dd1f1258c;hb=806a8c411f10c7a2292bfac15d77c8609f56ee71;hp=6e738d4a0642c3b5529816c0019e1f1226831ff3;hpb=40902496a01b21b950f3672bf2ae9e100ba9b95c;p=chaz%2Fopenbox

diff --git a/openbox/focus.c b/openbox/focus.c
index 6e738d4a..36be7456 100644
--- 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)