From: Dana Jansens <danakj@orodu.net>
Date: Wed, 3 Sep 2003 18:11:39 +0000 (+0000)
Subject: add a reconfigure action, also reconfigure on SIGUSR2.
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=806a8c411f10c7a2292bfac15d77c8609f56ee71;p=chaz%2Fopenbox

add a reconfigure action, also reconfigure on SIGUSR2.
support reconfiguring throughout the entire codebase.
---

diff --git a/openbox/action.c b/openbox/action.c
index f037944e..b4ec216b 100644
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -600,6 +600,11 @@ ActionString actionstrings[] =
         action_desktop_last,
         NULL
     },
+    {
+        "reconfigure",
+        action_reconfigure,
+        NULL
+    },
     {
         "restart",
         action_restart,
@@ -1094,6 +1099,11 @@ void action_moveresize(union ActionData *data)
                      data->moveresize.button, data->moveresize.corner);
 }
 
+void action_reconfigure(union ActionData *data)
+{
+    ob_reconfigure();
+}
+
 void action_restart(union ActionData *data)
 {
     ob_restart_other(data->execute.path);
diff --git a/openbox/action.h b/openbox/action.h
index 3f6d84eb..99ba9315 100644
--- a/openbox/action.h
+++ b/openbox/action.h
@@ -220,6 +220,8 @@ void action_desktop_last(union ActionData *data);
 void action_toggle_decorations(union ActionData *data);
 /* MoveResize */
 void action_moveresize(union ActionData *data);
+/* Any */
+void action_reconfigure(union ActionData *data);
 /* Execute */
 void action_restart(union ActionData *data);
 /* Any */
diff --git a/openbox/client.c b/openbox/client.c
index 999b23dd..0d08f0f4 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -51,12 +51,14 @@ static void client_restore_session_state(ObClient *self);
 static void client_restore_session_stacking(ObClient *self);
 static void client_urgent_notify(ObClient *self);
 
-void client_startup()
+void client_startup(gboolean reconfig)
 {
+    if (reconfig) return;
+
     client_set_list();
 }
 
-void client_shutdown()
+void client_shutdown(gboolean reconfig)
 {
 }
 
diff --git a/openbox/client.h b/openbox/client.h
index e257ad9d..a737921d 100644
--- a/openbox/client.h
+++ b/openbox/client.h
@@ -240,8 +240,8 @@ struct _ObClient
 
 extern GList *client_list;
 
-void client_startup();
-void client_shutdown();
+void client_startup(gboolean reconfig);
+void client_shutdown(gboolean reconfig);
 
 void client_add_destructor(GDestroyNotify func);
 void client_remove_destructor(GDestroyNotify func);
diff --git a/openbox/dock.c b/openbox/dock.c
index df176d66..0bb28d43 100644
--- a/openbox/dock.c
+++ b/openbox/dock.c
@@ -16,10 +16,15 @@ static ObDock *dock;
 
 StrutPartial dock_strut;
 
-void dock_startup()
+void dock_startup(gboolean reconfig)
 {
     XSetWindowAttributes attrib;
 
+    if (reconfig) {
+        dock_configure();
+        return;
+    }
+
     STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, 0,
                       0, 0, 0, 0, 0, 0, 0, 0);
 
@@ -46,8 +51,10 @@ void dock_startup()
     stacking_raise(DOCK_AS_WINDOW(dock));
 }
 
