make the ob_restart/shutdown stuff static vars and expose them only through functions...

[chaz/openbox] / openbox / openbox.h

diff --git a/openbox/openbox.h b/openbox/openbox.h
index 7723035ecd0788457439cc08d3e5c925b2f43d12..706a6f6cc1ae1b506c2b6c872f70173bed73ece8 100644 (file)
--- a/openbox/openbox.h
+++ b/openbox/openbox.h
@@ -1,6 +1,8 @@
 #ifndef __openbox_h
 #define __openbox_h
 
+#include "misc.h"
+
 #include "render/render.h"
 #include "render/theme.h"
 
@@ -27,47 +29,25 @@ extern int      ob_screen;
 /*! The root window */
 extern Window   ob_root;
 
-/*! States of execution for Openbox */
-typedef enum {
-    State_Starting,
-    State_Exiting,
-    State_Running
-} State;
-
 /* The state of execution of the window manager */
-extern State ob_state;
-
-/*! When set to true, Openbox will exit */
-extern gboolean ob_shutdown;
-/*! When set to true, Openbox will restart instead of shutting down */
-extern gboolean ob_restart;
-/*! When restarting, if this is not NULL, it will be executed instead of
-  restarting Openbox. */
-extern char *ob_restart_path;
+extern ObState ob_state;
 
 /*! Runtime option to specify running on a remote display */
 extern gboolean ob_remote;
 /*! Runtime option to run in synchronous mode */
 extern gboolean ob_sync;
 
-typedef struct Cursors {
-    Cursor ptr;
-    Cursor busy;
-    Cursor move;
-    Cursor bl;
-    Cursor br;
-    Cursor tl;
-    Cursor tr;
-    Cursor t;
-    Cursor r;
-    Cursor b;
-    Cursor l;
-} Cursors;
-extern Cursors ob_cursors;
-
 /*! The path of the rc file. If NULL the default paths are searched for one. */
 extern char *ob_rc_path;
 
+void ob_restart_other(const gchar *path);
+void ob_restart();
+void ob_exit();
+
+Cursor ob_cursor(ObCursor cursor);
+
+KeyCode ob_keycode(ObKey key);
+
 /* cuz i have nowhere better to put it right now... */
 gboolean ob_pointer_pos(int *x, int *y);