X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=74f8164c840a0f39ef811dcba6d2a9feee84ee8e;hb=f278ec41e4c310da218563e7d443df32783e26e4;hp=f410f31240a52d9a2498b798e5d6459663d7a0e5;hpb=c2cbef62bb5d7e0c3f8c00e95bc885dc1f9ab1da;p=chaz%2Fopenbox diff --git a/openbox/openbox.c b/openbox/openbox.c index f410f312..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 @@ -38,6 +36,10 @@ #ifdef HAVE_UNISTD_H # include #endif +#ifdef HAVE_SYS_STAT_H +# include +# include +#endif #include @@ -48,7 +50,7 @@ State ob_state; gboolean ob_shutdown = FALSE; gboolean ob_restart = FALSE; char *ob_restart_path = NULL; -gboolean ob_remote = FALSE; +gboolean ob_remote = TRUE; gboolean ob_sync = FALSE; Cursors ob_cursors; char *ob_rc_path = NULL; @@ -60,15 +62,16 @@ 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(); @@ -78,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); @@ -90,6 +93,17 @@ 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); /* parse out command line args */ parse_args(argc, argv); @@ -132,26 +146,38 @@ 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(); - /* XXX load all plugins!! */ - plugin_open("focus"); - plugin_open("keyboard"); - plugin_open("mouse"); - plugin_open("placement"); - plugin_open("resistance"); + /* 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(); + + screen_startup(); + group_startup(); + client_startup(); + + /* call startup for all the plugins */ + plugin_startall(); /* get all the existing windows */ client_manage_all(); @@ -164,13 +190,13 @@ int main(int argc, char **argv) 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(); } @@ -234,7 +260,7 @@ void signal_handler(const ObEvent *e, void *data) void print_version() { - g_print("Openbox %s\n\n", 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"); @@ -250,7 +276,7 @@ void print_help() 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); + g_print("\nPlease report bugs at %s\n", PACKAGE_BUGREPORT); } void parse_args(int argc, char **argv) @@ -271,6 +297,10 @@ void parse_args(int argc, char **argv) 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); } } }