no more interactive mouse actions, they are evil etc. actions now "feel" much more...

[chaz/openbox] / openbox / geom.h

diff --git a/openbox/geom.h b/openbox/geom.h
index ed24f62bd89509a6743904316284947f410e2201..e410ecdaf18ce73cba3938f5c37ddf17ce41816d 100644 (file)
--- a/openbox/geom.h
+++ b/openbox/geom.h
@@ -23,7 +23,7 @@ typedef struct _Rect {
 } Rect;
 
 #define RECT_SET_POINT(r, nx, ny) \
-    (r).x = (ny), (r).y = (ny)
+    (r).x = (nx), (r).y = (ny)
 #define RECT_SET_SIZE(r, w, h) \
     (r).width = (w), (r).height = (h)
 #define RECT_SET(r, nx, ny, w, h) \
@@ -33,9 +33,9 @@ typedef struct _Rect {
                            (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)
+#define RECT_CONTAINS(r, px, py) \
+    ((px) >= (r).x && (px) < (r).x + (r).width && \
+     (py) >= (r).y && (py) < (r).y + (r).height)
 #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)