X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fgeom.h;h=ae0e58301f5c1cfd9d366772f5f9606d8a57f659;hb=f8fb32b159bfb6ddc3d057783005cd991ff52eac;hp=c958f9c17d2f2099abb7408cb99dba60c92bbbd1;hpb=3d6b970a4b25627e00fb4a4de6706fe067d58186;p=chaz%2Fopenbox diff --git a/openbox/geom.h b/openbox/geom.h index c958f9c1..ae0e5830 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,10 +43,10 @@ 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); \ - s1.top = MAX(s1.top, s2.top); s1.bottom = MAX(s1.bottom, s2.bottom); } + s1.left = MAX(s1.left, s2.left), s1.right = MAX(s1.right, s2.right), \ + s1.top = MAX(s1.top, s2.top), s1.bottom = MAX(s1.bottom, s2.bottom) #endif