X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=91d968e905b1255c68ed1bb09d2091e38d04d73e;hb=f189b02f857eb5cc80ca925ccb4b0e97c3614bcd;hp=8e61fa86f729fa0fa96551eec2bc19da8d937446;hpb=700e551390a86ffdb92ddc061914ec7687658d18;p=chaz%2Fopenbox diff --git a/openbox/openbox.c b/openbox/openbox.c index 8e61fa86..91d968e9 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -1,3 +1,22 @@ +/* -*- 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 + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + See the COPYING file for a copy of the GNU General Public License. +*/ + #include "debug.h" #include "openbox.h" #include "session.h" @@ -5,22 +24,21 @@ #include "event.h" #include "menu.h" #include "client.h" -#include "dispatch.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" #include "keyboard.h" #include "mouse.h" #include "extensions.h" +#include "menuframe.h" #include "grab.h" -#include "plugin.h" -#include "timer.h" #include "group.h" #include "config.h" +#include "mainloop.h" #include "gettext.h" #include "parser/parse.h" #include "render/render.h" @@ -30,7 +48,6 @@ # include #endif #ifdef HAVE_SIGNAL_H -#define __USE_UNIX98 # include #endif #ifdef HAVE_STDLIB_H @@ -43,40 +60,39 @@ # include # include #endif +#ifdef HAVE_SYS_WAIT_H +# include +# include +#endif #ifdef HAVE_UNISTD_H # include #endif +#include #include RrInstance *ob_rr_inst; 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; +gboolean ob_replace_wm = FALSE; static ObState state; -static gboolean xsync; -static gboolean shutdown; -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 gchar *sm_save_file; +static gint exitcode = 0; +static gboolean reconfigure_and_exit = FALSE; -static void signal_handler(const ObEvent *e, void *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) { - struct sigaction action; - sigset_t sigset; - char *path; - xmlDocPtr doc; - xmlNodePtr node; - #ifdef DEBUG ob_debug_show_output(TRUE); #endif @@ -85,62 +101,62 @@ 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); - /* start our event dispatcher and register for signals */ - dispatch_startup(); - dispatch_register(Event_Signal, signal_handler, NULL); - - /* set up signal handler */ - sigemptyset(&sigset); - action.sa_handler = dispatch_signal; - action.sa_mask = sigset; - action.sa_flags = SA_NOCLDSTOP | SA_NODEFER; - sigaction(SIGUSR1, &action, (struct sigaction *) NULL); - sigaction(SIGPIPE, &action, (struct sigaction *) NULL); -/* sigaction(SIGSEGV, &action, (struct sigaction *) NULL);*/ - sigaction(SIGFPE, &action, (struct sigaction *) NULL); - sigaction(SIGTERM, &action, (struct sigaction *) NULL); - sigaction(SIGINT, &action, (struct sigaction *) NULL); - sigaction(SIGHUP, &action, (struct sigaction *) NULL); - - /* create the ~/.openbox dir */ - path = g_build_filename(g_get_home_dir(), ".openbox", NULL); - mkdir(path, (S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IWGRP | S_IXGRP | - S_IROTH | S_IWOTH | S_IXOTH)); - g_free(path); - /* create the ~/.openbox/themes dir */ - path = g_build_filename(g_get_home_dir(), ".openbox", "themes", NULL); - mkdir(path, (S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IWGRP | S_IXGRP | - S_IROTH | S_IWOTH | S_IXOTH)); - g_free(path); - /* create the ~/.openbox/sessions dir */ - path = g_build_filename(g_get_home_dir(), ".openbox", "sessions", NULL); - mkdir(path, (S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IWGRP | S_IXGRP | - S_IROTH | S_IWOTH | S_IXOTH)); - g_free(path); - g_set_prgname(argv[0]); + + 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 (sm_save_file) - session_load(sm_save_file); - session_startup(argc, argv); + 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); -#ifdef USE_LIBSN - ob_sn_display = sn_display_new(ob_display, NULL, NULL); -#endif + /* set up signal handler */ + ob_main_loop_signal_add(ob_main_loop, SIGUSR1, signal_handler, NULL, NULL); + ob_main_loop_signal_add(ob_main_loop, SIGUSR2, signal_handler, NULL, NULL); + ob_main_loop_signal_add(ob_main_loop, SIGTERM, signal_handler, NULL, NULL); + 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); @@ -148,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); @@ -166,6 +180,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] = @@ -206,150 +221,168 @@ 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! */ - ObParseInst *i; - - /* startup the parsing so everything can register sections of the rc */ - i = parse_startup(); - - /* anything that is going to read data from the rc file needs to be - in this group */ - timer_startup(); - event_startup(); - grab_startup(); - /* focus_backup is used for stacking, so this needs to come before - anything that calls stacking_add */ - focus_startup(); - window_startup(); - plugin_startup(); - /* load the plugins specified in the pluginrc */ - plugin_loadall(i); - - /* set up the kernel config shit */ - config_startup(i); - menu_startup(i); - /* parse/load user options */ - if (parse_load_rc(&doc, &node)) - parse_tree(i, doc, node->xmlChildrenNode); - /* we're done with parsing now, kill it */ - xmlFreeDoc(doc); - parse_shutdown(i); - - menu_parse(); - - /* 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."); - - moveresize_startup(); - screen_startup(); - group_startup(); - client_startup(); - dock_startup(); - keyboard_startup(); - mouse_startup(); - - /* call startup for all the plugins */ - plugin_startall(); - - /* get all the existing windows */ - client_manage_all(); - - state = OB_STATE_RUNNING; - while (!shutdown) - event_loop(); - state = OB_STATE_EXITING; - - dock_remove_all(); - client_unmanage_all(); - - plugin_shutdown(); /* calls all the plugins' shutdown functions */ - menu_shutdown(); - mouse_shutdown(); - keyboard_shutdown(); - dock_shutdown(); - client_shutdown(); - group_shutdown(); - screen_shutdown(); - focus_shutdown(); - moveresize_shutdown(); - window_shutdown(); - grab_shutdown(); - event_shutdown(); - timer_shutdown(); - config_shutdown(); + do { + { + ObParseInst *i; + xmlDocPtr doc; + xmlNodePtr node; + + /* startup the parsing so everything can register sections + of the rc */ + i = parse_startup(); + + config_startup(i); + /* parse/load user options */ + if (parse_load_rc(&doc, &node)) + parse_tree(i, doc, node->xmlChildrenNode); + /* we're done with parsing now, kill it */ + parse_close(doc); + parse_shutdown(i); + } + + /* load the theme specified in the rc file */ + { + 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."); + } + + if (reconfigure) { + GList *it; + + /* update all existing windows for the new theme */ + for (it = client_list; it; it = g_list_next(it)) { + ObClient *c = it->data; + frame_adjust_theme(c->frame); + } + } + event_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); + grab_startup(reconfigure); + group_startup(reconfigure); + client_startup(reconfigure); + dock_startup(reconfigure); + moveresize_startup(reconfigure); + keyboard_startup(reconfigure); + mouse_startup(reconfigure); + menu_startup(reconfigure); + + if (!reconfigure) { + /* get all the existing windows */ + client_manage_all(); + focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS); + } else { + GList *it; + + /* redecorate all existing windows */ + for (it = client_list; it; it = g_list_next(it)) { + ObClient *c = it->data; + frame_adjust_area(c->frame, TRUE, TRUE, FALSE); + } + } + + reconfigure = FALSE; + + state = OB_STATE_RUNNING; + ob_main_loop_run(ob_main_loop); + state = OB_STATE_EXITING; + + if (!reconfigure) { + dock_remove_all(); + client_unmanage_all(); + } + + menu_shutdown(reconfigure); + mouse_shutdown(reconfigure); + keyboard_shutdown(reconfigure); + moveresize_shutdown(reconfigure); + dock_shutdown(reconfigure); + client_shutdown(reconfigure); + group_shutdown(reconfigure); + grab_shutdown(reconfigure); + screen_shutdown(reconfigure); + focus_shutdown(reconfigure); + sn_shutdown(reconfigure); + window_shutdown(reconfigure); + event_shutdown(reconfigure); + config_shutdown(); + } while (reconfigure); } - dispatch_shutdown(); + XSync(ob_display, FALSE); RrThemeFree(ob_rr_theme); RrInstanceFree(ob_rr_inst); session_shutdown(); - g_free(ob_sm_id); - -#ifdef USE_LIBSN - sn_display_unref(ob_sn_display); -#endif XCloseDisplay(ob_display); + parse_paths_shutdown(); + 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]), + (char *)NULL); /* last resort */ } - return 0; + return exitcode; } -static void signal_handler(const ObEvent *e, void *data) +static void signal_handler(gint signal, gpointer data) { - int s; - - s = e->data.s.signal; - switch (s) { + switch (signal) { case SIGUSR1: - fprintf(stderr, "Caught SIGUSR1 signal. Restarting."); + ob_debug("Caught signal %d. Restarting.\n", signal); ob_restart(); - break; - - case SIGHUP: - case SIGINT: - case SIGTERM: - case SIGPIPE: - fprintf(stderr, "Caught signal %d. Exiting.", s); - ob_exit(); - break; - - case SIGFPE: - case SIGSEGV: - fprintf(stderr, "Caught signal %d. Aborting and dumping core.", s); - abort(); + 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)); } } static void print_version() { - g_print("Openbox %s\n\n", PACKAGE_VERSION); + g_print("Openbox %s\n", PACKAGE_VERSION); + 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"); @@ -357,28 +390,31 @@ static void print_version() static void print_help() { - print_version(); 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"); - g_print(" --sm-save-file FILE Specify file to load a saved session\n" - " from\n"); + g_print(" --sm-save-file FILE Specify file to load a saved session" + "from\n"); #endif g_print(" --replace Replace the currently running window " "manager\n"); g_print(" --help Display this help and exit\n"); g_print(" --version Display the version and exit\n"); - g_print(" --sync Run in synchronous mode (this is slow and\n" - " meant for debugging X routines)\n"); + g_print(" --sync Run in synchronous mode (this is slow and " + "meant for\n" + " debugging X routines)\n"); g_print(" --debug Display debugging output\n"); - g_print("\nPlease report bugs at %s\n", PACKAGE_BUGREPORT); + 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")) { @@ -395,24 +431,8 @@ 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(); - exit(1); + } else if (!strcmp(argv[i], "--reconfigure")) { + reconfigure_and_exit = TRUE; } } } @@ -433,12 +453,19 @@ void ob_restart_other(const gchar *path) void ob_restart() { restart = TRUE; - ob_exit(); + ob_exit(0); +} + +void ob_reconfigure() +{ + reconfigure = TRUE; + ob_exit(0); } -void ob_exit() +void ob_exit(gint code) { - shutdown = TRUE; + exitcode = code; + ob_main_loop_exit(ob_main_loop); } Cursor ob_cursor(ObCursor cursor)