X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=250ca6d07f465753515259a96698131618574f1c;hb=b76ec18d1c8857cf32598c822364298fc535c84e;hp=ee3911d982e3448869bd52ae89dd93b653086160;hpb=f58ece609523b5cc4c825c4af185e5a6fdd00210;p=chaz%2Fopenbox diff --git a/openbox/openbox.c b/openbox/openbox.c index ee3911d9..250ca6d0 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -28,9 +28,14 @@ #include "xerror.h" #include "prop.h" #include "screen.h" +#include "actions.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 "composite.h" #include "frame.h" #include "keyboard.h" #include "mouse.h" @@ -89,6 +94,7 @@ gboolean ob_replace_wm = FALSE; gboolean ob_sm_use = TRUE; gchar *ob_sm_id = NULL; gchar *ob_sm_save_file = NULL; +gboolean ob_sm_restore = TRUE; gboolean ob_debug_xinerama = FALSE; static ObState state; @@ -173,7 +179,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 obrender library.")); XSynchronize(ob_display, xsync); @@ -193,7 +199,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 +219,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); @@ -233,6 +240,8 @@ gint main(gint argc, gchar **argv) of the rc */ i = parse_startup(); + /* register all the available actions */ + actions_startup(reconfigure); /* start up config which sets up with the parser */ config_startup(i); @@ -256,7 +265,7 @@ gint main(gint argc, gchar **argv) /* load the theme specified in the rc file */ { RrTheme *theme; - if ((theme = RrThemeNew(ob_rr_inst, config_theme, + if ((theme = RrThemeNew(ob_rr_inst, config_theme, TRUE, config_font_activewindow, config_font_inactivewindow, config_font_menutitle, @@ -268,6 +277,9 @@ gint main(gint argc, gchar **argv) } if (ob_rr_theme == NULL) ob_exit_with_error(_("Unable to load a theme.")); + + PROP_SETS(RootWindow(ob_display, ob_screen), + ob_theme, ob_rr_theme->name); } if (reconfigure) { @@ -283,9 +295,13 @@ 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); + composite_startup(reconfigure); grab_startup(reconfigure); propwin_startup(reconfigure); group_startup(reconfigure); @@ -294,8 +310,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; @@ -319,10 +335,14 @@ gint main(gint argc, gchar **argv) /* redecorate all existing windows */ for (it = client_list; it; it = g_list_next(it)) { ObClient *c = it->data; + /* the new config can change the window's decorations */ - client_setup_decor_and_functions(c); + client_setup_decor_and_functions(c, FALSE); /* redraw the frames */ frame_adjust_area(c->frame, TRUE, TRUE, FALSE); + /* the decor sizes may have changed, so the windows may + end up in new positions */ + client_reconfigure(c, FALSE); } } @@ -337,8 +357,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); @@ -347,12 +367,17 @@ gint main(gint argc, gchar **argv) group_shutdown(reconfigure); propwin_shutdown(reconfigure); grab_shutdown(reconfigure); + composite_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); event_shutdown(reconfigure); config_shutdown(); + actions_shutdown(reconfigure); modkeys_shutdown(reconfigure); } while (reconfigure); } @@ -386,12 +411,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); @@ -406,6 +432,7 @@ 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; } @@ -467,6 +494,7 @@ 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")); @@ -532,10 +560,8 @@ static void parse_args(gint *argc, gchar **argv) } 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], "--sm-save-file")) { if (i == *argc - 1) /* no args left */ @@ -563,6 +589,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