when using openbox-gnome/kde-session, use a separate config file (rc-gnome/kde.xml)

[chaz/openbox] / openbox / openbox.c

diff --git a/openbox/openbox.c b/openbox/openbox.c
index aee2bcd6660407050f7a9e5dab3230622e0f8772..dfcda4b39ccaca719f6399227f26aa0ed010abbc 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -104,6 +104,7 @@ static gchar    *config_type = NULL;
 
 static void signal_handler(gint signal, gpointer data);
 static void remove_args(gint *argc, gchar **argv, gint index, gint num);
+static void parse_env();
 static void parse_args(gint *argc, gchar **argv);
 static Cursor load_cursor(const gchar *name, guint fontval);
 
@@ -126,6 +127,8 @@ gint main(gint argc, gchar **argv)
      
     /* parse the command line args, which can change the argv[0] */
     parse_args(&argc, argv);
+    /* parse the environment variables */
+    parse_env();
 
     program_name = g_path_get_basename(argv[0]);
     g_set_prgname(program_name);
@@ -150,7 +153,7 @@ gint main(gint argc, gchar **argv)
          * remote_control = 1 -> reconfigure 
          * remote_control = 2 -> restart */
         PROP_MSG(RootWindow(ob_display, ob_screen),
-                 openbox_control, remote_control, 0, 0, 0);
+                 ob_control, remote_control, 0, 0, 0);
         XCloseDisplay(ob_display);
         exit(EXIT_SUCCESS);
     }
@@ -242,7 +245,7 @@ gint main(gint argc, gchar **argv)
 
                 if (config_type != NULL)
                     PROP_SETS(RootWindow(ob_display, ob_screen),
-                              openbox_config, config_type);
+                              ob_config, config_type);
 
                 /* we're done with parsing now, kill it */
                 parse_shutdown(i);
@@ -405,6 +408,10 @@ gint main(gint argc, gchar **argv)
             argv = nargv;
         }
 
+        /* we also remove some environment variables, so put them back */
+        if (config_type)
+            setenv("OPENBOX_CONFIG_NAMESPACE", config_type, 1);
+
         /* re-run me */
         execvp(argv[0], argv); /* try how we were run */
         execlp(argv[0], program_name, (gchar*)NULL); /* last resort */
@@ -457,13 +464,10 @@ static void print_help()
 {
     g_print(_("Syntax: openbox [options]\n"));
     g_print(_("\nOptions:\n"));
-    g_print(_("  --config TYPE       Specify the configuration profile to use\n"));
-#ifdef USE_SM
-    g_print(_("  --sm-disable        Disable connection to the session manager\n"));
-#endif
-    g_print(_("  --replace           Replace the currently running window manager\n"));
     g_print(_("  --help              Display this help and exit\n"));
     g_print(_("  --version           Display the version and exit\n"));
+    g_print(_("  --replace           Replace the currently running window manager\n"));
+    g_print(_("  --sm-disable        Disable connection to the session manager\n"));
     g_print(_("\nPassing messages to a running Openbox instance:\n"));
     g_print(_("  --reconfigure       Reload Openbox's configuration\n"));
     g_print(_("\nDebugging options:\n"));
@@ -484,6 +488,18 @@ static void remove_args(gint *argc, gchar **argv, gint index, gint num)
     *argc -= num;
 }
 
+static void parse_env()
+{
+    /* unset this so we don't pass it on unknowingly */
+    unsetenv("DESKTOP_STARTUP_ID");
+
+    if (getenv("OPENBOX_CONFIG_NAMESPACE")) {
+        config_type = g_strdup(getenv("OPENBOX_CONFIG_NAMESPACE"));
+        /* don't pass it on except if we restart */
+        unsetenv("OPENBOX_CONFIG_NAMESPACE");
+    }
+}
+
 static void parse_args(gint *argc, gchar **argv)
 {
     gint i;
@@ -526,15 +542,6 @@ static void parse_args(gint *argc, gchar **argv)
             remote_control = 2;
 */
         }
-        else if (!strcmp(argv[i], "--config")) {
-            if (i == *argc - 1) /* no args left */
-                g_printerr(_("--config requires an argument\n"));
-            else {
-                config_type = g_strdup(argv[i+1]);
-                ++i;
-            }
-        }
-#ifdef USE_SM
         else if (!strcmp(argv[i], "--sm-save-file")) {
             if (i == *argc - 1) /* no args left */
                 /* not translated cuz it's sekret */
@@ -561,7 +568,6 @@ static void parse_args(gint *argc, gchar **argv)
         else if (!strcmp(argv[i], "--sm-disable")) {
             ob_sm_use = FALSE;
         }
-#endif
         else {
             /* this is a memleak.. oh well.. heh */
             gchar *err = g_strdup_printf