X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=220f0e2d147c6f12552619528c796cef7298ab26;hb=11e28eaa5c9e3ace49758345eac2f6c4b701659b;hp=07f1f992190e9fbbedef728b17582c162bc8747f;hpb=806a8c411f10c7a2292bfac15d77c8609f56ee71;p=chaz%2Fopenbox diff --git a/openbox/openbox.c b/openbox/openbox.c index 07f1f992..220f0e2d 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -7,8 +7,8 @@ #include "client.h" #include "xerror.h" #include "prop.h" -#include "startup.h" #include "screen.h" +#include "startupnotify.h" #include "focus.h" #include "moveresize.h" #include "frame.h" @@ -53,8 +53,6 @@ RrTheme *ob_rr_theme; ObMainLoop *ob_main_loop; Display *ob_display; gint ob_screen; -gboolean ob_sm_use = TRUE; -gchar *ob_sm_id; gboolean ob_replace_wm; static ObState state; @@ -64,7 +62,6 @@ static gboolean restart; static char *restart_path; static Cursor cursors[OB_NUM_CURSORS]; static KeyCode keys[OB_NUM_KEYS]; -static gchar *sm_save_file; static void signal_handler(int signal, gpointer data); static void parse_args(int argc, char **argv); @@ -104,6 +101,8 @@ int main(int argc, char **argv) g_set_prgname(argv[0]); + session_startup(&argc, &argv); + /* parse out command line args */ parse_args(argc, argv); @@ -123,14 +122,6 @@ int main(int argc, char **argv) ob_main_loop_signal_add(ob_main_loop, SIGHUP, signal_handler, NULL, NULL); ob_main_loop_signal_add(ob_main_loop, SIGPIPE, signal_handler, NULL, NULL); - if (sm_save_file) - session_load(sm_save_file); - session_startup(argc, argv); - -#ifdef USE_LIBSN - ob_sn_display = sn_display_new(ob_display, NULL, NULL); -#endif - ob_screen = DefaultScreen(ob_display); ob_rr_inst = RrInstanceNew(ob_display, ob_screen); @@ -155,6 +146,7 @@ int main(int argc, char **argv) putenv(g_strdup_printf("DISPLAY=%s", DisplayString(ob_display))); /* create available cursors */ + cursors[OB_CURSOR_NONE] = None; cursors[OB_CURSOR_POINTER] = XCreateFontCursor(ob_display, XC_left_ptr); cursors[OB_CURSOR_BUSY] = @@ -195,18 +187,8 @@ int main(int argc, char **argv) prop_startup(); /* get atoms values for the display */ extensions_query_all(); /* find which extensions are present */ - /* save stuff that we can use to restore state */ - startup_save(); - if (screen_annex()) { /* it will be ours! */ do { - event_startup(reconfigure); - grab_startup(reconfigure); - /* focus_backup is used for stacking, so this needs to come before - anything that calls stacking_add */ - focus_startup(reconfigure); - window_startup(reconfigure); - { ObParseInst *i; xmlDocPtr doc; @@ -226,15 +208,28 @@ int main(int argc, char **argv) } /* load the theme specified in the rc file */ - ob_rr_theme = RrThemeNew(ob_rr_inst, config_theme); - if (ob_rr_theme == NULL) - ob_exit_with_error("Unable to load a theme."); + { + RrTheme *theme; + if ((theme = RrThemeNew(ob_rr_inst, config_theme))) { + RrThemeFree(ob_rr_theme); + ob_rr_theme = theme; + } + if (ob_rr_theme == NULL) + ob_exit_with_error("Unable to load a theme."); + } - moveresize_startup(reconfigure); + event_startup(reconfigure); + grab_startup(reconfigure); + /* focus_backup is used for stacking, so this needs to come before + anything that calls stacking_add */ + focus_startup(reconfigure); + window_startup(reconfigure); + sn_startup(reconfigure); screen_startup(reconfigure); group_startup(reconfigure); client_startup(reconfigure); dock_startup(reconfigure); + moveresize_startup(reconfigure); keyboard_startup(reconfigure); mouse_startup(reconfigure); menu_startup(reconfigure); @@ -266,12 +261,13 @@ int main(int argc, char **argv) menu_shutdown(reconfigure); mouse_shutdown(reconfigure); keyboard_shutdown(reconfigure); + moveresize_shutdown(reconfigure); dock_shutdown(reconfigure); client_shutdown(reconfigure); group_shutdown(reconfigure); screen_shutdown(reconfigure); focus_shutdown(reconfigure); - moveresize_shutdown(reconfigure); + sn_shutdown(reconfigure); window_shutdown(reconfigure); grab_shutdown(reconfigure); event_shutdown(reconfigure); @@ -283,11 +279,6 @@ int main(int argc, char **argv) RrInstanceFree(ob_rr_inst); session_shutdown(); - g_free(ob_sm_id); - -#ifdef USE_LIBSN - sn_display_unref(ob_sn_display); -#endif XCloseDisplay(ob_display); @@ -309,6 +300,7 @@ int main(int argc, char **argv) /* re-run me */ execvp(argv[0], argv); /* try how we were run */ + execlp(argv[0], g_path_get_basename(argv[0])); /* last resort */ } return 0; @@ -376,20 +368,6 @@ static void parse_args(int argc, char **argv) xsync = TRUE; } else if (!strcmp(argv[i], "--debug")) { ob_debug_show_output(TRUE); -#ifdef USE_SM - } else if (!strcmp(argv[i], "--sm-client-id")) { - if (i == argc - 1) /* no args left */ - g_printerr(_("--sm-client-id requires an argument\n")); - else - ob_sm_id = g_strdup(argv[++i]); - } else if (!strcmp(argv[i], "--sm-save-file")) { - if (i == argc - 1) /* no args left */ - g_printerr(_("--sm-save-file requires an argument\n")); - else - sm_save_file = argv[++i]; - } else if (!strcmp(argv[i], "--sm-disable")) { - ob_sm_use = FALSE; -#endif } else { g_printerr("Invalid option: '%s'\n\n", argv[i]); print_help(); @@ -442,14 +420,12 @@ ObState ob_state() gchar *ob_expand_tilde(const gchar *f) { gchar **spl; - gchar *ret, *mid; + gchar *ret; if (!f) return NULL; spl = g_strsplit(f, "~", 0); - mid = g_strconcat(g_get_home_dir(), G_DIR_SEPARATOR_S, NULL); - ret = g_strjoinv(mid, spl); - g_free(mid); + ret = g_strjoinv(g_get_home_dir(), spl); g_strfreev(spl); return ret; }