X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=8d491a4244a590ad4b0ea359296f27d1f6e0bf00;hb=a9910e520b1e5a7020ca8df0f2a7d0d0d48e2857;hp=b688296516911f2afee8254577a00635c3d60d4c;hpb=4cb183401cc42f61a759b02f1210a3528f7869e5;p=chaz%2Fopenbox diff --git a/openbox/openbox.c b/openbox/openbox.c index b6882965..8d491a42 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -1,6 +1,7 @@ /* -*- 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,6 +60,10 @@ # include # include #endif +#ifdef HAVE_SYS_WAIT_H +# include +# include +#endif #ifdef HAVE_UNISTD_H # include #endif @@ -71,16 +76,18 @@ 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 gchar *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 guint remote_control = 0; +static gboolean being_replaced = FALSE; static void signal_handler(gint signal, gpointer data); static void parse_args(gint argc, gchar **argv); @@ -95,7 +102,7 @@ gint main(gint argc, gchar **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); @@ -106,19 +113,33 @@ gint main(gint argc, gchar **argv) g_warning("Unable to change to home directory (%s): %s", g_get_home_dir(), g_strerror(errno)); - parse_paths_startup(); - - session_startup(&argc, &argv); - /* parse out command line args */ parse_args(argc, argv); + if (!remote_control) { + 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 (remote_control) { + prop_startup(); + + /* Send client message telling the OB process to: + * remote_control = 1 -> reconfigure + * remote_control = 2 -> restart */ + PROP_MSG(RootWindow(ob_display, ob_screen), + ob_control, remote_control, 0, 0, 0); + XCloseDisplay(ob_display); + exit(EXIT_SUCCESS); + } + ob_main_loop = ob_main_loop_new(ob_display); /* set up signal handler */ @@ -128,6 +149,7 @@ gint main(gint argc, gchar **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); @@ -139,9 +161,9 @@ gint main(gint argc, gchar **argv) /* 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); @@ -215,7 +237,12 @@ 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, + config_font_activewindow, + config_font_inactivewindow, + config_font_menutitle, + config_font_menuitem))) + { RrThemeFree(ob_rr_theme); ob_rr_theme = theme; } @@ -258,6 +285,9 @@ 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); + /* redraw the frames */ frame_adjust_area(c->frame, TRUE, TRUE, FALSE); } } @@ -295,7 +325,7 @@ gint main(gint argc, gchar **argv) RrThemeFree(ob_rr_theme); RrInstanceFree(ob_rr_inst); - session_shutdown(); + session_shutdown(being_replaced); XCloseDisplay(ob_display); @@ -307,7 +337,7 @@ gint main(gint argc, gchar **argv) 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); @@ -320,7 +350,8 @@ gint main(gint argc, gchar **argv) /* 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; @@ -328,13 +359,20 @@ gint main(gint argc, gchar **argv) static void signal_handler(gint signal, gpointer data) { - if (signal == SIGUSR1) { + switch (signal) { + case SIGUSR1: ob_debug("Caught signal %d. Restarting.\n", signal); ob_restart(); - } else if (signal == SIGUSR2) { + break; + case SIGUSR2: ob_debug("Caught signal %d. Reconfiguring.\n", signal); - ob_reconfigure(); - } else { + 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)); @@ -344,7 +382,8 @@ static void signal_handler(gint 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) 2007 Mikael Magnusson\n"); + g_print("Copyright (c) 2007 Dana 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"); @@ -354,6 +393,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"); @@ -366,7 +408,7 @@ 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); } @@ -390,10 +432,10 @@ static void parse_args(gint argc, gchar **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")) { + remote_control = 1; + } else if (!strcmp(argv[i], "--restart")) { + remote_control = 2; } } } @@ -401,7 +443,7 @@ static void parse_args(gint argc, gchar **argv) void ob_exit_with_error(gchar *msg) { g_critical(msg); - session_shutdown(); + session_shutdown(TRUE); exit(EXIT_FAILURE); } @@ -429,6 +471,13 @@ void ob_exit(gint code) ob_main_loop_exit(ob_main_loop); } +void ob_exit_replace() +{ + exitcode = 0; + being_replaced = TRUE; + ob_main_loop_exit(ob_main_loop); +} + Cursor ob_cursor(ObCursor cursor) { g_assert(cursor < OB_NUM_CURSORS);