X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=3b2a999111c8b7371da971091a5ab425ef755554;hb=2b2beddc7447197d12fcbcae96772e1f38eef138;hp=8c599c4a36732c42b167b76b5f4fcaf0d52cccea;hpb=bccb90b01da9d3f3b483e690444ebfbca914aa02;p=chaz%2Fopenbox

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 8c599c4a..3b2a9991 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -1,4 +1,5 @@
 #include "openbox.h"
+#include "dock.h"
 #include "event.h"
 #include "menu.h"
 #include "client.h"
@@ -117,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);
 
@@ -139,6 +144,7 @@ int main(int argc, char **argv)
     putenv(g_strdup_printf("DISPLAY=%s", DisplayString(ob_display)));
 
     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);
@@ -183,14 +189,15 @@ int main(int argc, char **argv)
         g_free(theme);
         if (!theme) return 1;
 
+        window_startup();
         menu_startup();
         frame_startup();
-        stacking_startup();
         moveresize_startup();
 	focus_startup();
 	screen_startup();
         group_startup();
 	client_startup();
+        dock_startup();
 
         /* call startup for all the plugins */
         plugin_startall();
@@ -203,17 +210,19 @@ 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 */
+        dock_shutdown();
 	client_shutdown();
         group_shutdown();
 	screen_shutdown();
 	focus_shutdown();
         moveresize_shutdown();
-        stacking_shutdown();
         frame_shutdown();
         menu_shutdown();
+        window_shutdown();
         grab_shutdown();
 	event_shutdown();
         theme_shutdown();