add misc.h with some standard enumerations with proper prefixing and capitalizations.

[chaz/openbox] / openbox / openbox.h

diff --git a/openbox/openbox.h b/openbox/openbox.h
index 21f0e9a826de28b192139bf98c88a9f753ad9750..69004990de6c5385ee97e44942a674b79834922a 100644 (file)
--- a/openbox/openbox.h
+++ b/openbox/openbox.h
@@ -1,25 +1,36 @@
 #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>
+#endif
+
 #include <glib.h>
 #include <X11/Xlib.h>
 
+extern RrInstance *ob_rr_inst;
+extern RrTheme    *ob_rr_theme;
+
 /*! The X display */
 extern Display *ob_display; 
+
+#ifdef USE_LIBSN
+SnDisplay *ob_sn_display;
+#endif
+
 /*! The number of the screen on which we're running */
 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;
+extern ObState ob_state;
 
 /*! When set to true, Openbox will exit */
 extern gboolean ob_shutdown;
@@ -34,14 +45,14 @@ extern gboolean ob_remote;
 /*! Runtime option to run in synchronous mode */
 extern gboolean ob_sync;
 
-typedef struct Cursors {
-    Cursor left_ptr;
-    Cursor ll_angle;
-    Cursor lr_angle;
-} 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;
 
+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);
+
 #endif