-void dock_shutdown()
+void dock_shutdown(gboolean reconfig)
 {
+    if (reconfig) return;
+
     XDestroyWindow(ob_display, dock->frame);
     RrAppearanceFree(dock->a_frame);
     g_hash_table_remove(window_map, &dock->frame);
diff --git a/openbox/dock.h b/openbox/dock.h
index fbd5e169..cf35bff9 100644
--- a/openbox/dock.h
+++ b/openbox/dock.h
@@ -50,8 +50,8 @@ struct _ObDockApp {
 
 extern StrutPartial dock_strut;
 
-void dock_startup();
-void dock_shutdown();
+void dock_startup(gboolean reconfig);
+void dock_shutdown(gboolean reconfig);
 
 void dock_configure();
 void dock_hide(gboolean hide);
diff --git a/openbox/event.c b/openbox/event.c
index 88294cc7..0510dab2 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -106,8 +106,10 @@ static void sn_handler(const XEvent *e, gpointer display)
 #endif
 
 
-void event_startup()
+void event_startup(gboolean reconfig)
 {
+    if (reconfig) return;
+
     mask_table_size = sizeof(mask_table) / sizeof(mask_table[0]);
      
     /* get lock masks that are defined by the display (not constant) */
@@ -146,8 +148,10 @@ void event_startup()
     client_add_destructor(focus_delay_client_dest);
 }
 
-void event_shutdown()
+void event_shutdown(gboolean reconfig)
 {
+    if (reconfig) return;
+
     client_remove_destructor(focus_delay_client_dest);
     XFreeModifiermap(modmap);
 }
diff --git a/openbox/event.h b/openbox/event.h
index 0c6c7b97..263e4ec7 100644
--- a/openbox/event.h
+++ b/openbox/event.h
@@ -11,7 +11,7 @@ extern guint NumLockMask;
 /*! The value of the mask for the ScrollLock modifier */
 extern guint ScrollLockMask;
 
-void event_startup();
-void event_shutdown();
+void event_startup(gboolean reconfig);
+void event_shutdown(gboolean reconfig);
 
 #endif
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)
diff --git a/openbox/focus.h b/openbox/focus.h
index b12caf7b..1b1ce066 100644
--- a/openbox/focus.h
+++ b/openbox/focus.h
@@ -14,8 +14,8 @@ extern struct _ObClient *focus_client;
 /*! The recent focus order on each desktop */
 extern GList **focus_order;
 
-void focus_startup();
-void focus_shutdown();
+void focus_startup(gboolean reconfig);
+void focus_shutdown(gboolean reconfig);
 
 /*! Specify which client is currently focused, this doesn't actually
   send focus anywhere, its called by the Focus event handlers */
diff --git a/openbox/frame.c b/openbox/frame.c
index 3bceec99..3a8b57fe 100644
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -22,6 +22,9 @@ static void layout_title(ObFrame *self);
 static void flash_done(gpointer data);
 static gboolean flash_timeout(gpointer data);
 
+static void set_theme_statics(ObFrame *self);
+static void free_theme_statics(ObFrame *self);
+
 static Window createWindow(Window parent, unsigned long mask,
 			   XSetWindowAttributes *attrib)
 {
@@ -88,6 +91,18 @@ ObFrame *frame_new()
     XMapWindow(ob_display, self->rgrip);
     XMapWindow(ob_display, self->label);
 
+    self->max_press = self->close_press = self->desk_press = 
+	self->iconify_press = self->shade_press = FALSE;
+    self->max_hover = self->close_hover = self->desk_hover = 
+	self->iconify_hover = self->shade_hover = FALSE;
+
+    set_theme_statics(self);
+
+    return (ObFrame*)self;
+}
+
+static void set_theme_statics(ObFrame *self)
+{
     /* set colors/appearance/sizes for stuff that doesn't change */
     XSetWindowBorder(ob_display, self->window, ob_rr_theme->b_color->pixel);
     XSetWindowBorder(ob_display, self->title, ob_rr_theme->b_color->pixel);
@@ -125,16 +140,9 @@ ObFrame *frame_new()
         RrAppearanceCopy(ob_rr_theme->a_unfocused_handle);
     self->a_focused_handle = RrAppearanceCopy(ob_rr_theme->a_focused_handle);
     self->a_icon = RrAppearanceCopy(ob_rr_theme->a_icon);
-
-    self->max_press = self->close_press = self->desk_press = 
-	self->iconify_press = self->shade_press = FALSE;
-    self->max_hover = self->close_hover = self->desk_hover = 
-	self->iconify_hover = self->shade_hover = FALSE;
-
-    return (ObFrame*)self;
 }
 
-static void frame_free(ObFrame *self)
+static void free_theme_statics(ObFrame *self)
 {
     RrAppearanceFree(self->a_unfocused_title); 
     RrAppearanceFree(self->a_focused_title);
@@ -143,6 +151,11 @@ static void frame_free(ObFrame *self)
     RrAppearanceFree(self->a_unfocused_handle);
     RrAppearanceFree(self->a_focused_handle);
     RrAppearanceFree(self->a_icon);
+}
+
+static void frame_free(ObFrame *self)
+{
+    free_theme_statics(self);
 
     XDestroyWindow(ob_display, self->window);
 
@@ -166,6 +179,13 @@ void frame_hide(ObFrame *self)
     }
 }
 
