]> Dogcows Code - chaz/openbox/blobdiff - openbox/openbox.c
make openbox base-dir spec compliant, and change the theme dir structure, so that...
[chaz/openbox] / openbox / openbox.c
index 21f3a60604a6a0ba7854768668e069396feab506..a8102c3ad582dc88c837bc7a64c5c0cb42ba1bd6 100644 (file)
@@ -7,14 +7,15 @@
 #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"
@@ -28,7 +29,6 @@
 #  include <fcntl.h>
 #endif
 #ifdef HAVE_SIGNAL_H
-#define __USE_UNIX98
 #  include <signal.h>
 #endif
 #ifdef HAVE_STDLIB_H
@@ -52,27 +52,21 @@ RrTheme    *ob_rr_theme;
 ObMainLoop *ob_main_loop;
 Display    *ob_display;
 gint        ob_screen;
-gboolean    ob_sm_use = TRUE;
-gchar      *ob_sm_id;
 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];
 static KeyCode   keys[OB_NUM_KEYS];
-static gchar    *sm_save_file;
 
 static void signal_handler(int signal, gpointer data);
 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);
 #endif
@@ -86,24 +80,12 @@ int main(int argc, char **argv)
     bind_textdomain_codeset(PACKAGE_NAME, "UTF-8");
     textdomain(PACKAGE_NAME);
 
-    /* create the ~/.openbox dir */
-    path = g_build_filename(g_get_home_dir(), ".openbox", NULL);
-    mkdir(path, (S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IWGRP | S_IXGRP |
-                 S_IROTH | S_IWOTH | S_IXOTH));
-    g_free(path);
-    /* create the ~/.openbox/themes dir */
-    path = g_build_filename(g_get_home_dir(), ".openbox", "themes", NULL);
-    mkdir(path, (S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IWGRP | S_IXGRP |
-                 S_IROTH | S_IWOTH | S_IXOTH));
-    g_free(path);
-    /* create the ~/.openbox/sessions dir */
-    path = g_build_filename(g_get_home_dir(), ".openbox", "sessions", NULL);
-    mkdir(path, (S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IWGRP | S_IXGRP |
-                 S_IROTH | S_IWOTH | S_IXOTH));
-    g_free(path);
-
     g_set_prgname(argv[0]);
      
+    parse_paths_startup();
+
+    session_startup(&argc, &argv);
+
     /* parse out command line args */
     parse_args(argc, argv);
 
@@ -117,19 +99,12 @@ 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);
     ob_main_loop_signal_add(ob_main_loop, SIGPIPE, signal_handler, NULL, NULL);
 
-    if (sm_save_file)
-        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);
@@ -154,6 +129,7 @@ int main(int argc, char **argv)
     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] =
@@ -194,82 +170,112 @@ int main(int argc, char **argv)
     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 {
+            {
+                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 */
+            {
+                RrTheme *theme;
+                if ((theme = RrThemeNew(ob_rr_inst, config_theme))) {
+                    RrThemeFree(ob_rr_theme);
+                    ob_rr_theme = theme;
+                }
+                if (ob_rr_theme == NULL)
+                    ob_exit_with_error("Unable to load a theme.");
+            }
+
+            if (reconfigure) {
+                GList *it;
+
+                /* update all existing windows for the new theme */
+                for (it = client_list; it; it = g_list_next(it)) {
+                    ObClient *c = it->data;
+                    frame_adjust_theme(c->frame);
+                }
+            }
+            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);
+            screen_startup(reconfigure);
+            group_startup(reconfigure);
+            client_startup(reconfigure);
+            dock_startup(reconfigure);
+            moveresize_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_area(c->frame, TRUE, TRUE, FALSE);
+                }
+            }
+
+            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);
+            moveresize_shutdown(reconfigure);
+            dock_shutdown(reconfigure);
+            client_shutdown(reconfigure);
+            group_shutdown(reconfigure);
+            screen_shutdown(reconfigure);
+            focus_shutdown(reconfigure);
+            sn_shutdown(reconfigure);
+            window_shutdown(reconfigure);
+            grab_shutdown(reconfigure);
+            event_shutdown(reconfigure);
+            config_shutdown();
+        } while (reconfigure);
     }
 
     RrThemeFree(ob_rr_theme);
     RrInstanceFree(ob_rr_inst);
 
     session_shutdown();
-    g_free(ob_sm_id);
-
-#ifdef USE_LIBSN
-    sn_display_unref(ob_sn_display);
-#endif
 
     XCloseDisplay(ob_display);
 
+    parse_paths_shutdown();
+
     if (restart) {
         if (restart_path != NULL) {
             int argcp;
@@ -288,6 +294,7 @@ int main(int argc, char **argv)
 
         /* re-run me */
         execvp(argv[0], argv); /* try how we were run */
+        execlp(argv[0], g_path_get_basename(argv[0])); /* last resort */
     }
      
     return 0;
@@ -298,6 +305,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();
@@ -352,20 +362,6 @@ static void parse_args(int argc, char **argv)
             xsync = TRUE;
         } else if (!strcmp(argv[i], "--debug")) {
             ob_debug_show_output(TRUE);
-#ifdef USE_SM
-        } else if (!strcmp(argv[i], "--sm-client-id")) {
-            if (i == argc - 1) /* no args left */
-                g_printerr(_("--sm-client-id requires an argument\n"));
-            else
-                ob_sm_id = g_strdup(argv[++i]);
-        } else if (!strcmp(argv[i], "--sm-save-file")) {
-            if (i == argc - 1) /* no args left */
-                g_printerr(_("--sm-save-file requires an argument\n"));
-            else
-                sm_save_file = argv[++i];
-        } else if (!strcmp(argv[i], "--sm-disable")) {
-            ob_sm_use = FALSE;
-#endif
         } else {
             g_printerr("Invalid option: '%s'\n\n", argv[i]);
             print_help();
@@ -393,6 +389,12 @@ void ob_restart()
     ob_exit();
 }
 
+void ob_reconfigure()
+{
+    reconfigure = TRUE;
+    ob_exit();
+}
+
 void ob_exit()
 {
     ob_main_loop_exit(ob_main_loop);
@@ -414,13 +416,3 @@ ObState ob_state()
 {
     return state;
 }
-
-gchar *ob_expand_tilde(const gchar *f)
-{
-    if (!f)
-        return NULL;
-    else if (f[0] != '~')
-        return g_strdup(f);
-    else
-        return g_strconcat(g_get_home_dir(), f+1, NULL);
-}
This page took 0.030116 seconds and 4 git commands to generate.