X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fgeom.h;h=6b5fb0a022ea55207a6357e874f58264ad91638f;hb=a51d2082bd28baa11e28441bc0fb4016150618df;hp=e410ecdaf18ce73cba3938f5c37ddf17ce41816d;hpb=32b381fbcae3f6978978627468328514dddcf45b;p=chaz%2Fopenbox

diff --git a/openbox/geom.h b/openbox/geom.h
index e410ecda..6b5fb0a0 100644
--- a/openbox/geom.h
+++ b/openbox/geom.h
@@ -1,3 +1,21 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   geom.h for the Openbox window manager
+   Copyright (c) 2003        Ben Jansens
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
 #ifndef __geom_h
 #define __geom_h
 
@@ -22,6 +40,11 @@ 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 = (nx), (r).y = (ny)
 #define RECT_SET_SIZE(r, w, h) \
@@ -43,6 +66,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;
@@ -79,6 +110,12 @@ typedef struct _StrutPartial {
     (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)
+
+#define PARTIAL_STRUT_EQUAL(s1, s2) \
     ((s1).left == (s2).left && \
      (s1).top == (s2).top && \
      (s1).right == (s2).right && \