X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=otk_c%2Fdisplay.h;h=a36cd8538a5dfa2fdffbe9bf4a38362086accd3c;hb=187e7db9c039d7369766aeae7dfdf87f191ac446;hp=a59d8482998e0c8f230d7e7ba7cf49f7933b021c;hpb=79ce13073b82b5144b114fc388d0be53835957a8;p=chaz%2Fopenbox diff --git a/otk_c/display.h b/otk_c/display.h index a59d8482..a36cd853 100644 --- a/otk_c/display.h +++ b/otk_c/display.h @@ -6,10 +6,9 @@ #include 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? typedef struct OtkDisplay { PyObject_HEAD @@ -35,25 +34,15 @@ typedef struct OtkDisplay { //! 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; } 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);