remove the redundant _size property in OBScreen, and set the geometry root property...

add otk::Point::setPoint

diff --git a/otk/point.hh b/otk/point.hh
index 2c6d334c0347db7484a4a426c7fc1eaf88516b7f..edccbe1a7f44fd7d82398da3dcfb41dfffee608e 100644 (file)
--- a/otk/point.hh
+++ b/otk/point.hh
@@ -31,6 +31,9 @@ public:
   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; }
 };
 
 }

diff --git a/src/screen.cc b/src/screen.cc
index 7413b163438d17376f736c8bc94ea75c22b2d429..e3217cca3e64a8f6cc64401ec97528b84749ab2f 100644 (file)
--- a/src/screen.cc
+++ b/src/screen.cc
@@ -76,8 +76,8 @@ OBScreen::OBScreen(int screen, const otk::Configuration &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,

diff --git a/src/screen.hh b/src/screen.hh
index 8d7bc6b07db5db71509f7e22798a9bf064ab9242..d047d0c219e69634182960857cc410adae082574 100644 (file)
--- a/src/screen.hh
+++ b/src/screen.hh
@@ -13,7 +13,6 @@ extern "C" {
 #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 @@ private:
   //! 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 @@ public:
   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