X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=3b2a999111c8b7371da971091a5ab425ef755554;hb=2b2beddc7447197d12fcbcae96772e1f38eef138;hp=cd95a5d6d206ccdc0c126091b3678a3d178ee1ef;hpb=d447dc0f59619d26073699d9f81d7de77c200be4;p=chaz%2Fopenbox diff --git a/openbox/openbox.c b/openbox/openbox.c index cd95a5d6..3b2a9991 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -1,21 +1,27 @@ #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 "config.h" #include "parse.h" #include "grab.h" -#include "engine.h" #include "plugin.h" #include "timer.h" +#include "group.h" +#include "config.h" #include "gettext.h" -#include "../render/render.h" -#include "../render/font.h" +#include "render/render.h" +#include "render/font.h" +#include "render/theme.h" #ifdef HAVE_FCNTL_H # include @@ -26,10 +32,6 @@ #ifdef HAVE_STDLIB_H # include #endif -#ifdef HAVE_SYS_WAIT_H -# include -# include -#endif #ifdef HAVE_LOCALE_H # include #endif @@ -63,6 +65,7 @@ int main(int argc, char **argv) struct sigaction action; sigset_t sigset; char *path; + char *theme; ob_state = State_Starting; @@ -89,10 +92,6 @@ 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); @@ -119,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); @@ -140,37 +143,61 @@ 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(); - config_startup(); render_startup(); font_startup(); + theme_startup(); + event_startup(); + grab_startup(); plugin_startup(); - - /* startup the parsing so plugins can register sections of the rc */ - parse_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(); - engine_startup(); - event_startup(); - screen_startup(); + /* 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(); - grab_startup(); + dock_startup(); /* call startup for all the plugins */ plugin_startall(); @@ -183,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(); + theme_shutdown(); render_shutdown(); - config_shutdown(); timer_shutdown(); + config_shutdown(); } dispatch_shutdown(); @@ -236,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: @@ -250,7 +280,8 @@ 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(); } } @@ -300,3 +331,12 @@ void parse_args(int argc, char **argv) } } } + +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); +}