X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fopenbox.h;h=c43f0a61b53e50635584058fce5755f6178b9abf;hb=0352abfa88892bc17bdff2022745e3c1b312edd0;hp=7c38e20f7280b3734c8bdb517d203fc4c43e801e;hpb=452627a51ce38229533dfe5d8eeb877b0918d02c;p=chaz%2Fopenbox

diff --git a/openbox/openbox.h b/openbox/openbox.h
index 7c38e20f..c43f0a61 100644
--- a/openbox/openbox.h
+++ b/openbox/openbox.h
@@ -21,21 +21,20 @@
 
 #include "misc.h"
 
-#include "render/render.h"
-#include "render/theme.h"
+#include "obrender/render.h"
+#include "obrender/theme.h"
 #include "obt/mainloop.h"
+#include "obt/display.h"
 
 #include <glib.h>
 #include <X11/Xlib.h>
 
 extern RrInstance *ob_rr_inst;
+extern RrImageCache *ob_rr_icons;
 extern RrTheme    *ob_rr_theme;
 
 extern ObtMainLoop *ob_main_loop;
 
-/*! The X display */
-extern Display *ob_display;
-
 /*! The number of the screen on which we're running */
 extern gint     ob_screen;
 
@@ -49,19 +48,20 @@ extern gboolean ob_replace_wm;
 extern gboolean ob_debug_xinerama;
 
 /* The state of execution of the window manager */
-ObState ob_state();
+ObState ob_state(void);
+void ob_set_state(ObState state);
 
 void ob_restart_other(const gchar *path);
-void ob_restart();
+void ob_restart(void);
 void ob_exit(gint code);
-void ob_exit_replace();
+void ob_exit_replace(void);
 
-void ob_reconfigure();
+void ob_reconfigure(void);
 
-void ob_exit_with_error(const gchar *msg);
+void ob_exit_with_error(const gchar *msg) G_GNUC_NORETURN;
 
 Cursor ob_cursor(ObCursor cursor);
 
-KeyCode ob_keycode(ObKey key);
+gboolean ob_keycode_match(KeyCode code, ObKey key);
 
 #endif