X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=obt%2Fdisplay.h;h=b5816a9a58e5770e0910297e09f752cb4afa8c5b;hb=14deacc8f3fea90f26ae75f5cf718d9876104053;hp=aafa0fcd4901f32a9ac767575c1133d35fc07045;hpb=a2f5a826a1ed79102cd59a9ef17724fb90afe86b;p=chaz%2Fopenbox

diff --git a/obt/display.h b/obt/display.h
index aafa0fcd..b5816a9a 100644
--- a/obt/display.h
+++ b/obt/display.h
@@ -16,20 +16,55 @@
    See the COPYING file for a copy of the GNU General Public License.
 */
 
-#ifndef __obt_instance_h
-#define __obt_instance_h
+#ifndef __obt_display_h
+#define __obt_display_h
 
 #include <X11/Xlib.h>
 #include <glib.h>
 
+#include <X11/Xutil.h> /* shape.h uses Region which is in here */
+#ifdef    XKB
+#include <X11/XKBlib.h>
+#endif
+#ifdef    SHAPE
+#include <X11/extensions/shape.h>
+#endif
+#ifdef    XINERAMA
+#include <X11/extensions/Xinerama.h>
+#endif
+#ifdef    XRANDR
+#include <X11/extensions/Xrandr.h>
+#endif
+#ifdef    SYNC
+#include <X11/extensions/sync.h>
+#endif
+
 G_BEGIN_DECLS
 
-Display* obt_display_open(const char *display_name);
-void     obt_display_close(Display *d);
+extern gboolean obt_display_error_occured;
+
+extern gboolean obt_display_extension_xkb;
+extern gint     obt_display_extension_xkb_basep;
+extern gboolean obt_display_extension_shape;
+extern gint     obt_display_extension_shape_basep;
+extern gboolean obt_display_extension_xinerama;
+extern gint     obt_display_extension_xinerama_basep;
+extern gboolean obt_display_extension_randr;
+extern gint     obt_display_extension_randr_basep;
+extern gboolean obt_display_extension_sync;
+extern gint     obt_display_extension_sync_basep;
+
+extern Display* obt_display;
+
+/*! Open the X display.  You should call g_set_prgname() before calling this
+  function for X Input Methods to work correctly. */
+gboolean obt_display_open(const char *display_name);
+void     obt_display_close(void);
+
+void     obt_display_ignore_errors(gboolean ignore);
 
-void     obt_display_ignore_errors(Display *d, gboolean ignore);
-gboolean obt_display_error_occured();
+#define  obt_root(screen) (RootWindow(obt_display, screen))
 
 G_END_DECLS
 
-#endif /*__obt_instance_h*/
+#endif /*__obt_display_h*/