#include "client.h"
#include "xerror.h"
#include "prop.h"
-#include "startup.h"
#include "screen.h"
+#include "startupnotify.h"
#include "focus.h"
#include "moveresize.h"
#include "frame.h"
#include "keyboard.h"
#include "mouse.h"
#include "extensions.h"
+#include "menuframe.h"
#include "grab.h"
#include "group.h"
#include "config.h"
static ObState state;
static gboolean xsync;
+static gboolean reconfigure;
static gboolean restart;
static char *restart_path;
static Cursor cursors[OB_NUM_CURSORS];
int main(int argc, char **argv)
{
char *path;
- xmlDocPtr doc;
- xmlNodePtr node;
#ifdef DEBUG
ob_debug_show_output(TRUE);
/* 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);
session_load(sm_save_file);
session_startup(argc, argv);
-#ifdef USE_LIBSN
- ob_sn_display = sn_display_new(ob_display, NULL, NULL);
-#endif
-
ob_screen = DefaultScreen(ob_display);
ob_rr_inst = RrInstanceNew(ob_display, ob_screen);
putenv(g_strdup_printf("DISPLAY=%s", DisplayString(ob_display)));
/* create available cursors */
+ cursors[OB_CURSOR_NONE] = None;
cursors[OB_CURSOR_POINTER] =
XCreateFontCursor(ob_display, XC_left_ptr);
cursors[OB_CURSOR_BUSY] =
prop_startup(); /* get atoms values for the display */
extensions_query_all(); /* find which extensions are present */
- /* save stuff that we can use to restore state */
- 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);
+ sn_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);
+ sn_shutdown(reconfigure);
+ window_shutdown(reconfigure);
+ grab_shutdown(reconfigure);
+ event_shutdown(reconfigure);
+ config_shutdown();
+ } while (reconfigure);
}
RrThemeFree(ob_rr_theme);
session_shutdown();
g_free(ob_sm_id);
-#ifdef USE_LIBSN
- sn_display_unref(ob_sn_display);
-#endif
-
XCloseDisplay(ob_display);
if (restart) {
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();
gchar *ob_expand_tilde(const gchar *f)
{
+ gchar **spl;
+ gchar *ret, *mid;
+
if (!f)
return NULL;
- else if (f[0] != '~')
- return g_strdup(f);
- else
- return g_strconcat(g_get_home_dir(), f+1, NULL);
+ spl = g_strsplit(f, "~", 0);
+ mid = g_strconcat(g_get_home_dir(), G_DIR_SEPARATOR_S, NULL);
+ ret = g_strjoinv(mid, spl);
+ g_free(mid);
+ g_strfreev(spl);
+ return ret;
+}
+
+void ob_reconfigure()
+{
+ reconfigure = TRUE;
+ ob_exit();
}
projects / chaz / openbox / blobdiff