merge the C branch into HEAD

[chaz/openbox] / otk / screeninfo.hh

diff --git a/otk/screeninfo.hh b/otk/screeninfo.hh
index 314527ab92aa03a45047fcefc0fbfd8a09094ded..93e835facb1cb601bccf728a1fbfb890f7466056 100644 (file)
--- a/otk/screeninfo.hh
+++ b/otk/screeninfo.hh
@@ -1,7 +1,8 @@
-// -*- mode: C++; indent-tabs-mode: nil; -*-
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 #ifndef   __screeninfo_hh
 #define   __screeninfo_hh
 
+#include "size.hh"
 #include "rect.hh"
 
 extern "C" {
@@ -9,40 +10,31 @@ extern "C" {
 }
 
 #include <string>
+#include <vector>
 
 namespace otk {
 
 class ScreenInfo {
 private:
-  Visual *_visual;
-  Window _root_window;
-  Colormap _colormap;
-
-  int _depth;
-  unsigned int _screen;
+  int _screen;
   std::string _display_string;
-  Rect _rect;
-#ifdef XINERAMA
-  RectList _xinerama_areas;
+  Size _size;
+  std::vector<Rect> _xinerama_areas;
   bool _xinerama_active;
-#endif
 
 public:
-  ScreenInfo(unsigned int num);
+  ScreenInfo(int num);
 
   inline Visual *visual() const { return _visual; }
   inline Window rootWindow() const { return _root_window; }
   inline Colormap colormap() const { return _colormap; }
   inline int depth() const { return _depth; }
-  inline unsigned int screen() const { return _screen; }
-  inline const Rect& rect() const { return _rect; }
-  inline unsigned int width() const { return _rect.width(); }
-  inline unsigned int height() const { return _rect.height(); }
+  inline int screen() const { return _screen; }
+  inline const Size& size() const { return _size; }
   inline const std::string& displayString() const { return _display_string; }
-#ifdef XINERAMA
-  inline const RectList &xineramaAreas() const { return _xinerama_areas; }
+  inline const std::vector<Rect> &xineramaAreas() const
+    { return _xinerama_areas; }
   inline bool isXineramaActive() const { return _xinerama_active; }
-#endif
 };
 
 }