diff options
author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:29:01 +0000 |
---|---|---|
committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:29:01 +0000 |
commit | adc7f9a4ebdfe11d4cd6de9388b63dfe36450b39 (patch) | |
tree | 23eb7becc5360b2cbe16aa8d45529880067f3989 /miext/layer | |
parent | 90f1536dd315cd265bfc7ef35058761a65a01734 (diff) |
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_16
Diffstat (limited to 'miext/layer')
-rw-r--r-- | miext/layer/layerinit.c | 4 | ||||
-rw-r--r-- | miext/layer/layerpict.c | 2 | ||||
-rw-r--r-- | miext/layer/layerstr.h | 9 | ||||
-rw-r--r-- | miext/layer/layerwin.c | 10 |
4 files changed, 13 insertions, 12 deletions
diff --git a/miext/layer/layerinit.c b/miext/layer/layerinit.c index dfeae6c2d..6cbca7150 100644 --- a/miext/layer/layerinit.c +++ b/miext/layer/layerinit.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/layer/layerinit.c,v 1.6 2002/11/08 22:19:42 keithp Exp $ + * $XFree86: xc/programs/Xserver/miext/layer/layerinit.c,v 1.7 2003/11/10 18:22:49 tsi Exp $ * * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc. * @@ -273,7 +273,7 @@ LayerCreate (ScreenPtr pScreen, if (pPixmap) pPixmap->refcnt++; } - REGION_INIT (pScreen, &pLay->region, NullBox, 0); + REGION_NULL(pScreen, &pLay->region); /* * Hook the layer at the end of the list */ diff --git a/miext/layer/layerpict.c b/miext/layer/layerpict.c index e233d0271..ef412a2c5 100644 --- a/miext/layer/layerpict.c +++ b/miext/layer/layerpict.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/layer/layerpict.c,v 1.1 2001/05/29 04:54:13 keithp Exp $ + * $XFree86: xc/programs/Xserver/miext/layer/layerpict.c,v 1.2 2003/08/22 19:27:32 eich Exp $ * * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/miext/layer/layerstr.h b/miext/layer/layerstr.h index 1720a536c..401dfd96f 100644 --- a/miext/layer/layerstr.h +++ b/miext/layer/layerstr.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/layer/layerstr.h,v 1.3 2002/11/08 22:19:42 keithp Exp $ + * $XFree86: xc/programs/Xserver/miext/layer/layerstr.h,v 1.4 2003/08/22 19:27:32 eich Exp $ * * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc. * @@ -72,11 +72,11 @@ typedef struct _LayerKind { DestroyPixmapProcPtr DestroyPixmap; CreateGCProcPtr CreateGC; - +#ifdef RENDER CompositeProcPtr Composite; GlyphsProcPtr Glyphs; CompositeRectsProcPtr CompositeRects; - +#endif } LayerKindRec; #define LayerWrap(orig,lay,member,func) \ @@ -194,6 +194,7 @@ layerDestroyPixmap (PixmapPtr pPixmap); Bool layerCreateGC (GCPtr pGC); +#ifdef RENDER void layerComposite (CARD8 op, PicturePtr pSrc, @@ -224,7 +225,7 @@ layerCompositeRects (CARD8 op, xRenderColor *color, int nRect, xRectangle *rects); - +#endif void layerValidateGC(GCPtr, unsigned long, DrawablePtr); void layerChangeGC(GCPtr, unsigned long); void layerCopyGC(GCPtr, unsigned long, GCPtr); diff --git a/miext/layer/layerwin.c b/miext/layer/layerwin.c index 8160000c8..44a5df24c 100644 --- a/miext/layer/layerwin.c +++ b/miext/layer/layerwin.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/layer/layerwin.c,v 1.7 2002/11/08 22:19:42 keithp Exp $ + * $XFree86: xc/programs/Xserver/miext/layer/layerwin.c,v 1.8 2003/11/10 18:22:49 tsi Exp $ * * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc. * @@ -35,16 +35,16 @@ NewLayerList (ScreenPtr pScreen, LayerPtr pLayer) pLayList->pNext = 0; pLayList->pLayer = pLayer; pLayList->inheritClip = TRUE; - REGION_INIT (pScreen, &pLayList->clipList, NullBox, 0); - REGION_INIT (pScreen, &pLayList->borderClip, NullBox, 0); + REGION_NULL (pScreen, &pLayList->clipList); + REGION_NULL (pScreen, &pLayList->borderClip); return pLayList; } static void FreeLayerList (ScreenPtr pScreen, LayerListPtr pLayList) { - REGION_UNINIT (&pScreen, &pLayList->clipList); - REGION_UNINIT (&pScreen, &pLayList->borderClip); + REGION_UNINIT (pScreen, &pLayList->clipList); + REGION_UNINIT (pScreen, &pLayList->borderClip); xfree (pLayList); } |