diff options
Diffstat (limited to 'mfb/mfbgc.c')
| -rw-r--r-- | mfb/mfbgc.c | 60 |
1 files changed, 52 insertions, 8 deletions
diff --git a/mfb/mfbgc.c b/mfb/mfbgc.c index 314af0b4a..1119f66f9 100644 --- a/mfb/mfbgc.c +++ b/mfb/mfbgc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbgc.c,v 1.8 2003/02/18 21:30:01 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbgc.c,v 1.10 2003/07/16 03:35:16 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -656,7 +656,12 @@ struct commonOps { int rrop; int terminalFont; GCOps *ops; - void (*fillArea)(); + void (*fillArea)( + DrawablePtr /*pDraw*/, + int /*nbox*/, + BoxPtr /*pbox*/, + int /*alu*/, + PixmapPtr /*nop*/); }; static struct commonOps mfbCommonOps[] = { @@ -677,8 +682,8 @@ static struct commonOps mfbCommonOps[] = { #define numberCommonOps (sizeof (mfbCommonOps) / sizeof (mfbCommonOps[0])) static GCOps * -matchCommon (pGC) - GCPtr pGC; +matchCommon ( + GCPtr pGC) { int i; struct commonOps *cop; @@ -743,6 +748,45 @@ mfbCreateGC(pGC) return TRUE; } +/* some noop functions */ +static void +mfbPolyGlyphBltNoop( + DrawablePtr pDrawable, + GCPtr pGC, + int x, + int y, + unsigned int nglyph, + CharInfoPtr * ppci, + pointer pglyphBase) +{ + /* this is a no-op function */ +} + +static void +mfbNoopFS( + DrawablePtr pDrawable, + GCPtr pGC, + int nInit, + DDXPointPtr pptInit, + int * pwidthInit, + int fSorted) +{ + /* this is a no-op function */ +} + +static void +mfbFillPolyNoop( + DrawablePtr pDrawable, + GCPtr pGC, + int shape, + int mode, + int count, + DDXPointPtr ptsIn) +{ + /* this is a no-op function */ +} + + /* Clipping conventions if the drawable is a window CT_REGION ==> pCompositeClip really is the composite @@ -1107,7 +1151,7 @@ mfbValidateGC(pGC, changes, pDrawable) else if (rrop == RROP_INVERT) pGC->ops->PolyGlyphBlt = mfbPolyGlyphBltInvert; else - pGC->ops->PolyGlyphBlt = (void (*)())NoopDDA; + pGC->ops->PolyGlyphBlt = mfbPolyGlyphBltNoop; } else { @@ -1144,8 +1188,8 @@ mfbValidateGC(pGC, changes, pDrawable) pGC->ops->FillPolygon = mfbFillPolyInvert; break; case RROP_NOP: - pGC->ops->FillSpans = (void (*)())NoopDDA; - pGC->ops->FillPolygon = (void (*)())NoopDDA; + pGC->ops->FillSpans = mfbNoopFS; + pGC->ops->FillPolygon = mfbFillPolyNoop; break; } } @@ -1174,7 +1218,7 @@ mfbValidateGC(pGC, changes, pDrawable) pGC->ops->FillSpans = mfbInvertStippleFS; break; case RROP_NOP: - pGC->ops->FillSpans = (void (*)())NoopDDA; + pGC->ops->FillSpans = mfbNoopFS; break; } } |