nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix RECT_CONTAINS, name clash

Browse source
This commit is contained in:
Dana Jansens 2003-09-04 14:54:29 +00:00
parent 4cbfe3eac0
commit 32b381fbca
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
openbox/geom.h
View file

@ -33,9 +33,9 @@ typedef struct _Rect {
(r1).width == (r2).width && \ (r1).width == (r2).width && \
(r1).height == (r2).height) (r1).height == (r2).height)
#define RECT_CONTAINS(r, x, y) \ #define RECT_CONTAINS(r, px, py) \
((x) >= (r).x && (x) < (r).x + (r).width && \ ((px) >= (r).x && (px) < (r).x + (r).width && \
(y) >= (r).y && (y) < (r).y + (r).height) (py) >= (r).y && (py) < (r).y + (r).height)
#define RECT_CONTAINS_RECT(r, o) \ #define RECT_CONTAINS_RECT(r, o) \
((o).x >= (r).x && (o).x + (o).width <= (r).x + (r).width && \ ((o).x >= (r).x && (o).x + (o).width <= (r).x + (r).width && \
(o).y >= (r).y && (o).y + (o).height <= (r).y + (r).height) (o).y >= (r).y && (o).y + (o).height <= (r).y + (r).height)