From e30032d0bbbf0bf71e1b53a4ac388f3bd6f68e53 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 1 Dec 2008 21:14:01 +1000 Subject: [PATCH] Xext: clean up XGE macros. Signed-off-by: Peter Hutterer --- Xext/geext.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Xext/geext.h b/Xext/geext.h index 3074431aa..65ce1a7a7 100644 --- a/Xext/geext.h +++ b/Xext/geext.h @@ -68,12 +68,13 @@ typedef struct _GEExtension { /* All registered extensions and their handling functions. */ extern _X_EXPORT GEExtension GEExtensions[MAXEXTENSIONS]; -/* Returns the extension offset from the event */ -#define GEEXT(ev) (((xGenericEvent*)(ev))->extension) - -#define GEEXTIDX(ev) (GEEXT(ev) & 0x7F) /* Typecast to generic event */ #define GEV(ev) ((xGenericEvent*)(ev)) +/* Returns the extension offset from the event */ +#define GEEXT(ev) (GEV(ev)->extension) + +/* Return zero-based extension offset (offset - 128). Only for use in arrays */ +#define GEEXTIDX(ev) (GEEXT(ev) & 0x7F) /* True if mask is set for extension on window */ #define GEMaskIsSet(pWin, extension, mask) \ ((pWin)->optional && \ @@ -89,9 +90,9 @@ extern _X_EXPORT GEExtension GEExtensions[MAXEXTENSIONS]; GEExtensions[GEEXTIDX(xE)].evfill #define GEIsType(ev, ext, ev_type) \ - ((ev->u.u.type == GenericEvent) && \ - ((xGenericEvent*)(ev))->extension == ext && \ - ((xGenericEvent*)(ev))->evtype == ev_type) + ((GEV(ev)->type == GenericEvent) && \ + GEEXT(ev) == (ext) && \ + GEV(ev)->evtype == (ev_type)) /* Interface for other extensions */