update copyright step 2

[chaz/openbox] / openbox / geom.h

diff --git a/openbox/geom.h b/openbox/geom.h
index 14fb96c7212250b70509559faede60590da9396d..fed39188263a1438fe26babca8893b1a5a208a23 100644 (file)
--- a/openbox/geom.h
+++ b/openbox/geom.h
@@ -1,3 +1,22 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   geom.h for the Openbox window manager
+   Copyright (c) 2006        Mikael Magnusson
+   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
 
@@ -35,7 +54,7 @@ typedef struct _Rect {
     (r).x = (nx), (r).y = (ny), (r).width = (w), (r).height = (h)
 
 #define RECT_EQUAL(r1, r2) ((r1).x == (r2).x && (r1).y == (r2).y && \
-                           (r1).width == (r2).width && \
+                            (r1).width == (r2).width && \
                             (r1).height == (r2).height)
 
 #define RECT_CONTAINS(r, px, py) \
@@ -44,10 +63,13 @@ typedef struct _Rect {
 #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)
+
+/* Returns true if Rect r and o intersect */
 #define RECT_INTERSECTS_RECT(r, o) \
     ((o).x < (r).x + (r).width && (o).x + (o).width > (r).x && \
      (o).y < (r).y + (r).height && (o).y + (o).height > (r).y)
 
+/* Sets Rect r to be the intersection of Rect a and b. */
 #define RECT_SET_INTERSECTION(r, a, b) \
     ((r).x = MAX((a).x, (b).x), \
      (r).y = MAX((a).y, (b).y), \
@@ -92,6 +114,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 && \