diff options
| author | Adam Jackson <ajax@redhat.com> | 2008-07-24 09:00:22 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2008-07-24 15:46:08 -0400 |
| commit | d6228cb22aa89b90834d80d98b91862c1fc01b54 (patch) | |
| tree | 4e284d35f26e728cfe5c4502f25ddf1c5591aa58 /include/windowstr.h | |
| parent | 990fc643ae90c034187707e7de414d80640ec6da (diff) | |
Shape extension is built-in and mandatory.
Diffstat (limited to 'include/windowstr.h')
| -rw-r--r-- | include/windowstr.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/windowstr.h b/include/windowstr.h index 2d11f6ec7..76501c726 100644 --- a/include/windowstr.h +++ b/include/windowstr.h @@ -108,11 +108,9 @@ typedef struct _WindowOpt { PropertyPtr userProps; /* default: NULL */ unsigned long backingBitPlanes; /* default: ~0L */ unsigned long backingPixel; /* default: 0 */ -#ifdef SHAPE RegionPtr boundingShape; /* default: NULL */ RegionPtr clipShape; /* default: NULL */ RegionPtr inputShape; /* default: NULL */ -#endif struct _OtherInputMasks *inputMasks; /* default: NULL */ DevCursorList deviceCursors; /* default: NULL */ struct _GenericClientMasks *geMasks; /* default: NULL */ @@ -217,21 +215,15 @@ extern Mask DontPropagateMasks[]; #define wUserProps(w) wUseDefault(w, userProps, NULL) #define wBackingBitPlanes(w) wUseDefault(w, backingBitPlanes, ~0L) #define wBackingPixel(w) wUseDefault(w, backingPixel, 0) -#ifdef SHAPE #define wBoundingShape(w) wUseDefault(w, boundingShape, NULL) #define wClipShape(w) wUseDefault(w, clipShape, NULL) #define wInputShape(w) wUseDefault(w, inputShape, NULL) -#endif #define wClient(w) (clients[CLIENT_ID((w)->drawable.id)]) #define wBorderWidth(w) ((int) (w)->borderWidth) /* true when w needs a border drawn. */ -#ifdef SHAPE #define HasBorder(w) ((w)->borderWidth || wClipShape(w)) -#else -#define HasBorder(w) ((w)->borderWidth) -#endif typedef struct _ScreenSaverStuff { WindowPtr pWindow; |