X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=91d968e905b1255c68ed1bb09d2091e38d04d73e;hb=9d1949f0b168650e38dcb9adf1ad93e8b90a9b44;hp=3ad198664b74021b6ae26d4b27f9c1309093b2e7;hpb=c4e4760c41f10aae6af19a4363cb247c71edee4b;p=chaz%2Fopenbox diff --git a/openbox/openbox.c b/openbox/openbox.c index 3ad19866..91d968e9 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -1,6 +1,7 @@ -/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*- +/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- openbox.c for the Openbox window manager + Copyright (c) 2006 Mikael Magnusson Copyright (c) 2003 Ben Jansens This program is free software; you can redistribute it and/or modify @@ -59,9 +60,14 @@ # include # include #endif +#ifdef HAVE_SYS_WAIT_H +# include +# include +#endif #ifdef HAVE_UNISTD_H # include #endif +#include #include @@ -70,21 +76,22 @@ RrTheme *ob_rr_theme; ObMainLoop *ob_main_loop; Display *ob_display; gint ob_screen; -gboolean ob_replace_wm; +gboolean ob_replace_wm = FALSE; static ObState state; -static gboolean xsync; -static gboolean reconfigure; -static gboolean restart; -static char *restart_path; +static gboolean xsync = FALSE; +static gboolean reconfigure = FALSE; +static gboolean restart = FALSE; +static gchar *restart_path = NULL; static Cursor cursors[OB_NUM_CURSORS]; static KeyCode keys[OB_NUM_KEYS]; static gint exitcode = 0; +static gboolean reconfigure_and_exit = FALSE; -static void signal_handler(int signal, gpointer data); -static void parse_args(int argc, char **argv); +static void signal_handler(gint signal, gpointer data); +static void parse_args(gint argc, gchar **argv); -int main(int argc, char **argv) +gint main(gint argc, gchar **argv) { #ifdef DEBUG ob_debug_show_output(TRUE); @@ -94,26 +101,52 @@ int main(int argc, char **argv) /* initialize the locale */ if (!setlocale(LC_ALL, "")) - g_warning("Couldn't set locale from environment.\n"); + g_warning("Couldn't set locale from environment.\n"); bindtextdomain(PACKAGE_NAME, LOCALEDIR); bind_textdomain_codeset(PACKAGE_NAME, "UTF-8"); textdomain(PACKAGE_NAME); g_set_prgname(argv[0]); - - parse_paths_startup(); - - session_startup(&argc, &argv); + if (chdir(g_get_home_dir()) == -1) + g_warning("Unable to change to home directory (%s): %s", + g_get_home_dir(), g_strerror(errno)); + /* parse out command line args */ parse_args(argc, argv); + if (!reconfigure_and_exit) { + parse_paths_startup(); + + session_startup(argc, argv); + } + ob_display = XOpenDisplay(NULL); if (ob_display == NULL) - ob_exit_with_error("Failed to open the display."); + ob_exit_with_error("Failed to open the display."); if (fcntl(ConnectionNumber(ob_display), F_SETFD, 1) == -1) ob_exit_with_error("Failed to set display as close-on-exec."); + if (reconfigure_and_exit) { + guint32 pid; + gboolean ret; + + prop_startup(); /* get atoms values for the display */ + ret = PROP_GET32(RootWindow(ob_display, DefaultScreen(ob_display)), + openbox_pid, cardinal, &pid); + XCloseDisplay(ob_display); + if (!ret) { + g_print("Openbox does not appear to be running on this " + "display.\n"); + } else { + g_print("Telling the Openbox process # %u to reconfigure.\n", pid); + ret = (kill(pid, SIGUSR2) == 0); + if (!ret) + g_print("Error: %s.\n", strerror(errno)); + } + exit(ret ? EXIT_SUCCESS : EXIT_FAILURE); + } + ob_main_loop = ob_main_loop_new(ob_display); /* set up signal handler */ @@ -123,6 +156,7 @@ int main(int argc, char **argv) ob_main_loop_signal_add(ob_main_loop, SIGINT, signal_handler, NULL, NULL); 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); + ob_main_loop_signal_add(ob_main_loop, SIGCHLD, signal_handler, NULL, NULL); ob_screen = DefaultScreen(ob_display); @@ -130,15 +164,13 @@ int main(int argc, char **argv) if (ob_rr_inst == NULL) ob_exit_with_error("Failed to initialize the render library."); - /* XXX fork self onto other screens */ - XSynchronize(ob_display, xsync); /* check for locale support */ if (!XSupportsLocale()) - g_warning("X server does not support locale."); + g_warning("X server does not support locale."); if (!XSetLocaleModifiers("")) - g_warning("Cannot set locale modifiers for the X server."); + g_warning("Cannot set locale modifiers for the X server."); /* set our error handler */ XSetErrorHandler(xerror_handler); @@ -205,7 +237,7 @@ int main(int argc, char **argv) if (parse_load_rc(&doc, &node)) parse_tree(i, doc, node->xmlChildrenNode); /* we're done with parsing now, kill it */ - xmlFreeDoc(doc); + parse_close(doc); parse_shutdown(i); } @@ -248,6 +280,7 @@ int main(int argc, char **argv) if (!reconfigure) { /* get all the existing windows */ client_manage_all(); + focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS); } else { GList *it; @@ -286,6 +319,8 @@ int main(int argc, char **argv) } while (reconfigure); } + XSync(ob_display, FALSE); + RrThemeFree(ob_rr_theme); RrInstanceFree(ob_rr_inst); @@ -297,38 +332,47 @@ int main(int argc, char **argv) if (restart) { if (restart_path != NULL) { - int argcp; - char **argvp; + gint argcp; + gchar **argvp; GError *err = NULL; - /* run other shit */ + /* run other window manager */ 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", restart_path, err->message); + g_error_free(err); } } /* re-run me */ execvp(argv[0], argv); /* try how we were run */ - execlp(argv[0], g_path_get_basename(argv[0])); /* last resort */ + execlp(argv[0], g_path_get_basename(argv[0]), + (char *)NULL); /* last resort */ } return exitcode; } -static void signal_handler(int signal, gpointer data) +static void signal_handler(gint signal, gpointer data) { - if (signal == SIGUSR1) { - fprintf(stderr, "Caught signal %d. Restarting.\n", signal); + switch (signal) { + case SIGUSR1: + ob_debug("Caught signal %d. Restarting.\n", signal); ob_restart(); - } else if (signal == SIGUSR2) { - fprintf(stderr, "Caught signal %d. Reconfiguring.\n", signal); - ob_reconfigure(); - } else { - fprintf(stderr, "Caught signal %d. Exiting.\n", signal); + break; + case SIGUSR2: + ob_debug("Caught signal %d. Reconfiguring.\n", signal); + ob_reconfigure(); + break; + case SIGCHLD: + /* reap children */ + while (waitpid(-1, NULL, WNOHANG) > 0); + break; + default: + ob_debug("Caught signal %d. Exiting.\n", signal); /* TERM and INT return a 0 code */ ob_exit(!(signal == SIGTERM || signal == SIGINT)); } @@ -337,7 +381,8 @@ static void signal_handler(int signal, gpointer data) static void print_version() { g_print("Openbox %s\n", PACKAGE_VERSION); - g_print("Copyright (c) 2003 Ben Jansens, and others\n\n"); + g_print("Copyright (c) 2006 Mikael Magnusson\n"); + g_print("Copyright (c) 2003 Ben Jansens\n\n"); g_print("This program comes with ABSOLUTELY NO WARRANTY.\n"); g_print("This is free software, and you are welcome to redistribute it\n"); g_print("under certain conditions. See the file COPYING for details.\n\n"); @@ -347,6 +392,9 @@ static void print_help() { g_print("Syntax: openbox [options]\n\n"); g_print("Options:\n\n"); + g_print(" --reconfigure Tell the currently running instance of " + "Openbox to\n" + " reconfigure (and then exit immediately)\n"); #ifdef USE_SM g_print(" --sm-disable Disable connection to session manager\n"); g_print(" --sm-client-id ID Specify session management ID\n"); @@ -359,14 +407,14 @@ static void print_help() g_print(" --version Display the version and exit\n"); g_print(" --sync Run in synchronous mode (this is slow and " "meant for\n" - " debugging X routines)\n"); + " debugging X routines)\n"); g_print(" --debug Display debugging output\n"); g_print("\nPlease report bugs at %s\n\n", PACKAGE_BUGREPORT); } -static void parse_args(int argc, char **argv) +static void parse_args(gint argc, gchar **argv) { - int i; + gint i; for (i = 1; i < argc; ++i) { if (!strcmp(argv[i], "--version")) { @@ -383,10 +431,8 @@ static void parse_args(int argc, char **argv) xsync = TRUE; } else if (!strcmp(argv[i], "--debug")) { ob_debug_show_output(TRUE); - } else { - g_printerr("Invalid option: '%s'\n\n", argv[i]); - print_help(); - exit(1); + } else if (!strcmp(argv[i], "--reconfigure")) { + reconfigure_and_exit = TRUE; } } }