X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.h;h=2f325dff919a76e001039bc49414ce95b1e6cec8;hb=de4f92ccc66c1dad1a2820a07d1f0161bd61a855;hp=eec3fd7c37d312ee9bd079908e64745c906d4078;hpb=a4a0cb78294bb1809b836ea1e86e9d7294bb2929;p=chaz%2Fopenbox

diff --git a/openbox/openbox.h b/openbox/openbox.h
index eec3fd7c..2f325dff 100644
--- a/openbox/openbox.h
+++ b/openbox/openbox.h
@@ -1,7 +1,10 @@
 #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
@@ -11,7 +14,12 @@
 #include <glib.h>
 #include <X11/Xlib.h>
 
+struct _ObMainLoop;
+
 extern RrInstance *ob_rr_inst;
+extern RrTheme    *ob_rr_theme;
+
+extern struct _ObMainLoop *ob_main_loop;
 
 /*! The X display */
 extern Display *ob_display; 
@@ -21,52 +29,23 @@ 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;
+extern gint     ob_screen;
 
-/*! States of execution for Openbox */
-typedef enum {
-    State_Starting,
-    State_Exiting,
-    State_Running
-} State;
+extern gchar   *ob_sm_id;
+extern gboolean ob_sm_use;
+extern gboolean ob_replace_wm;
 
 /* 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 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;
-
-/* cuz i have nowhere better to put it right now... */
-gboolean ob_pointer_pos(int *x, int *y);
+ObState ob_state();
+
+void ob_restart_other(const gchar *path);
+void ob_restart();
+void ob_exit();
+
+void ob_exit_with_error(gchar *msg);
+
+Cursor ob_cursor(ObCursor cursor);
+
+KeyCode ob_keycode(ObKey key);
 
 #endif