X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=db26f0d2582fe836c50e0e44a00374614e9eff14;hb=481e68112177d1a1c0eb920f37c372ea34eeb371;hp=052929a5b5f9df36f93c8e400d3d27225e76a528;hpb=7e946f68d9f8ec7c880664b437edbbaa5d49ac10;p=chaz%2Fopenbox diff --git a/openbox/openbox.c b/openbox/openbox.c index 052929a5..db26f0d2 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -38,6 +38,7 @@ #include "menuframe.h" #include "grab.h" #include "group.h" +#include "propwin.h" #include "config.h" #include "mainloop.h" #include "gettext.h" @@ -81,6 +82,9 @@ ObMainLoop *ob_main_loop; Display *ob_display; gint ob_screen; gboolean ob_replace_wm = FALSE; +gboolean ob_sm_use = TRUE; +gchar *ob_sm_id = NULL; +gchar *ob_sm_save_file = NULL; static ObState state; static gboolean xsync = FALSE; @@ -92,31 +96,35 @@ 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); +static void remove_args(gint *argc, gchar **argv, gint index, gint num); +static void parse_args(gint *argc, gchar **argv); static Cursor load_cursor(const gchar *name, guint fontval); gint main(gint argc, gchar **argv) { + gchar *program_name; + state = OB_STATE_STARTING; /* initialize the locale */ if (!setlocale(LC_ALL, "")) - g_message(_("Couldn't set locale from environment.")); + g_message("Couldn't set locale from environment."); bindtextdomain(PACKAGE_NAME, LOCALEDIR); bind_textdomain_codeset(PACKAGE_NAME, "UTF-8"); textdomain(PACKAGE_NAME); - g_set_prgname(argv[0]); - if (chdir(g_get_home_dir()) == -1) g_message(_("Unable to change to home directory '%s': %s"), g_get_home_dir(), g_strerror(errno)); - /* parse out command line args */ - parse_args(argc, argv); + /* parse the command line args, which can change the argv[0] */ + parse_args(&argc, argv); + + program_name = g_path_get_basename(argv[0]); + g_set_prgname(program_name); if (!remote_control) { parse_paths_startup(); @@ -124,6 +132,7 @@ gint main(gint argc, gchar **argv) session_startup(argc, argv); } + ob_display = XOpenDisplay(NULL); if (ob_display == NULL) ob_exit_with_error("Failed to open the display."); @@ -137,7 +146,7 @@ gint main(gint argc, gchar **argv) * remote_control = 1 -> reconfigure * remote_control = 2 -> restart */ PROP_MSG(RootWindow(ob_display, ob_screen), - ob_control, remote_control, 0, 0, 0); + openbox_control, remote_control, 0, 0, 0); XCloseDisplay(ob_display); exit(EXIT_SUCCESS); } @@ -209,7 +218,7 @@ gint main(gint argc, gchar **argv) prop_startup(); /* get atoms values for the display */ extensions_query_all(); /* find which extensions are present */ - if (screen_annex()) { /* it will be ours! */ + if (screen_annex(program_name)) { /* it will be ours! */ do { { ObParseInst *i; @@ -222,18 +231,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); } @@ -271,6 +283,7 @@ gint main(gint argc, gchar **argv) sn_startup(reconfigure); screen_startup(reconfigure); grab_startup(reconfigure); + propwin_startup(reconfigure); group_startup(reconfigure); client_startup(reconfigure); dock_startup(reconfigure); @@ -281,9 +294,21 @@ gint main(gint argc, gchar **argv) menu_frame_startup(reconfigure); if (!reconfigure) { + guint32 xid; + ObWindow *w; + /* get all the existing windows */ client_manage_all(); - focus_fallback(TRUE); + focus_nothing(); + + /* focus what was focused if a wm was already running */ + if (PROP_GET32(RootWindow(ob_display, ob_screen), + net_active_window, window, &xid) && + (w = g_hash_table_lookup(window_map, &xid)) && + WINDOW_IS_CLIENT(w)) + { + client_focus(WINDOW_AS_CLIENT(w)); + } } else { GList *it; @@ -316,6 +341,7 @@ gint main(gint argc, gchar **argv) dock_shutdown(reconfigure); client_shutdown(reconfigure); group_shutdown(reconfigure); + propwin_shutdown(reconfigure); grab_shutdown(reconfigure); screen_shutdown(reconfigure); focus_shutdown(reconfigure); @@ -329,7 +355,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); @@ -357,11 +382,40 @@ gint main(gint argc, gchar **argv) } } + /* we remove the session arguments from argv, so put them back */ + if (ob_sm_save_file != NULL || ob_sm_id != NULL) { + gchar **nargv; + gint i, l; + + l = argc + + (ob_sm_save_file != NULL ? 2 : 0) + + (ob_sm_id != NULL ? 2 : 0); + nargv = g_new0(gchar*, l+1); + for (i = 0; i < argc; ++i) + nargv[i] = argv[i]; + + if (ob_sm_save_file != NULL) { + nargv[i++] = g_strdup("--sm-save-file"); + nargv[i++] = ob_sm_save_file; + } + if (ob_sm_id != NULL) { + nargv[i++] = g_strdup("--sm-client-id"); + nargv[i++] = ob_sm_id; + } + g_assert(i == l); + argv = nargv; + } + /* re-run me */ execvp(argv[0], argv); /* try how we were run */ - execlp(argv[0], g_path_get_basename(argv[0]), - (char *)NULL); /* last resort */ + 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(program_name); return exitcode; } @@ -403,30 +457,39 @@ static void print_version() 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(_("\nOptions:\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")); - g_print(_(" --sm-save-file FILE Specify file to load a saved session from\n")); + 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(_("\nPassing messages to a running Openbox instance:\n\n")); + g_print(_("\nPassing messages to a running Openbox instance:\n")); g_print(_(" --reconfigure Reload Openbox's configuration\n")); - g_print(_("\nDebugging options:\n\n")); + g_print(_("\nDebugging options:\n")); g_print(_(" --sync Run in synchronous mode\n")); g_print(_(" --debug Display debugging output\n")); g_print(_(" --debug-focus Display debugging output for focus handling\n")); - g_print(_("\nPlease report bugs at %s\n\n"), PACKAGE_BUGREPORT); + g_print(_("\nPlease report bugs at %s\n"), PACKAGE_BUGREPORT); } -static void parse_args(gint argc, gchar **argv) +static void remove_args(gint *argc, gchar **argv, gint index, gint num) { gint i; - for (i = 1; i < argc; ++i) { + for (i = index; i < index + num; ++i) + argv[i] = argv[i+num]; + for (; i < *argc; ++i) + argv[i] = NULL; + *argc -= num; +} + +static void parse_args(gint *argc, gchar **argv) +{ + gint i; + + for (i = 1; i < *argc; ++i) { if (!strcmp(argv[i], "--version")) { print_version(); exit(0); @@ -441,21 +504,65 @@ static void parse_args(gint argc, gchar **argv) xsync = TRUE; } 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")) { 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")) { 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-file")) { - if (i == argc - 1) /* no args left */ - g_printerr(_("--config-file requires an argument\n")); +*/ + } else if (!strcmp(argv[i], "--config")) { + if (i == *argc - 1) /* no args left */ + g_printerr(_("--config requires an argument\n")); else { - config_file = g_strdup(argv[i+1]); + 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 */ + g_printerr("--sm-save-file requires an argument\n"); + else { + ob_sm_save_file = g_strdup(argv[i+1]); + remove_args(argc, argv, i, 2); + --i; /* this arg was removed so go back */ + } + } 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"); + else { + ob_sm_id = g_strdup(argv[i+1]); + remove_args(argc, argv, i, 2); + --i; /* this arg was removed so go back */ + } + } 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 { + /* this is a memleak.. oh well.. heh */ + gchar *err = g_strdup_printf + ("Invalid command line argument '%s'\n", argv[i]); + ob_exit_with_error(err); + } } }