X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fgeom.h;h=003b0081dbe9f8221df8961db0eb4eeb02e5aae7;hb=6d0f44e1d15b258fb29f303e2799b3184e4dcb3a;hp=c71dbc239a79d2af83b21793d63e85ff612526a6;hpb=7a6a516b8e3d8ad6b15379eabf6652a6f43eab27;p=chaz%2Fopenbox diff --git a/openbox/geom.h b/openbox/geom.h index c71dbc23..003b0081 100644 --- a/openbox/geom.h +++ b/openbox/geom.h @@ -20,6 +20,24 @@ #ifndef __geom_h #define __geom_h +#include + +typedef struct _GravityCoord { + gint pos; + gint denom; + gboolean center; + gboolean opposite; +} GravityCoord; + +typedef struct _GravityPoint { + GravityCoord x; + GravityCoord y; +} GravityPoint; + +#define GRAVITY_COORD_SET(c, p, cen, opp) \ + (c).pos = (p), (c).center = (cen), (c).opposite = (opp) + + typedef struct _Point { int x; int y; @@ -142,7 +160,7 @@ typedef struct _StrutPartial { (s1).bottom_start == (s2).bottom_start && \ (s1).bottom_end == (s2).bottom_end) -#define RANGE_INTERSECT(r1x, r1w, r2x, r2w) \ - (r1x < r2x + r2w && r1x + r1w > r2x) +#define RANGES_INTERSECT(r1x, r1w, r2x, r2w) \ + (r1w && r2w && r1x < r2x + r2w && r1x + r1w > r2x) #endif