X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.h;h=9d7551b9e60977552a45a4b16471dd60db2ab3dc;hb=973507ff28b5d71433b3d0583e757fbc82b254c5;hp=21f0e9a826de28b192139bf98c88a9f753ad9750;hpb=35c095014e7025debe7dca24c7d34e49ddb8ecb6;p=chaz%2Fopenbox

diff --git a/openbox/openbox.h b/openbox/openbox.h
index 21f0e9a8..9d7551b9 100644
--- a/openbox/openbox.h
+++ b/openbox/openbox.h
@@ -1,47 +1,46 @@
 #ifndef __openbox_h
 #define __openbox_h
 
+#include "misc.h"
+
+#include "render/render.h"
+#include "render/theme.h"
+
 #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; 
+
 /*! 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 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;
+ObState ob_state();
+
+void ob_restart_other(const gchar *path);
+void ob_restart();
+void ob_exit();
+
+void ob_reconfigure();
+
+void ob_exit_with_error(gchar *msg);
+
+Cursor ob_cursor(ObCursor cursor);
+
+KeyCode ob_keycode(ObKey key);
+
+gchar *ob_expand_tilde(const gchar *f);
 
 #endif