linear focus cycling

[chaz/openbox] / otk / display.hh

diff --git a/otk/display.hh b/otk/display.hh
index 5f658cd3a71a8770a531f1505b4853e6f7c7ae0b..28d33675a8db36e6d06066f158d4f17d0e133271 100644 (file)
--- a/otk/display.hh
+++ b/otk/display.hh
@@ -6,12 +6,11 @@ extern "C" {
 #include <X11/Xlib.h>
 }
 
-#include <vector>
-
 namespace otk {
 
 class ScreenInfo;
 class GCCache;
+class RenderControl;
 
 class Display;
 
@@ -21,10 +20,6 @@ extern Display *display;
 //! Manages a single X11 display.
 class Display
 {
-public:
-  //! A List of ScreenInfo instances
-  typedef std::vector<ScreenInfo> ScreenInfoList;
-
 private:
   //! The X display
   ::Display *_display;
@@ -57,7 +52,11 @@ private:
   int _grab_count;
 
   //! A list of information for all screens on the display
-  ScreenInfoList _screenInfoList;
+  ScreenInfo** _screeninfo_list;
+
+  //! A list of RenderControl objects, which are used for all graphics on a
+  //! screen
+  RenderControl** _rendercontrol_list;
 
   //! A cache for re-using GCs, used by the drawing objects
   /*!
@@ -95,10 +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;
 
   //! Returns if the display has the xkb extension available
   inline bool xkb() const { return _xkb; }