+void frame_adjust_theme(ObFrame *self)
+{
+    free_theme_statics(self);
+    set_theme_statics(self);
+    frame_adjust_area(self, TRUE, TRUE, FALSE);
+}
+
 void frame_adjust_shape(ObFrame *self)
 {
 #ifdef SHAPE
diff --git a/openbox/frame.h b/openbox/frame.h
index 1de9090f..78206c33 100644
--- a/openbox/frame.h
+++ b/openbox/frame.h
@@ -123,6 +123,7 @@ struct _ObFrame
 ObFrame *frame_new();
 void frame_show(ObFrame *self);
 void frame_hide(ObFrame *self);
+void frame_adjust_theme(ObFrame *self);
 void frame_adjust_shape(ObFrame *self);
 void frame_adjust_area(ObFrame *self, gboolean moved,
                        gboolean resized, gboolean fake);
diff --git a/openbox/grab.h b/openbox/grab.h
index 39489ed2..b4b2161b 100644
--- a/openbox/grab.h
+++ b/openbox/grab.h
@@ -6,8 +6,8 @@
 #include <glib.h>
 #include <X11/Xlib.h>
 
-void grab_startup();
-void grab_shutdown();
+void grab_startup(gboolean reconfig);
+void grab_shutdown(gboolean reconfig);
 
 gboolean grab_keyboard(gboolean grab);
 gboolean grab_pointer(gboolean grab, ObCursor cur);
diff --git a/openbox/group.c b/openbox/group.c
index f6c86c5a..fe3fa575 100644
--- a/openbox/group.c
+++ b/openbox/group.c
@@ -6,14 +6,18 @@ GHashTable *group_map = NULL;
 static guint map_hash(Window *w) { return *w; }
 static gboolean map_key_comp(Window *w1, Window *w2) { return *w1 == *w2; }
 
-void group_startup()
+void group_startup(gboolean reconfig)
 {
+    if (reconfig) return;
+
     group_map = g_hash_table_new((GHashFunc)map_hash,
                                  (GEqualFunc)map_key_comp);
 }
 
-void group_shutdown()
+void group_shutdown(gboolean reconfig)
 {
+    if (reconfig) return;
+
     g_hash_table_destroy(group_map);
 }
 
diff --git a/openbox/group.h b/openbox/group.h
index 8840601a..293f6b01 100644
--- a/openbox/group.h
+++ b/openbox/group.h
@@ -18,8 +18,8 @@ struct _ObGroup
 
 extern GHashTable *group_map;
 
-void group_startup();
-void group_shutdown();
+void group_startup(gboolean reconfig);
+void group_shutdown(gboolean reconfig);
 
 ObGroup *group_add(Window leader, struct _ObClient *client);
 
diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index f73fe298..f8109456 100644
--- a/openbox/keyboard.c
+++ b/openbox/keyboard.c
@@ -264,15 +264,25 @@ void keyboard_event(ObClient *client, const XEvent *e)
     }
 }
 
-void keyboard_startup()
+void keyboard_startup(gboolean reconfig)
 {
     grab_keys(TRUE);
 }
 
-void keyboard_shutdown()
+void keyboard_shutdown(gboolean reconfig)
 {
+    GSList *it;
+
     tree_destroy(keyboard_firstnode);
     keyboard_firstnode = NULL;
+
+    for (it = interactive_states; it; it = g_slist_next(it))
+        g_free(it->data);
+    g_slist_free(interactive_states);
+    interactive_states = NULL;
+
+    ob_main_loop_timeout_remove(ob_main_loop, chain_timeout);
     grab_keys(FALSE);
+    curpos = NULL;
 }
 
diff --git a/openbox/keyboard.h b/openbox/keyboard.h
index aa171221..ec51fade 100644
--- a/openbox/keyboard.h
+++ b/openbox/keyboard.h
@@ -12,8 +12,8 @@ struct _ObAction;
 
 extern KeyBindingTree *keyboard_firstnode;
 
