From: Dana Jansens Date: Mon, 15 Sep 2003 02:03:58 +0000 (+0000) Subject: add some interesection shit, and RECT_LEFT/RIGHT/TOP/BOTTOM X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=d193fc4a3df76815dc5835941d7b11ee9a79afe6;p=chaz%2Fopenbox add some interesection shit, and RECT_LEFT/RIGHT/TOP/BOTTOM --- diff --git a/openbox/geom.h b/openbox/geom.h index e410ecda..14fb96c7 100644 --- a/openbox/geom.h +++ b/openbox/geom.h @@ -22,6 +22,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 +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;