M otk/point.hh → otk/point.hh

@@ -31,6 +31,9 @@ //! Changes the y value to the new value specified
   void setY(int x) { _x = x; }
   //! Returns the y value
   int y() const { return _x; }
+
+  //! Changes the x and y values
+  void setPoint(int x, int y) { _x = x; _y = y; }
 };
 
 }

M src/screen.cc → src/screen.cc

@@ -76,8 +76,8 @@ _style.load(config);
 
   
   // Set the netwm atoms for geomtery and viewport
-  unsigned long geometry[] = { _size.x(),
-                               _size.y() };
+  unsigned long geometry[] = { _info->getWidth(),
+                               _info->getHeight() };
   Openbox::instance->property()->set(_info->getRootWindow(),
                                      otk::OBProperty::net_desktop_geometry,
                                      otk::OBProperty::Atom_Cardinal,

M src/screen.hh → src/screen.hh

@@ -13,7 +13,6 @@ 
 #include "otk/image.hh"
 #include "otk/strut.hh"
 #include "otk/rect.hh"
-#include "otk/point.hh"
 #include "otk/style.hh"
 #include "otk/configuration.hh" // TEMPORARY
 
@@ -61,9 +60,6 @@ 
   //! Is the root colormap currently installed?
   bool _root_cmap_installed;
 
-  //! The dimentions of the screen
-  otk::Point _size;
-
   //! All managed clients on the screen
   ClientList _clients;
 
@@ -107,8 +103,6 @@ */
   inline bool managed() const { return _managed; }
   //! Returns the Image Control used for rendering on the screen
   inline otk::BImageControl *imageControl() { return _image_control; }
-  //! Returns the dimentions of the screen
-  inline const otk::Point &size() const { return _size; }
   //! Returns the area of the screen not reserved by applications' Struts
   inline const otk::Rect &area() const { return _area; }
   //! Returns the style in use on the screen