add font

[chaz/openbox] / otk_c / display.h

diff --git a/otk_c/display.h b/otk_c/display.h
index a59d8482998e0c8f230d7e7ba7cf49f7933b021c..aa55e0b9b3e8678939e1a308d892df28132abff4 100644 (file)
--- a/otk_c/display.h
+++ b/otk_c/display.h
@@ -6,10 +6,11 @@
 #include <Python.h>
 
 struct OtkScreenInfo;
-struct OtkGCCache;
 struct OtkDisplay;
 
-struct OtkDisplay *OBDisplay; // the global display XXX: move this to app.h and ob.h?
+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
@@ -34,26 +35,16 @@ typedef struct OtkDisplay {
   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
-  */
-  struct 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);