X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk_c%2Fdisplay.h;h=32e92c4a6aee6e1c9f6356a4ae50d55668f5ad60;hb=bc88d310fea71823fb2c61d071ff499579bffaba;hp=fd9b706fb76349aa143e4729d6450774d421a6bd;hpb=edc47eb5580babdca6547989c1cb5cdf317f4835;p=chaz%2Fopenbox

diff --git a/otk_c/display.h b/otk_c/display.h
index fd9b706f..32e92c4a 100644
--- a/otk_c/display.h
+++ b/otk_c/display.h
@@ -1,14 +1,18 @@
-// -*- mode: C; indent-tabs-mode: nil; -*-
+// -*- mode: C; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 #ifndef   __display_h
 #define   __display_h
 
 #include <X11/Xlib.h>
 #include <Python.h>
 
-typedef OtkScreenInfo;
-typedef OtkGCCache;
+struct OtkScreenInfo;
+struct OtkDisplay;
 
-typedef struct {
+extern struct OtkDisplay *OBDisplay; // the global display XXX: move this to app.h and ob.h?
+
+extern PyTypeObject OtkDisplay_Type;
+
+typedef struct OtkDisplay {
   PyObject_HEAD
   
   //! The X display
@@ -31,26 +35,16 @@ typedef struct {
   int grab_count;
 
   //! A list of information for all screens on the display
-  PyObject *screenInfoList; // PyListObject
-
-  //! A cache for re-using GCs, used by the drawing objects
-  /*!
-    @see BPen
-    @see BFont
-    @see BImage
-    @see BImageControl
-    @see BTexture
-  */
-  OtkGCCache *gccache;
+  PyListObject *screenInfoList;
 } OtkDisplay;
 
-//! Creates a struct, opens the X display
+//! Opens the X display, and sets the global OBDisplay variable
 /*!
   @see OBDisplay::display
   @param name The name of the X display to open. If it is null, the DISPLAY
   environment variable is used instead.
 */
-PyObject *OtkDisplay_New(char *name);
+void OtkDisplay_Initialize(char *name);
 
 //! Grabs the display
 void OtkDisplay_Grab(OtkDisplay *self);
@@ -58,4 +52,7 @@ void OtkDisplay_Grab(OtkDisplay *self);
 //! Ungrabs the display
 void OtkDisplay_Ungrab(OtkDisplay *self);
 
+//! Get the screen info for a specific screen
+struct OtkScreenInfo *OtkDisplay_ScreenInfo(OtkDisplay *self, int num);
+
 #endif // __display_h