X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=0006f438bc3c2957ddeff4f123b787dd693f458c;hb=5c96972bfffacb7dc24c96673f85e413e5c87b94;hp=d3c805496a44ad1688d86a3679d35e44c5a358de;hpb=36ddd0c4086652bfb65d3b3034640e349d5c991b;p=chaz%2Fopenbox diff --git a/openbox/openbox.c b/openbox/openbox.c index d3c80549..0006f438 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -89,6 +89,7 @@ gboolean ob_replace_wm = FALSE; 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; @@ -100,10 +101,10 @@ static KeyCode keys[OB_NUM_KEYS]; 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); @@ -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); @@ -139,9 +142,9 @@ gint main(gint argc, gchar **argv) ob_display = XOpenDisplay(NULL); if (ob_display == NULL) - ob_exit_with_error("Failed to open the display."); + ob_exit_with_error(_("Failed to open the display from the DISPLAY environment variable.")); if (fcntl(ConnectionNumber(ob_display), F_SETFD, 1) == -1) - ob_exit_with_error("Failed to set display as close-on-exec."); + ob_exit_with_error("Failed to set display as close-on-exec"); if (remote_control) { prop_startup(); @@ -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); } @@ -170,7 +173,7 @@ gint main(gint argc, gchar **argv) ob_rr_inst = RrInstanceNew(ob_display, ob_screen); if (ob_rr_inst == NULL) - ob_exit_with_error("Failed to initialize the render library."); + ob_exit_with_error(_("Failed to initialize the render library.")); XSynchronize(ob_display, xsync); @@ -234,15 +237,15 @@ gint main(gint argc, gchar **argv) 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); @@ -262,7 +265,7 @@ gint main(gint argc, gchar **argv) ob_rr_theme = theme; } if (ob_rr_theme == NULL) - ob_exit_with_error("Unable to load a theme."); + ob_exit_with_error(_("Unable to load a theme.")); } if (reconfigure) { @@ -405,6 +408,10 @@ gint main(gint argc, gchar **argv) 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 */ @@ -413,7 +420,7 @@ gint main(gint argc, gchar **argv) /* 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; @@ -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")); @@ -477,13 +481,25 @@ static void remove_args(gint *argc, gchar **argv, gint index, gint num) { gint i; - for (i = index; i < index + num; ++i) + for (i = index; i < *argc - num; ++i) argv[i] = argv[i+num]; for (; i < *argc; ++i) argv[i] = NULL; *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; @@ -492,39 +508,52 @@ static void parse_args(gint *argc, gchar **argv) if (!strcmp(argv[i], "--version")) { print_version(); exit(0); - } else if (!strcmp(argv[i], "--help")) { + } + else if (!strcmp(argv[i], "--help")) { print_help(); exit(0); - } else if (!strcmp(argv[i], "--g-fatal-warnings")) { + } + else if (!strcmp(argv[i], "--g-fatal-warnings")) { g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL); - } else if (!strcmp(argv[i], "--replace")) { + } + else if (!strcmp(argv[i], "--replace")) { ob_replace_wm = TRUE; - } else if (!strcmp(argv[i], "--sync")) { + remove_args(argc, argv, i, 1); + --i; /* this arg was removed so go back */ + } + else if (!strcmp(argv[i], "--sync")) { xsync = TRUE; - } else if (!strcmp(argv[i], "--debug")) { + } + else if (!strcmp(argv[i], "--debug")) { ob_debug_show_output(TRUE); ob_debug_enable(OB_DEBUG_SM, TRUE); ob_debug_enable(OB_DEBUG_APP_BUGS, TRUE); - } else if (!strcmp(argv[i], "--debug-focus")) { + } + else if (!strcmp(argv[i], "--debug-focus")) { ob_debug_show_output(TRUE); ob_debug_enable(OB_DEBUG_SM, TRUE); ob_debug_enable(OB_DEBUG_APP_BUGS, TRUE); ob_debug_enable(OB_DEBUG_FOCUS, TRUE); - } else if (!strcmp(argv[i], "--reconfigure")) { + } + else if (!strcmp(argv[i], "--reconfigure")) { remote_control = 1; /* don't make this do anything if it's not in --help .. } else if (!strcmp(argv[i], "--restart")) { 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); } } -#ifdef USE_SM else if (!strcmp(argv[i], "--sm-save-file")) { if (i == *argc - 1) /* no args left */ /* not translated cuz it's sekret */ @@ -533,8 +562,11 @@ static void parse_args(gint *argc, gchar **argv) ob_sm_save_file = 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, "--sm-save-file %s\n", + ob_sm_save_file); } - } else if (!strcmp(argv[i], "--sm-client-id")) { + } + else if (!strcmp(argv[i], "--sm-client-id")) { if (i == *argc - 1) /* no args left */ /* not translated cuz it's sekret */ g_printerr("--sm-client-id requires an argument\n"); @@ -542,24 +574,16 @@ static void parse_args(gint *argc, gchar **argv) ob_sm_id = 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, "--sm-client-id %s\n", ob_sm_id); } - } else if (!strcmp(argv[i], "--sm-disable")) { + } + else if (!strcmp(argv[i], "--sm-disable")) { ob_sm_use = FALSE; } -#endif - else if (!strcmp(argv[i], "--restart-binary")) { - if (i == *argc - 1) /* no args left */ - /* not translated cuz it's sekret */ - g_printerr("--restart-binary requires an argument\n"); - else { - argv[0] = g_strdup(argv[i+1]); - remove_args(argc, argv, i, 2); - --i; /* this arg was removed so go back */ - } - } else { + else { /* this is a memleak.. oh well.. heh */ gchar *err = g_strdup_printf - ("Invalid command line argument '%s'\n", argv[i]); + (_("Invalid command line argument '%s'\n"), argv[i]); ob_exit_with_error(err); } } @@ -579,7 +603,7 @@ static Cursor load_cursor(const gchar *name, guint fontval) void ob_exit_with_error(const gchar *msg) { - g_critical(msg); + g_message(msg); session_shutdown(TRUE); exit(EXIT_FAILURE); }