X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Frect.hh;h=de4f5e0397174700c5b83fb0a7fcd56fc866decb;hb=0dcbf985c11c850b30b2983e1e20cd8cf033f054;hp=90d2b3cc8694a038f73160483c2736d919f28784;hpb=18645bf9c7450469f8a726d007871a536c571a0e;p=chaz%2Fopenbox

diff --git a/otk/rect.hh b/otk/rect.hh
index 90d2b3cc..de4f5e03 100644
--- a/otk/rect.hh
+++ b/otk/rect.hh
@@ -1,4 +1,4 @@
-// -*- mode: C++; indent-tabs-mode: nil; -*-
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 #ifndef   __rect_hh
 #define   __rect_hh
 
@@ -6,6 +6,7 @@ extern "C" {
 #include <X11/Xlib.h>
 }
 
+#include "point.hh"
 #include <vector>
 
 namespace otk {
@@ -34,6 +35,12 @@ public:
   inline Rect(const Point &location, const Point &size)
     : _x1(location.x()), _y1(location.y()),
       _x2(size.x() + location.x() - 1), _y2(size.y() + location.y() - 1) { }
+  //! Constructs a Rect from another Rect
+  /*!
+    @param rect The rectangle from which to construct this new one
+  */
+  inline Rect(const Rect &rect)
+    : _x1(rect._x1), _y1(rect._y1), _x2(rect._x2), _y2(rect._y2) { }
   //! Constructs a Rect from an XRectangle
   inline explicit Rect(const XRectangle& xrect)
     : _x1(xrect.x), _y1(xrect.y), _x2(xrect.width + xrect.x - 1),
@@ -212,6 +219,14 @@ public:
     @return true if the point is contained within this Rect; otherwise, false
   */
   bool contains(int x, int y) const;
+  //! Determines if this Rect contains a point
+  /*!
+    The rectangle contains the point if it falls within the rectangle's
+    boundaries.
+    @param p The point to operate on
+    @return true if the point is contained within this Rect; otherwise, false
+  */
+  bool contains(const Point &p) const;
   //! Determines if this Rect contains another Rect entirely
   /*!
     This rectangle contains the second rectangle if it is entirely within this