-void keyboard_startup();
-void keyboard_shutdown();
+void keyboard_startup(gboolean reconfig);
+void keyboard_shutdown(gboolean reconfig);
 
 gboolean keyboard_bind(GList *keylist, ObAction *action);
 
diff --git a/openbox/menu.c b/openbox/menu.c
index 75380f1e..c52f3013 100644
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -62,7 +62,7 @@ static void client_dest(gpointer client)
     menu_frame_hide_all_client(client);
 }
 
-void menu_startup()
+void menu_startup(gboolean reconfig)
 {
     xmlDocPtr doc;
     xmlNodePtr node;
@@ -100,12 +100,14 @@ void menu_startup()
     
     g_assert(menu_parse_state.menus == NULL);
 
-    client_add_destructor(client_dest);
+    if (!reconfig)
+        client_add_destructor(client_dest);
 }
 
-void menu_shutdown()
+void menu_shutdown(gboolean reconfig)
 {
-    client_remove_destructor(client_dest);
+    if (!reconfig)
+        client_remove_destructor(client_dest);
 
     parse_shutdown(menu_parse_inst);
     menu_parse_inst = NULL;
diff --git a/openbox/menu.h b/openbox/menu.h
index 396596ae..0c946dd6 100644
--- a/openbox/menu.h
+++ b/openbox/menu.h
@@ -95,8 +95,8 @@ struct _ObMenuEntry
     } data;
 };
 
-void menu_startup();
-void menu_shutdown();
+void menu_startup(gboolean reconfig);
+void menu_shutdown(gboolean reconfig);
 
 ObMenu* menu_new(gchar *name, gchar *title, gpointer data);
 void menu_free(ObMenu *menu);
diff --git a/openbox/mouse.c b/openbox/mouse.c
index 988e0147..91b98c6a 100644
--- a/openbox/mouse.c
+++ b/openbox/mouse.c
@@ -87,6 +87,7 @@ static void clearall()
             g_free(b);
         }
         g_slist_free(bound_contexts[i]);
+        bound_contexts[i] = NULL;
     }
 }
 
@@ -367,11 +368,11 @@ gboolean mouse_bind(char *buttonstr, char *contextstr, ObMouseAction mact,
     return TRUE;
 }
 
-void mouse_startup()
+void mouse_startup(gboolean reconfig)
 {
 }
 
-void mouse_shutdown()
+void mouse_shutdown(gboolean reconfig)
 {
     grab_all_clients(FALSE);
     clearall();
diff --git a/openbox/mouse.h b/openbox/mouse.h
index 7b0f5ad5..4e68bf1a 100644
--- a/openbox/mouse.h
+++ b/openbox/mouse.h
@@ -15,8 +15,8 @@ typedef enum {
     OB_MOUSE_NUM_ACTIONS
 } ObMouseAction;
 
-void mouse_startup();
-void mouse_shutdown();
+void mouse_startup(gboolean reconfig);
+void mouse_shutdown(gboolean reconfig);
 
 gboolean mouse_bind(char *buttonstr, char *contextstr, ObMouseAction mact,
                     ObAction *action);
diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index 82a9dec8..722146aa 100644
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -34,16 +34,18 @@ static void client_dest(gpointer client)
         moveresize_end(TRUE);    
 }
 
-void moveresize_startup()
+void moveresize_startup(gboolean reconfig)
 {
     popup = popup_new(FALSE);
 
-    client_add_destructor(client_dest);
+    if (!reconfig)
+        client_add_destructor(client_dest);
 }
 
