gboolean ob_sm_use = TRUE;
gchar *ob_sm_id = NULL;
gchar *ob_sm_save_file = NULL;
+gchar *ob_config_type = NULL;
static ObState state;
static gboolean xsync = FALSE;
static gint exitcode = 0;
static guint remote_control = 0;
static gboolean being_replaced = FALSE;
-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);
/* 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);
* 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);
}
config_startup(i);
/* parse/load user options */
- if (parse_load_rc(config_type, &doc, &node)) {
+ if (parse_load_rc(ob_config_type, &doc, &node)) {
parse_tree(i, doc, node->xmlChildrenNode);
parse_close(doc);
} else
g_message(_("Unable to find a valid config file, using some simple defaults"));
- if (config_type != NULL)
+ if (ob_config_type != NULL)
PROP_SETS(RootWindow(ob_display, ob_screen),
- openbox_config, config_type);
+ ob_config, ob_config_type);
/* we're done with parsing now, kill it */
parse_shutdown(i);
argv = nargv;
}
+ /* we also remove some environment variables, so put them back */
+ if (ob_config_type)
+ setenv("OPENBOX_CONFIG_NAMESPACE", ob_config_type, 1);
+
/* re-run me */
execvp(argv[0], argv); /* try how we were run */
execlp(argv[0], program_name, (gchar*)NULL); /* last resort */
/* free stuff passed in from the command line or environment */
g_free(ob_sm_save_file);
g_free(ob_sm_id);
- g_free(config_type);
+ g_free(ob_config_type);
g_free(program_name);
return exitcode;
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(_(" --config TYPE Specify the configuration profile to use\n"));
g_print(_("\nPassing messages to a running Openbox instance:\n"));
g_print(_(" --reconfigure Reload Openbox's configuration\n"));
g_print(_("\nDebugging options:\n"));
*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")) {
+ ob_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;
remote_control = 2;
*/
}
- else if (!strcmp(argv[i], "--config")) {
+ else if (!strcmp(argv[i], "--config-namespace")) {
if (i == *argc - 1) /* no args left */
- g_printerr(_("--config requires an argument\n"));
+ /* not translated cuz it's sekret */
+ g_printerr("--config-namespace requires an argument\n");
else {
- config_type = g_strdup(argv[i+1]);
- ++i;
+ ob_config_type = g_strdup(argv[i+1]);
+ remove_args(argc, argv, i, 2);
+ --i; /* this arg was removed so go back */
+ ob_debug_type(OB_DEBUG_SM, "--config-namespace %s\n",
+ ob_sm_save_file);
}
}
else if (!strcmp(argv[i], "--sm-save-file")) {