X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=521469606bdeb89063bc5fe8dc4f154da4b3e770;hb=854da68d0f5bed8c85c101fd6895244d60183ff5;hp=b5fde8582e4dbd4545fd9398d101bd67ba7da3dd;hpb=e5afb0db59cdeaa35ae2f67cf40589bc6d197022;p=chaz%2Fopenbox diff --git a/openbox/openbox.c b/openbox/openbox.c index b5fde858..52146960 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -5,7 +5,6 @@ #include "event.h" #include "menu.h" #include "client.h" -#include "dispatch.h" #include "xerror.h" #include "prop.h" #include "startup.h" @@ -13,12 +12,13 @@ #include "focus.h" #include "moveresize.h" #include "frame.h" +#include "keyboard.h" +#include "mouse.h" #include "extensions.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" @@ -49,6 +49,7 @@ RrInstance *ob_rr_inst; RrTheme *ob_rr_theme; +ObMainLoop *ob_main_loop; Display *ob_display; gint ob_screen; gboolean ob_sm_use = TRUE; @@ -57,22 +58,17 @@ gboolean ob_replace_wm; static ObState state; static gboolean xsync; -static gboolean shutdown; static gboolean restart; static char *restart_path; static Cursor cursors[OB_NUM_CURSORS]; static KeyCode keys[OB_NUM_KEYS]; static gchar *sm_save_file; -static void signal_handler(const ObEvent *e, void *data); +static void signal_handler(int signal, gpointer data); static void parse_args(int argc, char **argv); -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; @@ -90,23 +86,6 @@ 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 | 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 | @@ -130,9 +109,18 @@ int main(int argc, char **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."); + 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, 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); if (sm_save_file) session_load(sm_save_file); @@ -146,7 +134,7 @@ int main(int argc, char **argv) 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 */ @@ -210,79 +198,76 @@ int main(int argc, char **argv) startup_save(); if (screen_annex()) { /* it will be ours! */ + ObParseInst *i; + /* startup the parsing so everything can register sections of the rc */ - parse_startup(); + 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(); /* set up the kernel config shit */ - config_startup(); - menu_startup(); + config_startup(i); /* parse/load user options */ if (parse_load_rc(&doc, &node)) - parse_tree(doc, node->xmlChildrenNode, NULL); + parse_tree(i, doc, node->xmlChildrenNode); /* we're done with parsing now, kill it */ - parse_shutdown(); + xmlFreeDoc(doc); + parse_shutdown(i); /* 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."); + ob_exit_with_error("Unable to load a theme."); moveresize_startup(); screen_startup(); group_startup(); client_startup(); dock_startup(); - - /* call startup for all the plugins */ - plugin_startall(); + keyboard_startup(); + mouse_startup(); + menu_startup(); /* get all the existing windows */ client_manage_all(); state = OB_STATE_RUNNING; - while (!shutdown) - event_loop(); + ob_main_loop_run(ob_main_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(); - menu_shutdown(); window_shutdown(); grab_shutdown(); event_shutdown(); - timer_shutdown(); config_shutdown(); } - dispatch_shutdown(); - 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); if (restart) { @@ -308,29 +293,14 @@ int main(int argc, char **argv) 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: - fprintf(stderr, "Caught SIGUSR1 signal. Restarting."); + if (signal == SIGUSR1) { + fprintf(stderr, "Caught signal %d. Restarting.\n", signal); ob_restart(); - break; - - case SIGHUP: - case SIGINT: - case SIGTERM: - case SIGPIPE: - fprintf(stderr, "Caught signal %d. Exiting.", s); + } else { + fprintf(stderr, "Caught signal %d. Exiting.\n", signal); ob_exit(); - break; - - case SIGFPE: - case SIGSEGV: - fprintf(stderr, "Caught signal %d. Aborting and dumping core.", s); - abort(); } } @@ -404,7 +374,7 @@ static void parse_args(int argc, char **argv) } } -static void exit_with_error(gchar *msg) +void ob_exit_with_error(gchar *msg) { g_critical(msg); session_shutdown(); @@ -425,7 +395,7 @@ void ob_restart() void ob_exit() { - shutdown = TRUE; + ob_main_loop_exit(ob_main_loop); } Cursor ob_cursor(ObCursor cursor)