X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=3b2a999111c8b7371da971091a5ab425ef755554;hb=2b2beddc7447197d12fcbcae96772e1f38eef138;hp=017eb184115bdd3231634269fcdd34380811f8c5;hpb=8758271498db8de722b5a5af04427b21e834bef3;p=chaz%2Fopenbox diff --git a/openbox/openbox.c b/openbox/openbox.c index 017eb184..3b2a9991 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -1,43 +1,47 @@ #include "openbox.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 "focus.h" +#include "moveresize.h" +#include "frame.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 "../render/render.h" -#include "../render/font.h" +#include "group.h" +#include "config.h" +#include "gettext.h" +#include "render/render.h" +#include "render/font.h" +#include "render/theme.h" #ifdef HAVE_FCNTL_H # include #endif -#ifdef HAVE_SYS_SELECT_H -# include -#endif #ifdef HAVE_SIGNAL_H # include #endif #ifdef HAVE_STDLIB_H # include #endif -#ifdef HAVE_SYS_WAIT_H -# include -# include -#endif #ifdef HAVE_LOCALE_H # include #endif #ifdef HAVE_UNISTD_H # include #endif +#ifdef HAVE_SYS_STAT_H +# include +# include +#endif #include @@ -48,25 +52,29 @@ 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; + char *theme; 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(); @@ -76,7 +84,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); @@ -84,13 +92,20 @@ int main(int argc, char **argv) sigaction(SIGTERM, &action, (struct sigaction *) NULL); sigaction(SIGINT, &action, (struct sigaction *) NULL); sigaction(SIGHUP, &action, (struct sigaction *) NULL); - sigaction(SIGCHLD, &action, (struct sigaction *) NULL); - /* 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) { @@ -103,7 +118,11 @@ int main(int argc, char **argv) g_critical("Failed to set display as close-on-exec."); exit(1); } - + +#ifdef USE_LIBSN + ob_sn_display = sn_display_new(ob_display, NULL, NULL); +#endif + ob_screen = DefaultScreen(ob_display); ob_root = RootWindow(ob_display, ob_screen); @@ -124,30 +143,64 @@ 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.left_ptr = XCreateFontCursor(ob_display, XC_left_ptr); - ob_cursors.ll_angle = XCreateFontCursor(ob_display, XC_ll_angle); - ob_cursors.lr_angle = XCreateFontCursor(ob_display, XC_lr_angle); + 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); 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(); render_startup(); font_startup(); - themerc_startup(); - engine_startup(themerc_engine); + theme_startup(); event_startup(); - screen_startup(); - focus_startup(); - client_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 */ + parse_rc(); + /* we're done with parsing now, kill it */ + parse_shutdown(); + + /* load the theme specified in the rc file */ + theme = theme_load(config_theme); + g_free(theme); + if (!theme) return 1; + + window_startup(); + menu_startup(); + frame_startup(); + moveresize_startup(); + focus_startup(); + screen_startup(); + group_startup(); + client_startup(); + dock_startup(); - /* XXX load all plugins!! */ - plugin_open("focus"); - plugin_open("keyboard"); - plugin_open("mouse"); + /* call startup for all the plugins */ + plugin_startall(); /* get all the existing windows */ client_manage_all(); @@ -157,18 +210,25 @@ int main(int argc, char **argv) event_loop(); ob_state = State_Exiting; + dock_remove_all(); client_unmanage_all(); plugin_shutdown(); /* calls all the plugins' shutdown functions */ - grab_shutdown(); + dock_shutdown(); client_shutdown(); - focus_shutdown(); + group_shutdown(); screen_shutdown(); + focus_shutdown(); + moveresize_shutdown(); + frame_shutdown(); + menu_shutdown(); + window_shutdown(); + grab_shutdown(); event_shutdown(); - engine_shutdown(); - themerc_shutdown(); + theme_shutdown(); render_shutdown(); timer_shutdown(); + config_shutdown(); } dispatch_shutdown(); @@ -176,7 +236,6 @@ int main(int argc, char **argv) XCloseDisplay(ob_display); if (ob_restart) { - ob_restart_path = ""; if (ob_restart_path != NULL) { int argcp; char **argvp; @@ -194,7 +253,7 @@ int main(int argc, char **argv) /* re-run me */ execvp(argv[0], argv); /* try how we were run */ - execlp("ob3", "ob3", NULL); /* try this as a last resort */ + execlp(BINARY, BINARY, NULL); /* try this as a last resort */ } return 0; @@ -211,10 +270,6 @@ void signal_handler(const ObEvent *e, void *data) ob_shutdown = ob_restart = TRUE; break; - case SIGCHLD: - wait(NULL); - break; - case SIGHUP: case SIGINT: case SIGTERM: @@ -225,6 +280,63 @@ void signal_handler(const ObEvent *e, void *data) case SIGFPE: case SIGSEGV: - g_error("Caught signal %d. Aborting and dumping core.", s); + g_message("Caught signal %d. Aborting and dumping core.", s); + abort(); + } +} + +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); + } } } + +gboolean ob_pointer_pos(int *x, int *y) +{ + Window w; + int i; + guint u; + + return !!XQueryPointer(ob_display, ob_root, &w, &w, x, y, &i, &i, &u); +}