-#define RECT_EQUAL(r1, r2) (r1.x == r2.x && r1.y == r2.y && \
- r1.width == r2.width && r1.height == r2.height)
+#define RECT_EQUAL(r1, r2) ((r1).x == (r2).x && (r1).y == (r2).y && \
+ (r1).width == (r2).width && \
+ (r1).height == (r2).height)
+
+#define RECT_CONTAINS(r, x, y) \
+ (x >= (r).x && x < (r).x + (r).width && \
+ y >= (r).y && y < (r).y + (r).height)