use gint

[chaz/openbox] / openbox / openbox.h

diff --git a/openbox/openbox.h b/openbox/openbox.h
index 51f620793d6ee7c3043d20a42052ce3a41b2ff3b..c6a2f2104c085cd40ab1786244af36088d6db85e 100644 (file)
--- a/openbox/openbox.h
+++ b/openbox/openbox.h
@@ -1,6 +1,11 @@
 #ifndef __openbox_h
 #define __openbox_h
 
+#include "misc.h"
+
+#include "render/render.h"
+#include "render/theme.h"
+
 #ifdef USE_LIBSN
 #  define SN_API_NOT_YET_FROZEN
 #  include <libsn/sn.h>
@@ -9,6 +14,9 @@
 #include <glib.h>
 #include <X11/Xlib.h>
 
+extern RrInstance *ob_rr_inst;
+extern RrTheme    *ob_rr_theme;
+
 /*! The X display */
 extern Display *ob_display; 
 
@@ -17,50 +25,20 @@ SnDisplay *ob_sn_display;
 #endif
 
 /*! The number of the screen on which we're running */
-extern int      ob_screen;
+extern gint     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;
+void ob_restart_other(const gchar *path);
+void ob_restart();
+void ob_exit();
 
-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;
+Cursor ob_cursor(ObCursor cursor);
 
-/*! The path of the rc file. If NULL the default paths are searched for one. */
-extern char *ob_rc_path;
+KeyCode ob_keycode(ObKey key);
 
 /* cuz i have nowhere better to put it right now... */
 gboolean ob_pointer_pos(int *x, int *y);