X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=otk%2Fdisplay.hh;h=28d33675a8db36e6d06066f158d4f17d0e133271;hb=707f70682abe0dfaadbf76843a0dccb33f0eaeda;hp=9402a8e7c1f79481481791673142cc623820fa3b;hpb=9b6e5f9cf49df78be25720f9c4b33a733b856c9b;p=chaz%2Fopenbox diff --git a/otk/display.hh b/otk/display.hh index 9402a8e7..28d33675 100644 --- a/otk/display.hh +++ b/otk/display.hh @@ -6,8 +6,6 @@ extern "C" { #include } -#include - namespace otk { class ScreenInfo; @@ -54,11 +52,11 @@ private: int _grab_count; //! A list of information for all screens on the display - std::vector _screenInfoList; + ScreenInfo** _screeninfo_list; //! A list of RenderControl objects, which are used for all graphics on a //! screen - std::vector _renderControlList; + RenderControl** _rendercontrol_list; //! A cache for re-using GCs, used by the drawing objects /*! @@ -96,13 +94,13 @@ public: @param snum The screen number of the screen to retrieve info on @return Info on the requested screen, in a ScreenInfo class */ - const ScreenInfo* screenInfo(int snum); + const ScreenInfo* screenInfo(int snum) const; //! Find a ScreenInfo based on a root window - const ScreenInfo* findScreen(Window root); + const ScreenInfo* findScreen(Window root) const; //! Gets the RenderControl for a screen - const RenderControl *renderControl(int snum); + const RenderControl *renderControl(int snum) const; //! Returns if the display has the xkb extension available inline bool xkb() const { return _xkb; }