X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fgeom.h;h=14fb96c7212250b70509559faede60590da9396d;hb=db50fd3026ccd9e97755448d41ff87fbed036ab9;hp=6e46522c6a340541c76ca2afafcd242e5b93406a;hpb=4cd886e5188549ab48a11b70cb40b65efe916b6c;p=chaz%2Fopenbox

diff --git a/openbox/geom.h b/openbox/geom.h
index 6e46522c..14fb96c7 100644
--- a/openbox/geom.h
+++ b/openbox/geom.h
@@ -22,8 +22,13 @@ typedef struct _Rect {
     int height;
 } Rect;
 
+#define RECT_LEFT(r) ((r).x)
+#define RECT_TOP(r) ((r).y)
+#define RECT_RIGHT(r) ((r).x + (r).width - 1)
+#define RECT_BOTTOM(r) ((r).y + (r).height - 1)
+
 #define RECT_SET_POINT(r, nx, ny) \
-    (r).x = (ny), (r).y = (ny)
+    (r).x = (nx), (r).y = (ny)
 #define RECT_SET_SIZE(r, w, h) \
     (r).width = (w), (r).height = (h)
 #define RECT_SET(r, nx, ny, w, h) \
@@ -33,9 +38,9 @@ typedef struct _Rect {
 			    (r1).width == (r2).width && \
                             (r1).height == (r2).height)
 
-#define RECT_CONTAINS(r, x, y) \
-    ((x) >= (r).x && (x) < (r).x + (r).width && \
-     (y) >= (r).y && (y) < (r).y + (r).height)
+#define RECT_CONTAINS(r, px, py) \
+    ((px) >= (r).x && (px) < (r).x + (r).width && \
+     (py) >= (r).y && (py) < (r).y + (r).height)
 #define RECT_CONTAINS_RECT(r, o) \
     ((o).x >= (r).x && (o).x + (o).width <= (r).x + (r).width && \
      (o).y >= (r).y && (o).y + (o).height <= (r).y + (r).height)
@@ -43,6 +48,14 @@ typedef struct _Rect {
     ((o).x < (r).x + (r).width && (o).x + (o).width > (r).x && \
      (o).y < (r).y + (r).height && (o).y + (o).height > (r).y)
 
+#define RECT_SET_INTERSECTION(r, a, b) \
+    ((r).x = MAX((a).x, (b).x), \
+     (r).y = MAX((a).y, (b).y), \
+     (r).width = MIN((a).x + (a).width - 1, \
+                     (b).x + (b).width - 1) - (r).x + 1, \
+     (r).height = MIN((a).y + (a).height - 1, \
+                      (b).y + (b).height - 1) - (r).y + 1)
+
 typedef struct _Strut {
     int left;
     int top;
@@ -78,4 +91,18 @@ typedef struct _StrutPartial {
     (s1).top = MAX((s1).top, (s2).top), \
     (s1).bottom = MAX((s1).bottom, (s2).bottom)
 
+#define STRUT_EQUAL(s1, s2) \
+    ((s1).left == (s2).left && \
+     (s1).top == (s2).top && \
+     (s1).right == (s2).right && \
+     (s1).bottom == (s2).bottom && \
+     (s1).left_start == (s2).left_start && \
+     (s1).left_end == (s2).left_end && \
+     (s1).top_start == (s2).top_start && \
+     (s1).top_end == (s2).top_end && \
+     (s1).right_start == (s2).right_start && \
+     (s1).right_end == (s2).right_end && \
+     (s1).bottom_start == (s2).bottom_start && \
+     (s1).bottom_end == (s2).bottom_end)
+
 #endif