X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=268d4e6d8242431758a0e6aee59348a5cb4972fe;hb=35c095014e7025debe7dca24c7d34e49ddb8ecb6;hp=7a0cfbb9e39a5db6c448210f41536c29d2347c65;hpb=9ecdf13b8d05ea1174a7b742475bc3e010ae154f;p=chaz%2Fopenbox diff --git a/openbox/openbox.c b/openbox/openbox.c index 7a0cfbb9..268d4e6d 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -1,22 +1,20 @@ #include "openbox.h" #include "event.h" #include "client.h" +#include "dispatch.h" #include "xerror.h" #include "prop.h" #include "screen.h" #include "focus.h" #include "extensions.h" #include "gettext.h" -#include "keyboard.h" -#include "pointer.h" +#include "grab.h" #include "engine.h" -#include "python.h" -#include "hooks.h" -#include "clientwrap.h" -#include "openboxwrap.h" #include "themerc.h" +#include "plugin.h" #include "timer.h" #include "../render/render.h" +#include "../render/font.h" #ifdef HAVE_FCNTL_H # include @@ -37,6 +35,9 @@ #ifdef HAVE_LOCALE_H # include #endif +#ifdef HAVE_UNISTD_H +# include +#endif #include @@ -48,10 +49,12 @@ gboolean ob_shutdown = FALSE; gboolean ob_restart = FALSE; char *ob_restart_path = NULL; gboolean ob_remote = FALSE; -gboolean ob_sync = TRUE; +gboolean ob_sync = FALSE; Cursors ob_cursors; +char *ob_rc_path = NULL; -void signal_handler(int signal); +void signal_handler(const ObEvent *e, void *data); +void parse_args(int argc, char **argv); int main(int argc, char **argv) { @@ -67,9 +70,13 @@ int main(int argc, char **argv) bind_textdomain_codeset(PACKAGE, "UTF-8"); textdomain(PACKAGE); + /* 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 = signal_handler; + action.sa_handler = dispatch_signal; action.sa_mask = sigset; action.sa_flags = SA_NOCLDSTOP | SA_NODEFER; sigaction(SIGUSR1, &action, (struct sigaction *) NULL); @@ -84,8 +91,8 @@ int main(int argc, char **argv) /* anything that died while we were restarting won't give us a SIGCHLD */ while (waitpid(-1, NULL, WNOHANG) > 0); - /* XXX parse out command line args */ - (void)argc;(void)argv; + /* parse out command line args */ + parse_args(argc, argv); ob_display = XOpenDisplay(NULL); if (ob_display == NULL) { @@ -132,61 +139,75 @@ int main(int argc, char **argv) font_startup(); themerc_startup(); engine_startup(themerc_engine); - python_startup(); - openboxwrap_startup(); - clientwrap_startup(); - hooks_startup(); event_startup(); screen_startup(); focus_startup(); client_startup(); - keyboard_startup(); - pointer_startup(); - - /* load the user's settings */ - if (!python_import("rc")) - g_warning("ERROR LOADING RC FILE"); + grab_startup(); + plugin_startup(); - HOOKFIRE(startup, "()"); + /* XXX load all plugins!! */ + plugin_open("focus"); + plugin_open("keyboard"); + plugin_open("mouse"); /* get all the existing windows */ client_manage_all(); ob_state = State_Running; - while (!ob_shutdown) { + while (!ob_shutdown) event_loop(); - } ob_state = State_Exiting; client_unmanage_all(); - HOOKFIRE(shutdown, "()"); - - pointer_shutdown(); - keyboard_shutdown(); + plugin_shutdown(); /* calls all the plugins' shutdown functions */ + grab_shutdown(); client_shutdown(); + focus_shutdown(); screen_shutdown(); event_shutdown(); - hooks_shutdown(); - clientwrap_shutdown(); - openboxwrap_shutdown(); - python_shutdown(); engine_shutdown(); themerc_shutdown(); render_shutdown(); timer_shutdown(); } - + + dispatch_shutdown(); + XCloseDisplay(ob_display); - /* XXX if (ob_restart) */ + if (ob_restart) { + ob_restart_path = ""; + if (ob_restart_path != NULL) { + int argcp; + char **argvp; + GError *err = NULL; + + /* run other shit */ + if (g_shell_parse_argv(ob_restart_path, &argcp, &argvp, &err)) { + execvp(argvp[0], argvp); + g_strfreev(argvp); + } else { + g_warning("failed to execute '%s': %s", ob_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 */ + } return 0; } -void signal_handler(int signal) +void signal_handler(const ObEvent *e, void *data) { - switch (signal) { + int s; + + s = e->data.s.signal; + switch (s) { case SIGUSR1: g_message("Caught SIGUSR1 signal. Restarting."); ob_shutdown = ob_restart = TRUE; @@ -200,12 +221,55 @@ void signal_handler(int signal) case SIGINT: case SIGTERM: case SIGPIPE: - g_message("Caught signal %d. Exiting.", signal); + g_message("Caught signal %d. Exiting.", s); ob_shutdown = TRUE; break; case SIGFPE: case SIGSEGV: - g_error("Caught signal %d. Aborting and dumping core.", signal); + g_error("Caught signal %d. Aborting and dumping core.", s); + } +} + +void print_version() +{ + g_print("Openbox %s\n\n", VERSION); + 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"); +} + +void print_help() +{ + print_version(); + g_print("Syntax: %s [options]\n\n", BINARY); + 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"); + g_print("\nPlease report bugs at %s\n", BUGURL); +} + +void parse_args(int argc, char **argv) +{ + int i; + + for (i = 1; i < argc; ++i) { + if (!strcmp(argv[i], "-version")) { + print_version(); + exit(0); + } 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]; + } } }