X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=74f8164c840a0f39ef811dcba6d2a9feee84ee8e;hb=f278ec41e4c310da218563e7d443df32783e26e4;hp=9f90a9e01e729e7a2a1d2e149c75ac2819ae5946;hpb=648c55b829e09c66222a9bbf08d10434622feae2;p=chaz%2Fopenbox diff --git a/openbox/openbox.c b/openbox/openbox.c index 9f90a9e0..74f8164c 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -7,21 +7,19 @@ #include "screen.h" #include "focus.h" #include "extensions.h" -#include "gettext.h" +#include "parse.h" #include "grab.h" #include "engine.h" -#include "themerc.h" #include "plugin.h" #include "timer.h" +#include "group.h" +#include "gettext.h" #include "../render/render.h" #include "../render/font.h" #ifdef HAVE_FCNTL_H # include #endif -#ifdef HAVE_SYS_SELECT_H -# include -#endif #ifdef HAVE_SIGNAL_H # include #endif @@ -35,6 +33,13 @@ #ifdef HAVE_LOCALE_H # include #endif +#ifdef HAVE_UNISTD_H +# include +#endif +#ifdef HAVE_SYS_STAT_H +# include +# include +#endif #include @@ -45,25 +50,28 @@ State ob_state; gboolean ob_shutdown = FALSE; gboolean ob_restart = FALSE; char *ob_restart_path = NULL; -gboolean ob_remote = FALSE; -gboolean ob_sync = TRUE; +gboolean ob_remote = TRUE; +gboolean ob_sync = FALSE; Cursors ob_cursors; +char *ob_rc_path = NULL; void signal_handler(const ObEvent *e, void *data); +void parse_args(int argc, char **argv); int main(int argc, char **argv) { struct sigaction action; sigset_t sigset; + char *path; ob_state = State_Starting; /* initialize the locale */ if (!setlocale(LC_ALL, "")) g_warning("Couldn't set locale from environment.\n"); - bindtextdomain(PACKAGE, LOCALEDIR); - bind_textdomain_codeset(PACKAGE, "UTF-8"); - textdomain(PACKAGE); + bindtextdomain(PACKAGE_NAME, LOCALEDIR); + bind_textdomain_codeset(PACKAGE_NAME, "UTF-8"); + textdomain(PACKAGE_NAME); /* start our event dispatcher and register for signals */ dispatch_startup(); @@ -73,7 +81,7 @@ int main(int argc, char **argv) sigemptyset(&sigset); action.sa_handler = dispatch_signal; action.sa_mask = sigset; - action.sa_flags = SA_NOCLDSTOP | SA_NODEFER; + action.sa_flags = SA_NOCLDSTOP; sigaction(SIGUSR1, &action, (struct sigaction *) NULL); sigaction(SIGPIPE, &action, (struct sigaction *) NULL); sigaction(SIGSEGV, &action, (struct sigaction *) NULL); @@ -85,9 +93,20 @@ 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); + + /* 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); - /* 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) { @@ -127,53 +146,85 @@ int main(int argc, char **argv) prop_startup(); /* get atoms values for the display */ extensions_query_all(); /* find which extensions are present */ - + 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(); render_startup(); font_startup(); - themerc_startup(); - engine_startup(themerc_engine); event_startup(); - screen_startup(); - focus_startup(); - client_startup(); grab_startup(); + engine_startup(); + focus_startup(); plugin_startup(); + /* load the plugins specified in the pluginrc */ + plugin_loadall(); + + /* parse/load user options */ + parse_rc(); + /* we're done with parsing now, kill it */ + parse_shutdown(); + + /* load the engine specified in the rc */ + engine_load(); - /* XXX load all plugins!! */ - plugin_open("focus"); - plugin_open("keyboard"); - plugin_open("mouse"); + screen_startup(); + group_startup(); + client_startup(); + + /* call startup for all the plugins */ + plugin_startall(); /* 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(); plugin_shutdown(); /* calls all the plugins' shutdown functions */ - grab_shutdown(); client_shutdown(); - focus_shutdown(); + group_shutdown(); screen_shutdown(); - event_shutdown(); + focus_shutdown(); engine_shutdown(); - themerc_shutdown(); + grab_shutdown(); + event_shutdown(); render_shutdown(); timer_shutdown(); } + dispatch_shutdown(); + XCloseDisplay(ob_display); - dispatch_shutdown(); + if (ob_restart) { + 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); + } + } - /* XXX if (ob_restart) */ + /* re-run me */ + execvp(argv[0], argv); /* try how we were run */ + execlp(BINARY, BINARY, NULL); /* try this as a last resort */ + } return 0; } @@ -206,3 +257,50 @@ void signal_handler(const ObEvent *e, void *data) g_error("Caught signal %d. Aborting and dumping core.", s); } } + +void print_version() +{ + g_print("Openbox %s\n\n", PACKAGE_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", PACKAGE_BUGREPORT); +} + +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]; + } else { + g_printerr("Invalid option: '%s'\n\n", argv[i]); + print_help(); + exit(1); + } + } +}