6 files changed, 39 insertions, 35 deletions

diff --git a/src/Slit.cc b/src/Slit.cc
index 0e7b7c81..e20c9b6e 100644
--- a/src/Slit.cc
+++ b/src/Slit.cc
@@ -559,13 +559,13 @@ void Slit::reposition(void) {
   Toolbar *tbar = screen.getToolbar();
   int sw = frame.area.w() + (screen.getBorderWidth() * 2),
       sh = frame.area.h() + (screen.getBorderWidth() * 2),
-      tw = tbar->getWidth() + screen.getBorderWidth(),
-      th = tbar->getHeight() + screen.getBorderWidth();
+      tw = tbar->area().w() + screen.getBorderWidth(),
+      th = tbar->area().h() + screen.getBorderWidth();
 
-  if (tbar->getX() < frame.area.x() + sw &&
-      tbar->getX() + tw > frame.area.x() &&
-      tbar->getY() < frame.area.y() + sh &&
-      tbar->getY() + th > frame.area.y()) {
+  if (tbar->area().x() < frame.area.x() + sw &&
+      tbar->area().x() + tw > frame.area.x() &&
+      tbar->area().y() < frame.area.y() + sh &&
+      tbar->area().y() + th > frame.area.y()) {
     if (frame.area.y() < th) {
       frame.area.setY(frame.area.y() + tbar->getExposedHeight());
       if (m_direction == Vertical)
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index 12f778eb..d238d1ea 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -154,14 +154,13 @@ Toolbar::Toolbar(BScreen &scrn, Resource &conf) : screen(scrn),
   mapToolbar();
 }
 
-int Toolbar::getX() const {
-  return ((m_hidden) ? frame.x_hidden : frame.x);
-}
-
-int Toolbar::getY() const {
-  if (screen.hideToolbar()) return screen.size().h();
-  else if (m_hidden) return frame.y_hidden;
-  else return frame.y;
+Rect Toolbar::area() const {
+  int x = ((m_hidden) ? frame.x_hidden : frame.x);
+  int y;
+  if (screen.hideToolbar()) y = screen.size().h();
+  else if (m_hidden) y = frame.y_hidden;
+  else y = frame.y;
+  return Rect(x, y, frame.width, frame.height);
 }
 
 unsigned int Toolbar::getExposedHeight() const {
diff --git a/src/Toolbar.h b/src/Toolbar.h
index bf67b506..a4326c12 100644
--- a/src/Toolbar.h
+++ b/src/Toolbar.h
@@ -29,6 +29,7 @@
 #include "Timer.h"
 #include "Resource.h"
 #include "Screen.h"
+#include "Geometry.h"
 
 // forward declaration
 class Toolbar;
@@ -114,12 +115,16 @@ public:
 
   inline const Window &getWindowID() const { return frame.window; }
 
-  inline unsigned int getWidth() const { return frame.width; }
-  inline unsigned int getHeight() const { return frame.height; }
+  //inline unsigned int getWidth() const { return frame.width; }
+  //inline unsigned int getHeight() const { return frame.height; }
   unsigned int getExposedHeight() const;
   
-  int getX() const;
-  int getY() const;
+  //int getX() const;
+  //int getY() const;
+
+  Rect area() const;
+  //Size size() const { return area().size(); }
+  //Point origin() const { return area().origin(); }
   
   void buttonPressEvent(XButtonEvent *);
   void buttonReleaseEvent(XButtonEvent *);
diff --git a/src/Window.cc b/src/Window.cc
index d733afc3..73291228 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -2868,7 +2868,7 @@ void OpenboxWindow::motionNotifyEvent(XMotionEvent *me) {
       int snap_distance = screen->edgeSnapThreshold();
       // width/height of the snapping window
       unsigned int snap_w = frame.width + (frame.border_w * 2);
-      unsigned int snap_h = size().h() + (frame.border_w * 2);
+      unsigned int snap_h = area().h() + (frame.border_w * 2);
       if (snap_distance) {
         int drx = screen->size().w() - (dx + snap_w);
 
@@ -2891,7 +2891,7 @@ void OpenboxWindow::motionNotifyEvent(XMotionEvent *me) {
 
         default:
           dtty = 0;
-	  dbby = screen->getToolbar()->getY();
+	  dbby = screen->getToolbar()->area().y();
           break;
         }
 
diff --git a/src/Window.h b/src/Window.h
index fd682c95..b916ca67 100644
--- a/src/Window.h
+++ b/src/Window.h
@@ -292,18 +292,18 @@ public:
   inline const unsigned int &getTitleHeight(void) const
   { return frame.title_h; }
 
-  inline const Point origin() const {
-    return Point(frame.x, frame.y);
-  }
-  inline const Point clientOrigin() const {
-    return Point(client.x, client.y);
-  }
-  inline const Size size() const {
-    return Size(frame.width, flags.shaded ? frame.title_h : frame.height);
-  }
-  inline const Size clientSize() const {
-    return Size(client.width, client.height);
-  }
+  //inline const Point origin() const {
+  //  return Point(frame.x, frame.y);
+  //}
+  //inline const Point clientOrigin() const {
+  //  return Point(client.x, client.y);
+  //}
+  //inline const Size size() const {
+  //  return Size(frame.width, flags.shaded ? frame.title_h : frame.height);
+  //}
+  //inline const Size clientSize() const {
+  //  return Size(client.width, client.height);
+  //}
   inline const Rect area() const {
     return Rect(frame.x, frame.y, frame.width,
                 flags.shaded ? frame.title_h : frame.height);
diff --git a/src/Workspace.cc b/src/Workspace.cc
index f25ff0f2..551f5642 100644
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@ -624,8 +624,8 @@ void Workspace::placeWindow(OpenboxWindow *win) {
   }
 #endif // SLIT
 
-  const Size window_size(win->size().w()+screen.getBorderWidth() * 4,
-                         win->size().h()+screen.getBorderWidth() * 4);
+  const Size window_size(win->area().w()+screen.getBorderWidth() * 4,
+                         win->area().h()+screen.getBorderWidth() * 4);
   Point *place = NULL;
   LinkedListIterator<OpenboxWindow> it(windowList);
 
@@ -650,6 +650,6 @@ void Workspace::placeWindow(OpenboxWindow *win) {
   if (place->y() + window_size.h() > (signed) screen.size().h())
     place->setY(((signed) screen.size().h() - window_size.h()) / 2);
 
-  win->configure(place->x(), place->y(), win->size().w(), win->size().h());
+  win->configure(place->x(), place->y(), win->area().w(), win->area().h());
   delete place;
 }