X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=234764178ea6df7bdd948c88feff242e42397a9a;hb=221415e97c2279e0245d643f120b6558af72879e;hp=65669652f8dc4d3339438d616265c558f4f59b90;hpb=35418ca0fcd3fd28ef579f4435b8bad3b7c87f04;p=chaz%2Fopenbox

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 65669652..23476417 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -59,11 +59,11 @@ RrInstance *ob_rr_inst;
 RrTheme    *ob_rr_theme;
 Display    *ob_display;
 gint        ob_screen;
-ObState     ob_state;
 Cursor      ob_cursors[OB_NUM_CURSORS];
 KeyCode     ob_keys[OB_NUM_KEYS];
 
-static gboolean  sync;
+static ObState   state;
+static gboolean  xsync;
 static gboolean  shutdown;
 static gboolean  restart;
 static char     *restart_path;
@@ -91,7 +91,7 @@ int main(int argc, char **argv)
     xmlDocPtr doc;
     xmlNodePtr node;
 
-    ob_state = OB_STATE_STARTING;
+    state = OB_STATE_STARTING;
 
     /* initialize the locale */
     if (!setlocale(LC_ALL, ""))
@@ -153,7 +153,7 @@ int main(int argc, char **argv)
 
     /* XXX fork self onto other screens */
      
-    XSynchronize(ob_display, sync);
+    XSynchronize(ob_display, xsync);
 
     /* check for locale support */
     if (!XSupportsLocale())
@@ -243,7 +243,6 @@ int main(int argc, char **argv)
         if (ob_rr_theme == NULL)
             exit_with_error("Unable to load a theme.");
 
-        frame_startup();
         moveresize_startup();
 	screen_startup();
         group_startup();
@@ -256,10 +255,10 @@ int main(int argc, char **argv)
 	/* get all the existing windows */
 	client_manage_all();
 
-	ob_state = OB_STATE_RUNNING;
+	state = OB_STATE_RUNNING;
 	while (!shutdown)
 	    event_loop();
-	ob_state = OB_STATE_EXITING;
+	state = OB_STATE_EXITING;
 
         dock_remove_all();
 	client_unmanage_all();
@@ -271,7 +270,6 @@ int main(int argc, char **argv)
 	screen_shutdown();
 	focus_shutdown();
         moveresize_shutdown();
-        frame_shutdown();
         menu_shutdown();
         window_shutdown();
         grab_shutdown();
@@ -523,8 +521,10 @@ static void parse_args(int argc, char **argv)
         } else if (!strcmp(argv[i], "--help")) {
             print_help();
             exit(0);
+        } else if (!strcmp(argv[i], "--g-fatal-warnings")) {
+            g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL);
         } else if (!strcmp(argv[i], "--sync")) {
-            sync = TRUE;
+            xsync = TRUE;
 #ifdef USE_SM
         } else if (!strcmp(argv[i], "--sm-client-id")) {
             if (i == argc - 1) /* no args left */
@@ -542,16 +542,6 @@ static 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, RootWindow(ob_display, ob_screen),
-                           &w, &w, x, y, &i, &i, &u);
-}
-
 #ifdef USE_SM
 static void sm_save_yourself(SmcConn conn, SmPointer data, int save_type,
                              Bool shutdown, int interact_style, Bool fast)
@@ -612,3 +602,8 @@ KeyCode ob_keycode(ObKey key)
     g_assert(key < OB_NUM_KEYS);
     return ob_keys[key];
 }
+
+ObState ob_state()
+{
+    return state;
+}