X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=a8102c3ad582dc88c837bc7a64c5c0cb42ba1bd6;hb=c1b2fc5324522f74a14a5cfa210c95e1509a6e7f;hp=a5fb7b5f3ba8e72dc14f58c01ae9117b49e14b9e;hpb=b3e9fea103cc6220fa66312fa9f53f8d3b6427ca;p=chaz%2Fopenbox diff --git a/openbox/openbox.c b/openbox/openbox.c index a5fb7b5f..a8102c3a 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -1,22 +1,25 @@ +#include "debug.h" #include "openbox.h" +#include "session.h" #include "dock.h" #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" @@ -34,55 +37,41 @@ #ifdef HAVE_LOCALE_H # include #endif -#ifdef HAVE_UNISTD_H -# include -#endif #ifdef HAVE_SYS_STAT_H # include # include #endif +#ifdef HAVE_UNISTD_H +# include +#endif -#include #include -#define SM_ERR_LEN 1024 - -SmcConn ob_sm_conn; -RrInstance *ob_rr_inst = NULL; -RrTheme *ob_rr_theme = NULL; -Display *ob_display = NULL; -int ob_screen; -Window ob_root; -State ob_state; -gboolean ob_shutdown = FALSE; -gboolean ob_restart = FALSE; -char *ob_restart_path = NULL; -gboolean ob_remote = TRUE; -gboolean ob_sync = FALSE; -Cursors ob_cursors; -char *ob_rc_path = NULL; - -static void signal_handler(const ObEvent *e, void *data); +RrInstance *ob_rr_inst; +RrTheme *ob_rr_theme; +ObMainLoop *ob_main_loop; +Display *ob_display; +gint ob_screen; +gboolean ob_replace_wm; + +static ObState state; +static gboolean xsync; +static gboolean reconfigure; +static gboolean restart; +static char *restart_path; +static Cursor cursors[OB_NUM_CURSORS]; +static KeyCode keys[OB_NUM_KEYS]; + +static void signal_handler(int signal, gpointer data); static void parse_args(int argc, char **argv); -static void sm_save_yourself(SmcConn conn, SmPointer data, int save_type, - Bool shutdown, int interact_style, Bool fast); -static void sm_die(SmcConn conn, SmPointer data); -static void sm_save_complete(SmcConn conn, SmPointer data); -static void sm_shutdown_cancelled(SmcConn conn, SmPointer data); -static void exit_with_error(gchar *msg); int main(int argc, char **argv) { - struct sigaction action; - sigset_t sigset; - char *path; - xmlDocPtr doc; - xmlNodePtr node; - SmcCallbacks cb; - char sm_err[SM_ERR_LEN]; - char *sm_id; +#ifdef DEBUG + ob_debug_show_output(TRUE); +#endif - ob_state = State_Starting; + state = OB_STATE_STARTING; /* initialize the locale */ if (!setlocale(LC_ALL, "")) @@ -91,81 +80,40 @@ int main(int argc, char **argv) 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; - 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); + g_set_prgname(argv[0]); + parse_paths_startup(); + + session_startup(&argc, &argv); + /* parse out command line args */ parse_args(argc, argv); ob_display = XOpenDisplay(NULL); if (ob_display == NULL) - 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) - exit_with_error("Failed to set display as close-on-exec."); - - cb.save_yourself.callback = sm_save_yourself; - cb.save_yourself.client_data = NULL; - - cb.die.callback = sm_die; - cb.die.client_data = NULL; - - cb.save_complete.callback = sm_save_complete; - cb.save_complete.client_data = NULL; - - cb.shutdown_cancelled.callback = sm_shutdown_cancelled; - cb.shutdown_cancelled.client_data = NULL; - - ob_sm_conn = SmcOpenConnection(NULL, NULL, 1, 0, - SmcSaveYourselfProcMask | - SmcDieProcMask | - SmcSaveCompleteProcMask | - SmcShutdownCancelledProcMask, - &cb, NULL, &sm_id, SM_ERR_LEN, sm_err); - if (ob_sm_conn == NULL) - g_warning("Failed to connect to session manager: %s", sm_err); - else - g_message("Connected to session manager with id %s", sm_id); - g_free (sm_id); - -#ifdef USE_LIBSN - ob_sn_display = sn_display_new(ob_display, NULL, NULL); -#endif + ob_exit_with_error("Failed to set display as close-on-exec."); + + ob_main_loop = ob_main_loop_new(ob_display); + + /* 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_screen = DefaultScreen(ob_display); - ob_root = RootWindow(ob_display, ob_screen); ob_rr_inst = RrInstanceNew(ob_display, ob_screen); if (ob_rr_inst == NULL) - exit_with_error("Failed to initialize the render library."); + ob_exit_with_error("Failed to initialize the render library."); /* XXX fork self onto other screens */ - XSynchronize(ob_display, ob_sync); + XSynchronize(ob_display, xsync); /* check for locale support */ if (!XSupportsLocale()) @@ -180,146 +128,189 @@ int main(int argc, char **argv) display we're using, so they open in the right place. */ putenv(g_strdup_printf("DISPLAY=%s", DisplayString(ob_display))); - ob_cursors.ptr = XCreateFontCursor(ob_display, XC_left_ptr); - ob_cursors.busy = XCreateFontCursor(ob_display, XC_watch); - ob_cursors.move = XCreateFontCursor(ob_display, XC_fleur); - ob_cursors.tl = XCreateFontCursor(ob_display, XC_top_left_corner); - ob_cursors.tr = XCreateFontCursor(ob_display, XC_top_right_corner); - ob_cursors.bl = XCreateFontCursor(ob_display, XC_bottom_left_corner); - ob_cursors.br = XCreateFontCursor(ob_display, XC_bottom_right_corner); - ob_cursors.t = XCreateFontCursor(ob_display, XC_top_side); - ob_cursors.r = XCreateFontCursor(ob_display, XC_right_side); - ob_cursors.b = XCreateFontCursor(ob_display, XC_bottom_side); - ob_cursors.l = XCreateFontCursor(ob_display, XC_left_side); + /* create available cursors */ + cursors[OB_CURSOR_NONE] = None; + cursors[OB_CURSOR_POINTER] = + XCreateFontCursor(ob_display, XC_left_ptr); + cursors[OB_CURSOR_BUSY] = + XCreateFontCursor(ob_display, XC_watch); + cursors[OB_CURSOR_MOVE] = + XCreateFontCursor(ob_display, XC_fleur); + cursors[OB_CURSOR_NORTH] = + XCreateFontCursor(ob_display, XC_top_side); + cursors[OB_CURSOR_NORTHEAST] = + XCreateFontCursor(ob_display, XC_top_right_corner); + cursors[OB_CURSOR_EAST] = + XCreateFontCursor(ob_display, XC_right_side); + cursors[OB_CURSOR_SOUTHEAST] = + XCreateFontCursor(ob_display, XC_bottom_right_corner); + cursors[OB_CURSOR_SOUTH] = + XCreateFontCursor(ob_display, XC_bottom_side); + cursors[OB_CURSOR_SOUTHWEST] = + XCreateFontCursor(ob_display, XC_bottom_left_corner); + cursors[OB_CURSOR_WEST] = + XCreateFontCursor(ob_display, XC_left_side); + cursors[OB_CURSOR_NORTHWEST] = + XCreateFontCursor(ob_display, XC_top_left_corner); + + /* create available keycodes */ + keys[OB_KEY_RETURN] = + XKeysymToKeycode(ob_display, XStringToKeysym("Return")); + keys[OB_KEY_ESCAPE] = + XKeysymToKeycode(ob_display, XStringToKeysym("Escape")); + keys[OB_KEY_LEFT] = + XKeysymToKeycode(ob_display, XStringToKeysym("Left")); + keys[OB_KEY_RIGHT] = + XKeysymToKeycode(ob_display, XStringToKeysym("Right")); + keys[OB_KEY_UP] = + XKeysymToKeycode(ob_display, XStringToKeysym("Up")); + keys[OB_KEY_DOWN] = + XKeysymToKeycode(ob_display, XStringToKeysym("Down")); 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! */ - /* startup the parsing so everything can register sections of the rc */ - 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(); - plugin_startup(); - /* load the plugins specified in the pluginrc */ - plugin_loadall(); - - /* set up the kernel config shit */ - config_startup(); - /* parse/load user options */ - if (parse_load_rc(&doc, &node)) - parse_tree(doc, node->xmlChildrenNode, NULL); - /* we're done with parsing now, kill it */ - parse_shutdown(); - - /* load the theme specified in the rc file */ - ob_rr_theme = RrThemeNew(ob_rr_inst, config_theme); - if (ob_rr_theme == NULL) - exit_with_error("Unable to load a theme."); - - window_startup(); - menu_startup(); - frame_startup(); - moveresize_startup(); - focus_startup(); - screen_startup(); - group_startup(); - client_startup(); - dock_startup(); - - /* call startup for all the plugins */ - plugin_startall(); - - /* get all the existing windows */ - client_manage_all(); - - ob_state = State_Running; - while (!ob_shutdown) - event_loop(); - ob_state = State_Exiting; - - dock_remove_all(); - client_unmanage_all(); - - plugin_shutdown(); /* calls all the plugins' shutdown functions */ - dock_shutdown(); - client_shutdown(); - group_shutdown(); - screen_shutdown(); - focus_shutdown(); - moveresize_shutdown(); - frame_shutdown(); - menu_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 */ + xmlFreeDoc(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); + grab_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); + 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(); + } 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; - dispatch_shutdown(); + 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); + screen_shutdown(reconfigure); + focus_shutdown(reconfigure); + sn_shutdown(reconfigure); + window_shutdown(reconfigure); + grab_shutdown(reconfigure); + event_shutdown(reconfigure); + config_shutdown(); + } while (reconfigure); + } RrThemeFree(ob_rr_theme); RrInstanceFree(ob_rr_inst); - if (ob_sm_conn) - SmcCloseConnection(ob_sm_conn, 0, NULL); + session_shutdown(); + XCloseDisplay(ob_display); - if (ob_restart) { - if (ob_restart_path != NULL) { + parse_paths_shutdown(); + + 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); } } /* re-run me */ execvp(argv[0], argv); /* try how we were run */ - execlp(BINARY, BINARY, NULL); /* try this as a last resort */ + execlp(argv[0], g_path_get_basename(argv[0])); /* last resort */ } return 0; } -static void signal_handler(const ObEvent *e, void *data) +static void signal_handler(int signal, gpointer data) { - int s; - - s = e->data.s.signal; - switch (s) { - case SIGUSR1: - g_message("Caught SIGUSR1 signal. Restarting."); - ob_shutdown = ob_restart = TRUE; - break; - - case SIGHUP: - case SIGINT: - case SIGTERM: - case SIGPIPE: - g_message("Caught signal %d. Exiting.", s); - ob_shutdown = TRUE; - break; - - case SIGFPE: - case SIGSEGV: - g_message("Caught signal %d. Aborting and dumping core.", s); - abort(); + if (signal == SIGUSR1) { + fprintf(stderr, "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); + ob_exit(); } } @@ -334,13 +325,21 @@ static void print_version() static void print_help() { print_version(); - g_print("Syntax: %s [options]\n\n", BINARY); + 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"); - 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 meant\n" - " for debugging X routines)\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"); +#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(" --debug Display debugging output\n"); g_print("\nPlease report bugs at %s\n", PACKAGE_BUGREPORT); } @@ -349,19 +348,20 @@ static void parse_args(int argc, char **argv) int i; for (i = 1; i < argc; ++i) { - if (!strcmp(argv[i], "-version")) { + if (!strcmp(argv[i], "--version")) { print_version(); exit(0); - } else if (!strcmp(argv[i], "-help")) { + } else if (!strcmp(argv[i], "--help")) { print_help(); exit(0); - } 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]; + } else if (!strcmp(argv[i], "--g-fatal-warnings")) { + g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL); + } else if (!strcmp(argv[i], "--replace")) { + ob_replace_wm = TRUE; + } else if (!strcmp(argv[i], "--sync")) { + 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(); @@ -370,42 +370,49 @@ static void parse_args(int argc, char **argv) } } -gboolean ob_pointer_pos(int *x, int *y) +void ob_exit_with_error(gchar *msg) { - Window w; - int i; - guint u; + g_critical(msg); + session_shutdown(); + exit(EXIT_FAILURE); +} - return !!XQueryPointer(ob_display, ob_root, &w, &w, x, y, &i, &i, &u); +void ob_restart_other(const gchar *path) +{ + restart_path = g_strdup(path); + ob_restart(); } -static void sm_save_yourself(SmcConn conn, SmPointer data, int save_type, - Bool shutdown, int interact_style, Bool fast) +void ob_restart() { - g_message("got SAVE YOURSELF from session manager"); - SmcSaveYourselfDone(conn, TRUE); + restart = TRUE; + ob_exit(); } -static void sm_die(SmcConn conn, SmPointer data) +void ob_reconfigure() { - ob_shutdown = TRUE; - g_message("got DIE from session manager"); + reconfigure = TRUE; + ob_exit(); } -static void sm_save_complete(SmcConn conn, SmPointer data) +void ob_exit() { - g_message("got SAVE COMPLETE from session manager"); + ob_main_loop_exit(ob_main_loop); } -static void sm_shutdown_cancelled(SmcConn conn, SmPointer data) +Cursor ob_cursor(ObCursor cursor) { - g_message("got SHUTDOWN CANCELLED from session manager"); + g_assert(cursor < OB_NUM_CURSORS); + return cursors[cursor]; } -static void exit_with_error(gchar *msg) +KeyCode ob_keycode(ObKey key) { - g_critical(msg); - if (ob_sm_conn) - SmcCloseConnection(ob_sm_conn, 1, &msg); - exit(EXIT_FAILURE); + g_assert(key < OB_NUM_KEYS); + return keys[key]; +} + +ObState ob_state() +{ + return state; }