X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=b69f2c1e41fac5d08be5544dd9bd4a31140dc0f5;hb=44be67844a5568e8b1ad87327b0815f8667151c0;hp=0006f438bc3c2957ddeff4f123b787dd693f458c;hpb=5c96972bfffacb7dc24c96673f85e413e5c87b94;p=chaz%2Fopenbox diff --git a/openbox/openbox.c b/openbox/openbox.c index 0006f438..b69f2c1e 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -30,6 +30,9 @@ #include "screen.h" #include "startupnotify.h" #include "focus.h" +#include "focus_cycle.h" +#include "focus_cycle_indicator.h" +#include "focus_cycle_popup.h" #include "moveresize.h" #include "frame.h" #include "keyboard.h" @@ -89,7 +92,8 @@ 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; +gboolean ob_sm_restore = TRUE; +gboolean ob_debug_xinerama = FALSE; static ObState state; static gboolean xsync = FALSE; @@ -193,7 +197,8 @@ gint main(gint argc, gchar **argv) /* create available cursors */ cursors[OB_CURSOR_NONE] = None; cursors[OB_CURSOR_POINTER] = load_cursor("left_ptr", XC_left_ptr); - cursors[OB_CURSOR_BUSY] = load_cursor("left_ptr_watch", XC_watch); + cursors[OB_CURSOR_BUSYPOINTER] = load_cursor("left_ptr_watch",XC_left_ptr); + cursors[OB_CURSOR_BUSY] = load_cursor("watch", XC_watch); cursors[OB_CURSOR_MOVE] = load_cursor("fleur", XC_fleur); cursors[OB_CURSOR_NORTH] = load_cursor("top_side", XC_top_side); cursors[OB_CURSOR_NORTHEAST] = load_cursor("top_right_corner", @@ -212,7 +217,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(program_name)) { /* it will be ours! */ + if (screen_annex()) { /* it will be ours! */ do { modkeys_startup(reconfigure); @@ -237,15 +242,17 @@ gint main(gint argc, gchar **argv) config_startup(i); /* parse/load user options */ - if (parse_load_rc(ob_config_type, &doc, &node)) { + if (parse_load_rc(NULL, &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 (ob_config_type != NULL) +/* + if (config_type != NULL) PROP_SETS(RootWindow(ob_display, ob_screen), - ob_config, ob_config_type); + ob_config, config_type); +*/ /* we're done with parsing now, kill it */ parse_shutdown(i); @@ -281,6 +288,9 @@ gint main(gint argc, gchar **argv) /* focus_backup is used for stacking, so this needs to come before anything that calls stacking_add */ focus_startup(reconfigure); + focus_cycle_startup(reconfigure); + focus_cycle_indicator_startup(reconfigure); + focus_cycle_popup_startup(reconfigure); window_startup(reconfigure); sn_startup(reconfigure); screen_startup(reconfigure); @@ -292,8 +302,8 @@ gint main(gint argc, gchar **argv) moveresize_startup(reconfigure); keyboard_startup(reconfigure); mouse_startup(reconfigure); - menu_startup(reconfigure); menu_frame_startup(reconfigure); + menu_startup(reconfigure); if (!reconfigure) { guint32 xid; @@ -335,8 +345,8 @@ gint main(gint argc, gchar **argv) client_unmanage_all(); } - menu_frame_shutdown(reconfigure); menu_shutdown(reconfigure); + menu_frame_shutdown(reconfigure); mouse_shutdown(reconfigure); keyboard_shutdown(reconfigure); moveresize_shutdown(reconfigure); @@ -346,6 +356,9 @@ gint main(gint argc, gchar **argv) propwin_shutdown(reconfigure); grab_shutdown(reconfigure); screen_shutdown(reconfigure); + focus_cycle_popup_shutdown(reconfigure); + focus_cycle_indicator_shutdown(reconfigure); + focus_cycle_shutdown(reconfigure); focus_shutdown(reconfigure); sn_shutdown(reconfigure); window_shutdown(reconfigure); @@ -384,12 +397,13 @@ gint main(gint argc, gchar **argv) } } - /* we remove the session arguments from argv, so put them back */ + /* we remove the session arguments from argv, so put them back, + also don't restore the session on restart */ if (ob_sm_save_file != NULL || ob_sm_id != NULL) { gchar **nargv; gint i, l; - l = argc + + l = argc + 1 + (ob_sm_save_file != NULL ? 2 : 0) + (ob_sm_id != NULL ? 2 : 0); nargv = g_new0(gchar*, l+1); @@ -404,14 +418,11 @@ gint main(gint argc, gchar **argv) nargv[i++] = g_strdup("--sm-client-id"); nargv[i++] = ob_sm_id; } + nargv[i++] = g_strdup("--sm-no-load"); g_assert(i == l); 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 */ @@ -420,7 +431,6 @@ 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(ob_config_type); g_free(program_name); return exitcode; @@ -470,10 +480,12 @@ static void print_help() 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(_(" --restart Restart Openbox\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(_(" --debug-xinerama Split the display into fake xinerama screens\n")); g_print(_("\nPlease report bugs at %s\n"), PACKAGE_BUGREPORT); } @@ -492,12 +504,6 @@ 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) @@ -535,24 +541,13 @@ static void parse_args(gint *argc, gchar **argv) ob_debug_enable(OB_DEBUG_APP_BUGS, TRUE); ob_debug_enable(OB_DEBUG_FOCUS, TRUE); } + else if (!strcmp(argv[i], "--debug-xinerama")) { + ob_debug_xinerama = 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-namespace")) { - if (i == *argc - 1) /* no args left */ - /* not translated cuz it's sekret */ - g_printerr("--config-namespace requires an argument\n"); - else { - 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")) { if (i == *argc - 1) /* no args left */ @@ -580,6 +575,11 @@ static void parse_args(gint *argc, gchar **argv) else if (!strcmp(argv[i], "--sm-disable")) { ob_sm_use = FALSE; } + else if (!strcmp(argv[i], "--sm-no-load")) { + ob_sm_restore = FALSE; + remove_args(argc, argv, i, 1); + --i; /* this arg was removed so go back */ + } else { /* this is a memleak.. oh well.. heh */ gchar *err = g_strdup_printf