X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=234764178ea6df7bdd948c88feff242e42397a9a;hb=221415e97c2279e0245d643f120b6558af72879e;hp=8f19b31aa02f648a2f8f1a1b7b32bf8c32c1411b;hpb=276b2be581c6cb138b439537761ff2ca42201805;p=chaz%2Fopenbox diff --git a/openbox/openbox.c b/openbox/openbox.c index 8f19b31a..23476417 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -52,23 +52,21 @@ #ifdef USE_SM gboolean ob_sm_use = TRUE; SmcConn ob_sm_conn; -gchar *ob_sm_id = NULL; +gchar *ob_sm_id; #endif -RrInstance *ob_rr_inst = NULL; -RrTheme *ob_rr_theme = NULL; -Display *ob_display = NULL; -int ob_screen; -Window ob_root; -ObState ob_state; -gboolean ob_shutdown = FALSE; -gboolean ob_restart = FALSE; -char *ob_restart_path = NULL; -gboolean ob_remote = TRUE; -gboolean ob_sync = FALSE; +RrInstance *ob_rr_inst; +RrTheme *ob_rr_theme; +Display *ob_display; +gint ob_screen; Cursor ob_cursors[OB_NUM_CURSORS]; KeyCode ob_keys[OB_NUM_KEYS]; -char *ob_rc_path = NULL; + +static ObState state; +static gboolean xsync; +static gboolean shutdown; +static gboolean restart; +static char *restart_path; static void signal_handler(const ObEvent *e, void *data); static void parse_args(int argc, char **argv); @@ -93,7 +91,7 @@ int main(int argc, char **argv) xmlDocPtr doc; xmlNodePtr node; - ob_state = OB_STATE_STARTING; + state = OB_STATE_STARTING; /* initialize the locale */ if (!setlocale(LC_ALL, "")) @@ -148,7 +146,6 @@ int main(int argc, char **argv) #endif ob_screen = DefaultScreen(ob_display); - ob_root = RootWindow(ob_display, ob_screen); ob_rr_inst = RrInstanceNew(ob_display, ob_screen); if (ob_rr_inst == NULL) @@ -156,7 +153,7 @@ int main(int argc, char **argv) /* XXX fork self onto other screens */ - XSynchronize(ob_display, ob_sync); + XSynchronize(ob_display, xsync); /* check for locale support */ if (!XSupportsLocale()) @@ -246,7 +243,6 @@ int main(int argc, char **argv) if (ob_rr_theme == NULL) exit_with_error("Unable to load a theme."); - frame_startup(); moveresize_startup(); screen_startup(); group_startup(); @@ -259,10 +255,10 @@ int main(int argc, char **argv) /* get all the existing windows */ client_manage_all(); - ob_state = OB_STATE_RUNNING; - while (!ob_shutdown) + state = OB_STATE_RUNNING; + while (!shutdown) event_loop(); - ob_state = OB_STATE_EXITING; + state = OB_STATE_EXITING; dock_remove_all(); client_unmanage_all(); @@ -274,7 +270,6 @@ int main(int argc, char **argv) screen_shutdown(); focus_shutdown(); moveresize_shutdown(); - frame_shutdown(); menu_shutdown(); window_shutdown(); grab_shutdown(); @@ -292,18 +287,18 @@ int main(int argc, char **argv) XCloseDisplay(ob_display); - if (ob_restart) { - if (ob_restart_path != NULL) { + if (restart) { + if (restart_path != NULL) { int argcp; char **argvp; GError *err = NULL; /* run other shit */ - if (g_shell_parse_argv(ob_restart_path, &argcp, &argvp, &err)) { + if (g_shell_parse_argv(restart_path, &argcp, &argvp, &err)) { execvp(argvp[0], argvp); g_strfreev(argvp); } else { - g_warning("failed to execute '%s': %s", ob_restart_path, + g_warning("failed to execute '%s': %s", restart_path, err->message); } } @@ -473,7 +468,7 @@ static void signal_handler(const ObEvent *e, void *data) switch (s) { case SIGUSR1: fprintf(stderr, "Caught SIGUSR1 signal. Restarting."); - ob_shutdown = ob_restart = TRUE; + ob_restart(); break; case SIGHUP: @@ -481,7 +476,7 @@ static void signal_handler(const ObEvent *e, void *data) case SIGTERM: case SIGPIPE: fprintf(stderr, "Caught signal %d. Exiting.", s); - ob_shutdown = TRUE; + ob_exit(); break; case SIGFPE: @@ -504,7 +499,6 @@ static void print_help() print_version(); g_print("Syntax: openbox [options]\n\n"); g_print("Options:\n\n"); - g_print(" --rc PATH Specify the path to the rc file to use\n"); #ifdef USE_SM g_print(" --sm-client-id ID Specify session management ID\n"); g_print(" --sm-disable Disable connection to session manager\n"); @@ -527,13 +521,10 @@ static void parse_args(int argc, char **argv) } else if (!strcmp(argv[i], "--help")) { print_help(); exit(0); + } else if (!strcmp(argv[i], "--g-fatal-warnings")) { + g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL); } else if (!strcmp(argv[i], "--sync")) { - ob_sync = TRUE; - } else if (!strcmp(argv[i], "--rc")) { - if (i == argc - 1) /* no args left */ - g_printerr(_("--rc requires an argument\n")); - else - ob_rc_path = argv[++i]; + xsync = TRUE; #ifdef USE_SM } else if (!strcmp(argv[i], "--sm-client-id")) { if (i == argc - 1) /* no args left */ @@ -551,15 +542,6 @@ static void parse_args(int argc, char **argv) } } -gboolean ob_pointer_pos(int *x, int *y) -{ - Window w; - int i; - guint u; - - return !!XQueryPointer(ob_display, ob_root, &w, &w, x, y, &i, &i, &u); -} - #ifdef USE_SM static void sm_save_yourself(SmcConn conn, SmPointer data, int save_type, Bool shutdown, int interact_style, Bool fast) @@ -570,7 +552,7 @@ static void sm_save_yourself(SmcConn conn, SmPointer data, int save_type, static void sm_die(SmcConn conn, SmPointer data) { - ob_shutdown = TRUE; + ob_exit(); g_message("got DIE from session manager"); } @@ -592,6 +574,23 @@ static void exit_with_error(gchar *msg) exit(EXIT_FAILURE); } +void ob_restart_other(const gchar *path) +{ + restart_path = g_strdup(path); + ob_restart(); +} + +void ob_restart() +{ + restart = TRUE; + ob_exit(); +} + +void ob_exit() +{ + shutdown = TRUE; +} + Cursor ob_cursor(ObCursor cursor) { g_assert(cursor < OB_NUM_CURSORS); @@ -603,3 +602,8 @@ KeyCode ob_keycode(ObKey key) g_assert(key < OB_NUM_KEYS); return ob_keys[key]; } + +ObState ob_state() +{ + return state; +}