From a6aaabe62c3651169dda9a1a34bcec64dad4ee92 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sat, 5 May 2007 23:54:04 +0000 Subject: [PATCH] change the --config-file to --config, which works differently.. change the _OPENBOX_RC root property to _OPENBOX_CONFIG which is also different. --- openbox/openbox.c | 26 ++++++++++++++------------ openbox/prop.c | 2 +- openbox/prop.h | 2 +- openbox/screen.c | 2 +- parser/parse.c | 29 +++++++++++++---------------- parser/parse.h | 8 +++++--- 6 files changed, 35 insertions(+), 34 deletions(-) diff --git a/openbox/openbox.c b/openbox/openbox.c index 2cd8958f..934afa41 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -92,7 +92,7 @@ static KeyCode keys[OB_NUM_KEYS]; static gint exitcode = 0; static guint remote_control = 0; static gboolean being_replaced = FALSE; -static gchar *config_file = NULL; +static gchar *config_type = NULL; static void signal_handler(gint signal, gpointer data); static void parse_args(gint argc, gchar **argv); @@ -222,18 +222,21 @@ gint main(gint argc, gchar **argv) of the rc */ i = parse_startup(); + /* start up config which sets up with the parser */ config_startup(i); + /* parse/load user options */ - if (parse_load_rc(config_file, &doc, &node, &config_file)) { - PROP_SETS(RootWindow(ob_display, ob_screen), - openbox_rc, config_file); + if (parse_load_rc(config_type, &doc, &node)) { parse_tree(i, doc, node->xmlChildrenNode); - } else { + parse_close(doc); + } else g_message(_("Unable to find a valid config file, using some simple defaults")); - PROP_ERASE(RootWindow(ob_display, ob_screen), openbox_rc); - } + + if (config_type != NULL) + PROP_SETS(RootWindow(ob_display, ob_screen), + openbox_config, config_type); + /* we're done with parsing now, kill it */ - parse_close(doc); parse_shutdown(i); } @@ -329,7 +332,6 @@ gint main(gint argc, gchar **argv) XSync(ob_display, FALSE); - g_free(config_file); /* this is set by parse_load_rc */ RrThemeFree(ob_rr_theme); RrInstanceFree(ob_rr_inst); @@ -404,7 +406,7 @@ static void print_help() { g_print(_("Syntax: openbox [options]\n")); g_print(_("\nOptions:\n\n")); - g_print(_(" --config-file FILE Specify the file to load for the config file\n")); + g_print(_(" --config TYPE Specify the configuration profile to use\n")); #ifdef USE_SM g_print(_(" --sm-disable Disable connection to session manager\n")); g_print(_(" --sm-client-id ID Specify session management ID\n")); @@ -450,11 +452,11 @@ static void parse_args(gint argc, gchar **argv) remote_control = 1; } else if (!strcmp(argv[i], "--restart")) { remote_control = 2; - } else if (!strcmp(argv[i], "--config-file")) { + } else if (!strcmp(argv[i], "--config")) { if (i == argc - 1) /* no args left */ g_printerr(_("--config-file requires an argument\n")); else { - config_file = g_strdup(argv[i+1]); + config_type = g_strdup(argv[i+1]); ++i; } } diff --git a/openbox/prop.c b/openbox/prop.c index 9f2d48b4..4d366a59 100644 --- a/openbox/prop.c +++ b/openbox/prop.c @@ -163,7 +163,7 @@ void prop_startup() */ CREATE(openbox_pid, "_OPENBOX_PID"); - CREATE(openbox_rc, "_OPENBOX_RC"); + CREATE(openbox_config, "_OPENBOX_CONFIG"); CREATE(openbox_wm_state_undecorated, "_OB_WM_STATE_UNDECORATED"); CREATE(openbox_control, "_OB_CONTROL"); } diff --git a/openbox/prop.h b/openbox/prop.h index 4ae9e775..75431b95 100644 --- a/openbox/prop.h +++ b/openbox/prop.h @@ -184,7 +184,7 @@ typedef struct Atoms { Atom openbox_wm_state_undecorated; Atom openbox_pid; - Atom openbox_rc; + Atom openbox_config; Atom openbox_control; } Atoms; Atoms prop_atoms; diff --git a/openbox/screen.c b/openbox/screen.c index b305e685..a413411a 100644 --- a/openbox/screen.c +++ b/openbox/screen.c @@ -284,7 +284,7 @@ gboolean screen_annex() supported[i++] = prop_atoms.openbox_wm_state_undecorated; supported[i++] = prop_atoms.openbox_pid; - supported[i++] = prop_atoms.openbox_rc; + supported[i++] = prop_atoms.openbox_config; supported[i++] = prop_atoms.openbox_control; g_assert(i == num_support); diff --git a/parser/parse.c b/parser/parse.c index 011808fb..43d076e1 100644 --- a/parser/parse.c +++ b/parser/parse.c @@ -79,29 +79,26 @@ void parse_register(ObParseInst *i, const gchar *tag, g_hash_table_insert(i->callbacks, c->tag, c); } -gboolean parse_load_rc(const gchar *file, xmlDocPtr *doc, xmlNodePtr *root, - gchar **fileused) +gboolean parse_load_rc(const gchar *type, xmlDocPtr *doc, xmlNodePtr *root) { GSList *it; gboolean r = FALSE; + gchar *fname; - *fileused = NULL; + if (type == NULL) + fname = g_strdup("rc.xml"); + else + fname = g_strdup_printf("rc-%s.xml", type); - if (file) { - if ((r = parse_load(file, "openbox_config", doc, root))) - *fileused = g_strdup(file); - } else { - /* this won't run if the above code loaded a config */ - for (it = xdg_config_dir_paths; !r && it; it = g_slist_next(it)) { - gchar *path; + for (it = xdg_config_dir_paths; !r && it; it = g_slist_next(it)) { + gchar *path; - path = g_build_filename(it->data, "openbox", "rc.xml", NULL); - if ((r = parse_load(path, "openbox_config", doc, root))) - *fileused = path; - else - g_free(path); - } + path = g_build_filename(it->data, "openbox", fname, NULL); + r = parse_load(path, "openbox_config", doc, root); + g_free(path); } + g_free(fname); + return r; } diff --git a/parser/parse.h b/parser/parse.h index 7aba2e45..7f273398 100644 --- a/parser/parse.h +++ b/parser/parse.h @@ -34,9 +34,11 @@ typedef void (*ParseCallback)(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, ObParseInst* parse_startup(); void parse_shutdown(ObParseInst *inst); -/* Loads Openbox's rc, from the normal paths */ -gboolean parse_load_rc(const gchar *file, xmlDocPtr *doc, xmlNodePtr *root, - gchar **fileused); +/*! Loads Openbox's rc, from the normal paths + @type The configuration type to load, or NULL to use the default. + e.g. "gnome" would load rc-gnome.xml. + */ +gboolean parse_load_rc(const gchar *type, xmlDocPtr *doc, xmlNodePtr *root); /* Loads an Openbox menu, from the normal paths */ gboolean parse_load_menu(const gchar *file, xmlDocPtr *doc, xmlNodePtr *root); /* Loads an Openbox menu, from the normal paths */ -- 2.39.2