X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.h;h=2f325dff919a76e001039bc49414ce95b1e6cec8;hb=5d4cbbc67444c3955f705b3aeddf29be1c731866;hp=69004990de6c5385ee97e44942a674b79834922a;hpb=276b2be581c6cb138b439537761ff2ca42201805;p=chaz%2Fopenbox

diff --git a/openbox/openbox.h b/openbox/openbox.h
index 69004990..2f325dff 100644
--- a/openbox/openbox.h
+++ b/openbox/openbox.h
@@ -14,9 +14,13 @@
 #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; 
 
@@ -25,34 +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;
 
-/* The state of execution of the window manager */
-extern ObState ob_state;
+extern gchar   *ob_sm_id;
+extern gboolean ob_sm_use;
+extern gboolean ob_replace_wm;
 
-/*! 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;
+/* The state of execution of the window manager */
+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();
 
-/*! The path of the rc file. If NULL the default paths are searched for one. */
-extern char *ob_rc_path;
+void ob_exit_with_error(gchar *msg);
 
 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