X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fgeom.h;h=43eb8ea3ab128b598174cb2e4948af7e6b5e4d21;hb=0cfd92ab9e56d8f790c92b83436e981fa46efe20;hp=39832e949050c5cbb78ff1e73264945a2dd5108e;hpb=97cbacd9e41ae2315434d6e83ce78502a881d54f;p=chaz%2Fopenbox diff --git a/openbox/geom.h b/openbox/geom.h index 39832e94..43eb8ea3 100644 --- a/openbox/geom.h +++ b/openbox/geom.h @@ -57,6 +57,11 @@ typedef struct _Rect { #define RECT_EQUAL(r1, r2) ((r1).x == (r2).x && (r1).y == (r2).y && \ (r1).width == (r2).width && \ (r1).height == (r2).height) +#define RECT_EQUAL_DIMS(r, x, y, w, h) \ + ((r).x == (x) && (r).y == (y) && (r).width == (w) && (r).height == (h)) + +#define RECT_TO_DIMS(r, x, y, w, h) \ + (x) = (r).x, (y) = (r).y, (w) = (r).width, (h) = (r).height #define RECT_CONTAINS(r, px, py) \ ((px) >= (r).x && (px) < (r).x + (r).width && \ @@ -137,4 +142,7 @@ typedef struct _StrutPartial { (s1).bottom_start == (s2).bottom_start && \ (s1).bottom_end == (s2).bottom_end) +#define RANGES_INTERSECT(r1x, r1w, r2x, r2w) \ + (r1x < r2x + r2w && r1x + r1w > r2x) + #endif