summaryrefslogtreecommitdiff
path: root/hw/xnest/GC.c
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-14 16:49:22 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-14 16:49:22 +0000
commitd568221710959cf7d783e6ff0fb80fb43a231124 (patch)
tree8d6f039393294c6ffac8533639afdebe5d68bfc1 /hw/xnest/GC.c
parent9508a382f8a9f241dab097d921b6d290c1c3a776 (diff)
Diffstat (limited to 'hw/xnest/GC.c')
-rw-r--r--hw/xnest/GC.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/hw/xnest/GC.c b/hw/xnest/GC.c
index 3e16c95c2..0816957de 100644
--- a/hw/xnest/GC.c
+++ b/hw/xnest/GC.c
@@ -12,6 +12,8 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
+/* $XFree86: xc/programs/Xserver/hw/xnest/GC.c,v 3.6 2001/10/28 03:34:11 tsi Exp $ */
+
#include "X.h"
#include "Xproto.h"
#include "gcstruct.h"
@@ -130,11 +132,12 @@ void xnestChangeGC(pGC, mask)
if (mask & GCFillRule)
values.fill_rule = pGC->fillRule;
- if (mask & GCTile)
+ if (mask & GCTile) {
if (pGC->tileIsPixel)
mask &= ~GCTile;
else
values.tile = xnestPixmap(pGC->tile.pixmap);
+ }
if (mask & GCStipple)
values.stipple = xnestPixmap(pGC->stipple);
@@ -279,9 +282,8 @@ void xnestChangeClip(pGC, type, pValue, nRects)
* other parts of server can only deal with CT_NONE,
* CT_PIXMAP and CT_REGION client clips.
*/
- pGC->clientClip = (pointer) (*pGC->pScreen->RectsToRegion)(nRects,
- (xRectangle *)pValue,
- type);
+ pGC->clientClip = (pointer) RECTS_TO_REGION(pGC->pScreen, nRects,
+ (xRectangle *)pValue, type);
xfree(pValue);
pValue = pGC->clientClip;
type = CT_REGION;
@@ -326,8 +328,6 @@ void xnestCopyClip(pGCDst, pGCSrc)
GCPtr pGCDst;
{
RegionPtr pRgn;
- int nRects, size;
- xRectangle *pRects;
switch (pGCSrc->clientClipType)
{