X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.h;h=c6a2f2104c085cd40ab1786244af36088d6db85e;hb=ec908528cf2abad9d2b968db9c8f7287ef5f54fe;hp=932c3e3eee0ecb2c2cae52ca085a416c9f005526;hpb=25ffe6b566379f25dd3cf7e74aeefd084b7e1b19;p=chaz%2Fopenbox

diff --git a/openbox/openbox.h b/openbox/openbox.h
index 932c3e3e..c6a2f210 100644
--- a/openbox/openbox.h
+++ b/openbox/openbox.h
@@ -1,51 +1,44 @@
 #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;
+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;
-
-/*! 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 move;
-    Cursor bl;
-    Cursor br;
-    Cursor tl;
-    Cursor tr;
-} 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;
+extern ObState ob_state;
+
+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);