X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FBaseDisplay.h;h=1a44dddc6661e1cb25ad98bb41eef206f89c25d9;hb=57fb41c8060eaa2f29b25b08e3813b3dc140f165;hp=38f12ada8c6c9bd1352ce32b603f26a7857518cd;hpb=72af8cea6a0573f7d2c004102cd04f1a1ad88798;p=chaz%2Fopenbox

diff --git a/src/BaseDisplay.h b/src/BaseDisplay.h
index 38f12ada..1a44dddc 100644
--- a/src/BaseDisplay.h
+++ b/src/BaseDisplay.h
@@ -32,6 +32,7 @@ class ScreenInfo;
 
 #include "LinkedList.h"
 #include "Timer.h"
+#include "Geometry.h"
 
 #define AttribShaded      (1l << 0)
 #define AttribMaxHoriz    (1l << 1)
@@ -142,7 +143,7 @@ protected:
 
 
 public:
-  BaseDisplay(char *, char * = 0);
+  BaseDisplay(const char *, char * = 0);
   virtual ~BaseDisplay(void);
 
   inline const Atom &getWMChangeStateAtom(void) const
@@ -334,7 +335,7 @@ private:
   Colormap colormap;
 
   int depth, screen_number;
-  unsigned int width, height;
+  Size m_size;
 
 
 public:
@@ -349,8 +350,9 @@ public:
   inline const int &getDepth(void) const { return depth; }
   inline const int &getScreenNumber(void) const { return screen_number; }
 
-  inline const unsigned int &getWidth(void) const { return width; }
-  inline const unsigned int &getHeight(void) const { return height; }
+//  inline const unsigned int &getWidth(void) const { return width; }
+//  inline const unsigned int &getHeight(void) const { return height; }
+  inline const Size &size() const { return m_size; }
 };