X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=95a58198249d9dcf9ce66b33315021d0c66e6b8f;hb=5563e251c36a1fbda703cf4bc3c8c6ae543829bd;hp=ed64682361f726d15ea9405cd5dfc8e8a1b441fb;hpb=29637976e6aecf45bae84ba9ce3ecb26635012f7;p=chaz%2Fopenbox diff --git a/openbox/openbox.c b/openbox/openbox.c index ed646823..95a58198 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -33,6 +33,7 @@ #include "focus_cycle_popup.h" #include "moveresize.h" #include "frame.h" +#include "framerender.h" #include "keyboard.h" #include "mouse.h" #include "menuframe.h" @@ -115,6 +116,8 @@ gint main(gint argc, gchar **argv) state = OB_STATE_STARTING; + ob_debug_startup(); + /* initialize the locale */ if (!setlocale(LC_ALL, "")) g_message("Couldn't set locale from environment."); @@ -122,10 +125,6 @@ gint main(gint argc, gchar **argv) bind_textdomain_codeset(PACKAGE_NAME, "UTF-8"); textdomain(PACKAGE_NAME); - 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 the command line args, which can change the argv[0] */ parse_args(&argc, argv); /* parse the environment variables */ @@ -144,7 +143,7 @@ gint main(gint argc, gchar **argv) /* Send client message telling the OB process to: * remote_control = 1 -> reconfigure * remote_control = 2 -> restart */ - OBT_PROP_MSG(ob_screen, RootWindow(obt_display, ob_screen), + OBT_PROP_MSG(ob_screen, obt_root(ob_screen), OB_CONTROL, remote_control, 0, 0, 0, 0); obt_display_close(obt_display); exit(EXIT_SUCCESS); @@ -177,7 +176,7 @@ gint main(gint argc, gchar **argv) /* set the DISPLAY environment variable for any lauched children, to the display we're using, so they open in the right place. */ - putenv(g_strdup_printf("DISPLAY=%s", DisplayString(obt_display))); + setenv("DISPLAY", DisplayString(obt_display), TRUE); /* create available cursors */ cursors[OB_CURSOR_NONE] = None; @@ -233,8 +232,7 @@ gint main(gint argc, gchar **argv) /* if (config_type != NULL) - PROP_SETS(RootWindow(obt_display, ob_screen), - ob_config, config_type); + PROP_SETS(obt_root(ob_screen), ob_config, config_type); */ /* we're done with parsing now, kill it */ @@ -257,7 +255,7 @@ gint main(gint argc, gchar **argv) if (ob_rr_theme == NULL) ob_exit_with_error(_("Unable to load a theme.")); - OBT_PROP_SETS(RootWindow(obt_display, ob_screen), + OBT_PROP_SETS(obt_root(ob_screen), OB_THEME, utf8, ob_rr_theme->name); } @@ -296,11 +294,11 @@ gint main(gint argc, gchar **argv) ObWindow *w; /* get all the existing windows */ - client_manage_all(); + window_manage_all(); focus_nothing(); /* focus what was focused if a wm was already running */ - if (OBT_PROP_GET32(RootWindow(obt_display, ob_screen), + if (OBT_PROP_GET32(obt_root(ob_screen), NET_ACTIVE_WINDOW, WINDOW, &xid) && (w = window_find(xid)) && WINDOW_IS_CLIENT(w)) { @@ -329,10 +327,8 @@ gint main(gint argc, gchar **argv) obt_main_loop_run(ob_main_loop); state = OB_STATE_EXITING; - if (!reconfigure) { - dock_remove_all(); - client_unmanage_all(); - } + if (!reconfigure) + window_unmanage_all(); menu_shutdown(reconfigure); menu_frame_shutdown(reconfigure); @@ -420,6 +416,8 @@ gint main(gint argc, gchar **argv) g_free(ob_sm_id); g_free(program_name); + ob_debug_shutdown(); + return exitcode; } @@ -427,11 +425,11 @@ static void signal_handler(gint signal, gpointer data) { switch (signal) { case SIGUSR1: - ob_debug("Caught signal %d. Restarting.\n", signal); + ob_debug("Caught signal %d. Restarting.", signal); ob_restart(); break; case SIGUSR2: - ob_debug("Caught signal %d. Reconfiguring.\n", signal); + ob_debug("Caught signal %d. Reconfiguring.", signal); ob_reconfigure(); break; case SIGCHLD: @@ -439,7 +437,7 @@ static void signal_handler(gint signal, gpointer data) while (waitpid(-1, NULL, WNOHANG) > 0); break; default: - ob_debug("Caught signal %d. Exiting.\n", signal); + ob_debug("Caught signal %d. Exiting.", signal); /* TERM and INT return a 0 code */ ob_exit(!(signal == SIGTERM || signal == SIGINT)); } @@ -473,6 +471,7 @@ static void print_help() 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-session Display debugging output for session managment\n")); g_print(_(" --debug-xinerama Split the display into fake xinerama screens\n")); g_print(_("\nPlease report bugs at %s\n"), PACKAGE_BUGREPORT); } @@ -491,9 +490,7 @@ static void remove_args(gint *argc, gchar **argv, gint index, gint num) static void parse_env() { /* unset this so we don't pass it on unknowingly */ - gchar *s = g_strdup("DESKTOP_STARTUP_ID"); - putenv(s); - g_free(s); + unsetenv("DESKTOP_STARTUP_ID"); } static void parse_args(gint *argc, gchar **argv) @@ -521,16 +518,19 @@ 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_NORMAL, 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_NORMAL, TRUE); ob_debug_enable(OB_DEBUG_APP_BUGS, TRUE); ob_debug_enable(OB_DEBUG_FOCUS, TRUE); } + else if (!strcmp(argv[i], "--debug-session")) { + ob_debug_enable(OB_DEBUG_NORMAL, TRUE); + ob_debug_enable(OB_DEBUG_APP_BUGS, TRUE); + ob_debug_enable(OB_DEBUG_SM, TRUE); + } else if (!strcmp(argv[i], "--debug-xinerama")) { ob_debug_xinerama = TRUE; } @@ -551,7 +551,7 @@ 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_debug_type(OB_DEBUG_SM, "--sm-save-file %s", ob_sm_save_file); } } @@ -563,7 +563,7 @@ 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); + ob_debug_type(OB_DEBUG_SM, "--sm-client-id %s", ob_sm_id); } } else if (!strcmp(argv[i], "--sm-disable")) {