-void moveresize_shutdown()
+void moveresize_shutdown(gboolean reconfig)
 {
-    client_remove_destructor(client_dest);
+    if (!reconfig)
+        client_remove_destructor(client_dest);
 
     popup_free(popup);
     popup = NULL;
diff --git a/openbox/moveresize.h b/openbox/moveresize.h
index 65d83ab2..a5391c5a 100644
--- a/openbox/moveresize.h
+++ b/openbox/moveresize.h
@@ -8,8 +8,8 @@ struct _ObClient;
 extern gboolean moveresize_in_progress;
 extern struct _ObClient *moveresize_client;
 
-void moveresize_startup();
-void moveresize_shutdown();
+void moveresize_startup(gboolean reconfig);
+void moveresize_shutdown(gboolean reconfig);
 
 void moveresize_start(struct _ObClient *c,
                       int x, int y, guint button, guint32 corner);
diff --git a/openbox/openbox.c b/openbox/openbox.c
index 4786ecc4..07f1f992 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -15,6 +15,7 @@
 #include "keyboard.h"
 #include "mouse.h"
 #include "extensions.h"
+#include "menuframe.h"
 #include "grab.h"
 #include "group.h"
 #include "config.h"
@@ -58,6 +59,7 @@ gboolean    ob_replace_wm;
 
 static ObState   state;
 static gboolean  xsync;
+static gboolean  reconfigure;
 static gboolean  restart;
 static char     *restart_path;
 static Cursor    cursors[OB_NUM_CURSORS];
@@ -70,8 +72,6 @@ static void parse_args(int argc, char **argv);
 int main(int argc, char **argv)
 {
     char *path;
-    xmlDocPtr doc;
-    xmlNodePtr node;
 
 #ifdef DEBUG
     ob_debug_show_output(TRUE);
@@ -117,6 +117,7 @@ int main(int argc, char **argv)
 
     /* set up signal handler */
     ob_main_loop_signal_add(ob_main_loop, SIGUSR1, signal_handler, NULL, NULL);
+    ob_main_loop_signal_add(ob_main_loop, SIGUSR2, signal_handler, NULL, NULL);
     ob_main_loop_signal_add(ob_main_loop, SIGTERM, signal_handler, NULL, NULL);
     ob_main_loop_signal_add(ob_main_loop, SIGINT, signal_handler, NULL, NULL);
     ob_main_loop_signal_add(ob_main_loop, SIGHUP, signal_handler, NULL, NULL);
@@ -198,64 +199,84 @@ int main(int argc, char **argv)
     startup_save();
 
     if (screen_annex()) { /* it will be ours! */
-        ObParseInst *i;
-
-        /* startup the parsing so everything can register sections of the rc */
-        i = parse_startup();
-
-	event_startup();
-        grab_startup();
-        /* focus_backup is used for stacking, so this needs to come before
-           anything that calls stacking_add */
-	focus_startup();
-        window_startup();
-
-        /* set up the kernel config shit */
-        config_startup(i);
-        /* parse/load user options */
-        if (parse_load_rc(&doc, &node))
-            parse_tree(i, doc, node->xmlChildrenNode);
-        /* we're done with parsing now, kill it */
-        xmlFreeDoc(doc);
-        parse_shutdown(i);
-
-        /* load the theme specified in the rc file */
-        ob_rr_theme = RrThemeNew(ob_rr_inst, config_theme);
-        if (ob_rr_theme == NULL)
-            ob_exit_with_error("Unable to load a theme.");
-
-        moveresize_startup();
-	screen_startup();
-        group_startup();
-	client_startup();
-        dock_startup();
-        keyboard_startup();
-        mouse_startup();
-        menu_startup();
-
-	/* get all the existing windows */
-	client_manage_all();
-
-	state = OB_STATE_RUNNING;
-        ob_main_loop_run(ob_main_loop);
-	state = OB_STATE_EXITING;
-
-        dock_remove_all();
-	client_unmanage_all();
-
-        menu_shutdown();
-        mouse_shutdown();
-        keyboard_shutdown();
-        dock_shutdown();
-	client_shutdown();
-        group_shutdown();
-	screen_shutdown();
-	focus_shutdown();
-        moveresize_shutdown();
-        window_shutdown();
-        grab_shutdown();
-	event_shutdown();
-        config_shutdown();
+        do {
+            event_startup(reconfigure);
+            grab_startup(reconfigure);
+            /* focus_backup is used for stacking, so this needs to come before
+               anything that calls stacking_add */
+            focus_startup(reconfigure);
+            window_startup(reconfigure);
+
+            {
+                ObParseInst *i;
+                xmlDocPtr doc;
+                xmlNodePtr node;
+
+                /* startup the parsing so everything can register sections
+                   of the rc */
+                i = parse_startup();
+
+                config_startup(i);
+                /* parse/load user options */
+                if (parse_load_rc(&doc, &node))
+                    parse_tree(i, doc, node->xmlChildrenNode);
+                /* we're done with parsing now, kill it */
+                xmlFreeDoc(doc);
+                parse_shutdown(i);
+            }
+
+            /* load the theme specified in the rc file */
+            ob_rr_theme = RrThemeNew(ob_rr_inst, config_theme);
+            if (ob_rr_theme == NULL)
+                ob_exit_with_error("Unable to load a theme.");
+
+            moveresize_startup(reconfigure);
+            screen_startup(reconfigure);
+            group_startup(reconfigure);
+            client_startup(reconfigure);
+            dock_startup(reconfigure);
+            keyboard_startup(reconfigure);
+            mouse_startup(reconfigure);
+            menu_startup(reconfigure);
+
+            if (!reconfigure) {
+                /* get all the existing windows */
+                client_manage_all();
+            } else {
+                GList *it;
+
+                /* redecorate all existing windows */
+                for (it = client_list; it; it = g_list_next(it)) {
+                    ObClient *c = it->data;
+                    frame_adjust_theme(c->frame);
+                }
+            }
+
+            reconfigure = FALSE;
+
+            state = OB_STATE_RUNNING;
+            ob_main_loop_run(ob_main_loop);
+            state = OB_STATE_EXITING;
+
+            if (!reconfigure) {
+                dock_remove_all();
+                client_unmanage_all();
+            }
+
+            menu_shutdown(reconfigure);
+            mouse_shutdown(reconfigure);
+            keyboard_shutdown(reconfigure);
+            dock_shutdown(reconfigure);
+            client_shutdown(reconfigure);
+            group_shutdown(reconfigure);
+            screen_shutdown(reconfigure);
+            focus_shutdown(reconfigure);
+            moveresize_shutdown(reconfigure);
+            window_shutdown(reconfigure);
+            grab_shutdown(reconfigure);
+            event_shutdown(reconfigure);
+            config_shutdown();
+        } while (reconfigure);
     }
 
     RrThemeFree(ob_rr_theme);
@@ -298,6 +319,9 @@ static void signal_handler(int signal, gpointer data)
     if (signal == SIGUSR1) {
 	fprintf(stderr, "Caught signal %d. Restarting.\n", signal);
         ob_restart();
+    } else if (signal == SIGUSR2) {
+	fprintf(stderr, "Caught signal %d. Reconfiguring.\n", signal);
+        ob_reconfigure();
     } else {
 	fprintf(stderr, "Caught signal %d. Exiting.\n", signal);
         ob_exit();
@@ -429,3 +453,9 @@ gchar *ob_expand_tilde(const gchar *f)
     g_strfreev(spl);
     return ret;
 }
+
+void ob_reconfigure()
+{
+    reconfigure = TRUE;
+    ob_exit();
+}
diff --git a/openbox/openbox.h b/openbox/openbox.h
index a01e792c..6f659a98 100644
--- a/openbox/openbox.h
+++ b/openbox/openbox.h
@@ -42,6 +42,8 @@ void ob_restart_other(const gchar *path);
 void ob_restart();
 void ob_exit();
 
+void ob_reconfigure();
+
 void ob_exit_with_error(gchar *msg);
 
 Cursor ob_cursor(ObCursor cursor);
diff --git a/openbox/screen.c b/openbox/screen.c
index 3809e05a..41fee0b9 100644
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -261,15 +261,16 @@ gboolean screen_annex()
     return TRUE;
 }
 
-void screen_startup()
+void screen_startup(gboolean reconfig)
 {
     GSList *it;
     guint i;
 
     desktop_cycle_popup = popup_new(FALSE);
 
-    /* get the initial size */
-    screen_resize();
+    if (!reconfig)
+        /* get the initial size */
+        screen_resize();
 
     /* set the names */
     screen_desktop_names = g_new(char*,
@@ -282,48 +283,60 @@ void screen_startup()
     g_free(screen_desktop_names); /* dont free the individual strings */
     screen_desktop_names = NULL;
 
-    screen_num_desktops = 0;
+    if (!reconfig)
+        screen_num_desktops = 0;
     screen_set_num_desktops(config_desktops_num);
-    if (startup_desktop >= screen_num_desktops)
-        startup_desktop = 0;
-    screen_desktop = startup_desktop;
-    screen_set_desktop(startup_desktop);
+    if (!reconfig) {
+        if (startup_desktop >= screen_num_desktops)
+            startup_desktop = 0;
+        screen_desktop = startup_desktop;
+        screen_set_desktop(startup_desktop);
 
-    /* don't start in showing-desktop mode */
-    screen_showing_desktop = FALSE;
-    PROP_SET32(RootWindow(ob_display, ob_screen),
-               net_showing_desktop, cardinal, screen_showing_desktop);
+        /* don't start in showing-desktop mode */
+        screen_showing_desktop = FALSE;
+        PROP_SET32(RootWindow(ob_display, ob_screen),
+                   net_showing_desktop, cardinal, screen_showing_desktop);
 
-    screen_update_layout();
+        screen_update_layout();
 
 #ifdef USE_LIBSN
-    sn_context = sn_monitor_context_new(ob_sn_display, ob_screen,
-                                        sn_event_func, NULL, NULL);
-    sn_busy_cnt = 0;
+        sn_context = sn_monitor_context_new(ob_sn_display, ob_screen,
+                                            sn_event_func, NULL, NULL);
+        sn_busy_cnt = 0;
 #endif
+    }
 }
 
-void screen_shutdown()
+void screen_shutdown(gboolean reconfig)
 {
     Rect **r;
 
     popup_free(desktop_cycle_popup);
 
-    XSelectInput(ob_display, RootWindow(ob_display, ob_screen), NoEventMask);
+    if (!reconfig) {
+#ifdef USE_LIBSN
+        sn_monitor_context_unref(sn_context);
+#endif
+
+        XSelectInput(ob_display, RootWindow(ob_display, ob_screen),
+                     NoEventMask);
 
-    /* we're not running here no more! */
-    PROP_ERASE(RootWindow(ob_display, ob_screen), openbox_pid);
-    /* not without us */
-    PROP_ERASE(RootWindow(ob_display, ob_screen), net_supported);
-    /* don't keep this mode */
-    PROP_ERASE(RootWindow(ob_display, ob_screen), net_showing_desktop);
+        /* we're not running here no more! */
+        PROP_ERASE(RootWindow(ob_display, ob_screen), openbox_pid);
+        /* not without us */
+        PROP_ERASE(RootWindow(ob_display, ob_screen), net_supported);
+        /* don't keep this mode */
+        PROP_ERASE(RootWindow(ob_display, ob_screen), net_showing_desktop);
 
-    XDestroyWindow(ob_display, screen_support_win);
+        XDestroyWindow(ob_display, screen_support_win);
+    }
 
     g_strfreev(screen_desktop_names);
+    screen_desktop_names = NULL;
     for (r = area; *r; ++r)
         g_free(*r);
     g_free(area);
+    area = NULL;
 }
 
 void screen_resize()
diff --git a/openbox/screen.h b/openbox/screen.h
index 1484207a..ee966bb7 100644
--- a/openbox/screen.h
+++ b/openbox/screen.h
@@ -36,9 +36,9 @@ extern char **screen_desktop_names;
 gboolean screen_annex();
 
 /*! Once the screen is ours, set up its initial state */
-void screen_startup();
+void screen_startup(gboolean reconfig);
 /*! Free resources */
-void screen_shutdown();
+void screen_shutdown(gboolean reconfig);
 
 /*! Figure out the new size of the screen and adjust stuff for it */
 void screen_resize();
diff --git a/openbox/window.c b/openbox/window.c
index 3f28a93f..8b986b1b 100644
--- a/openbox/window.c
+++ b/openbox/window.c
@@ -7,13 +7,17 @@
 
 GHashTable *window_map;
 
-void window_startup()
+void window_startup(gboolean reconfig)
 {
+    if (reconfig) return;
+
     window_map = g_hash_table_new(g_int_hash, g_int_equal);
 }
 
-void window_shutdown()
+void window_shutdown(gboolean reconfig)
 {
+    if (reconfig) return;
+
     g_hash_table_destroy(window_map);
 }
 
diff --git a/openbox/window.h b/openbox/window.h
index dd81342c..6c557d18 100644
--- a/openbox/window.h
+++ b/openbox/window.h
@@ -52,8 +52,8 @@ struct _ObClient;
 
 extern GHashTable *window_map;
 
-void window_startup();
-void window_shutdown();
+void window_startup(gboolean reconfig);
+void window_shutdown(gboolean reconfig);
 
 Window window_top(ObWindow *self);
 Window window_layer(ObWindow *self);