all repos — openbox @ 75c0a76a53bc31b162590fc767f5b2fe73ad07df

openbox fork - make it a bit more like ryudo 

changed external window interface to only have an area(), no size() and origin(), since all of their values are also in area()
changed toolbar external inteface to have an area, no more getX/Y/Width/Height
Dana Jansens danakj@orodu.net
commit

75c0a76a53bc31b162590fc767f5b2fe73ad07df

parent

b8dd077ab0d46e044da324623e1253422621b687

6 files changed, 39 insertions(+), 35 deletions(-)

jump to
M src/Slit.cc → src/Slit.cc 
@@ -559,13 +559,13 @@ 
   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)
M src/Toolbar.cc → src/Toolbar.cc 
@@ -154,14 +154,13 @@ reconfigure();
   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 {
M src/Toolbar.h → src/Toolbar.h 
@@ -29,6 +29,7 @@ #include "Basemenu.h"
 #include "Timer.h"
 #include "Resource.h"
 #include "Screen.h"
+#include "Geometry.h"
 
 // forward declaration
 class Toolbar;

@@ -114,12 +115,16 @@ inline Toolbarmenu *getMenu() { return toolbarmenu; }
 
   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 *);
M src/Window.cc → src/Window.cc 
@@ -2868,7 +2868,7 @@ 
       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 @@ break;
 
         default:
           dtty = 0;
-	  dbby = screen->getToolbar()->getY();
+	  dbby = screen->getToolbar()->area().y();
           break;
         }
M src/Window.h → src/Window.h 
@@ -292,18 +292,18 @@ //{ return client.width; }
   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);
M src/Workspace.cc → src/Workspace.cc 
@@ -624,8 +624,8 @@ ASSERT(false);      // unhandled placement
   }
 #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 @@ place->setX(((signed) screen.size().w() - window_size.w()) / 2);
   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;
 }