X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=ea9b895f6d2d637f85d7ab93e82563690509b349;hb=d3c094357d06f4e65681e7ca7e227a33ebd122a4;hp=afe43f2745b73ca2d0ff7b58ae8465b122317f51;hpb=5cf61ee02354c1c9f80c11f3796afc4b948055d6;p=chaz%2Fopenbox

diff --git a/openbox/openbox.c b/openbox/openbox.c
index afe43f27..ea9b895f 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -1,11 +1,14 @@
 #include "openbox.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 "parse.h"
@@ -28,10 +31,6 @@
 #ifdef HAVE_STDLIB_H
 #  include <stdlib.h>
 #endif
-#ifdef HAVE_SYS_WAIT_H
-#  include <sys/types.h>
-#  include <sys/wait.h>
-#endif
 #ifdef HAVE_LOCALE_H
 #  include <locale.h>
 #endif
@@ -92,10 +91,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);
@@ -143,13 +138,23 @@ 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.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();
@@ -161,6 +166,7 @@ int main(int argc, char **argv)
 	font_startup();
         theme_startup();
 	event_startup();
+        moveresize_startup();
         grab_startup();
         plugin_startup();
         /* load the plugins specified in the pluginrc */
@@ -174,11 +180,13 @@ int main(int argc, char **argv)
         parse_shutdown();
 
         /* load the theme specified in the rc file */
-        theme = theme_load("ebox"); /* woot i like this theme :) */
+        theme = theme_load(config_theme);
         g_free(theme);
         if (!theme) return 1;
 
+        menu_startup();
         frame_startup();
+        stacking_startup();
 	focus_startup();
 	screen_startup();
         group_startup();
@@ -202,7 +210,9 @@ int main(int argc, char **argv)
         group_shutdown();
 	screen_shutdown();
 	focus_shutdown();
+        stacking_shutdown();
         frame_shutdown();
+        menu_shutdown();
         grab_shutdown();
 	event_shutdown();
         theme_shutdown();
@@ -250,10 +260,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:
@@ -314,3 +320,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);
+}