From: Dana Jansens Date: Fri, 28 Mar 2003 04:32:37 +0000 (+0000) Subject: make better? X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=66969a6ba5d55d74189a8cad68b67cf6cc16dd79;p=chaz%2Fopenbox make better? --- diff --git a/openbox/geom.h b/openbox/geom.h index ae0e5830..221d362e 100644 --- a/openbox/geom.h +++ b/openbox/geom.h @@ -6,14 +6,14 @@ typedef struct Point { int y; } Point; -#define POINT_SET(pt, nx, ny) pt.x = nx, pt.y = ny +#define POINT_SET(pt, nx, ny) pt.x = (nx), pt.y = (ny) typedef struct Size { int width; int height; } Size; -#define SIZE_SET(sz, w, h) sz.width = w, sz.height = h +#define SIZE_SET(sz, w, h) sz.width = (w), sz.height = (h) typedef struct Rect { int x; @@ -23,11 +23,11 @@ typedef struct Rect { } Rect; #define RECT_SET_POINT(r, nx, ny) \ - r.x = ny, r.y = ny + r.x = (ny), r.y = (ny) #define RECT_SET_SIZE(r, w, h) \ - r.width = w, r.height = h + r.width = (w), r.height = (h) #define RECT_SET(r, nx, ny, w, h) \ - r.x = nx, r.y = ny, r.width = w, r.height = h + r.x = (nx), r.y = (ny), r.width = (w), r.height = (h) #define RECT_EQUAL(r1, r2) (r1.x == r2.x && r1.y == r2.y && \ r1.width == r2.width && r1.height == r2.height) @@ -43,7 +43,7 @@ typedef struct Strut { } Strut; #define STRUT_SET(s, l, t, r, b) \ - s.left = l, s.top = t, s.right = r, s.bottom = b + s.left = (l), s.top = (t), s.right = (r), s.bottom = (b) #define STRUT_ADD(s1, s2) \ s1.left = MAX(s1.left, s2.left), s1.right = MAX(s1.right, s2.right), \