Attachment #44214 for bug #61063

Lines 79-86 Link Here

(-)afb/afbbres.c (-3 / +3 lines)
79	register int yinc; /* increment to next scanline, in bytes */	79	register int yinc; /* increment to next scanline, in bytes */
80	register PixelType addrl; / bitmask long pointer */	80	register PixelType addrl; / bitmask long pointer */
81	register PixelType bit; /* current bit being set/cleared/etc. */	81	register PixelType bit; /* current bit being set/cleared/etc. */
82	PixelType leftbit = mask[0]; /* leftmost bit to process in new word */	82	PixelType leftbit = mfbGetmask(0); /* leftmost bit to process in new word */
83	PixelType rightbit = mask[PPW-1]; /* rightmost bit to process in new word */	83	PixelType rightbit = mfbGetmask(PPW-1); /* rightmost bit to process in new word */
84		84
85	register int e3 = e2-e1;	85	register int e3 = e2-e1;
86	PixelType tmp;	86	PixelType tmp;
Lines 103-109 Link Here
103	addrlbase += sizeDst; /* @@@ NEXT PLANE @@@ */	103	addrlbase += sizeDst; /* @@@ NEXT PLANE @@@ */
104	len = saveLen;	104	len = saveLen;
105	e = saveE;	105	e = saveE;
106	bit = mask[x1 & PIM];	106	bit = mfbGetmask(x1 & PIM);
107		107
108	switch (rrops[d]) {	108	switch (rrops[d]) {
109	case RROP_BLACK:	109	case RROP_BLACK:

Lines 93-100 Link Here

(-)afb/afbbresd.c (-3 / +3 lines)
93	register PixelType *addrl;	93	register PixelType *addrl;
94	register int e3 = e2-e1;	94	register int e3 = e2-e1;
95	register unsigned long bit;	95	register unsigned long bit;
96	PixelType leftbit = mask[0]; /* leftmost bit to process in new word */	96	PixelType leftbit = mfbGetmask(0); /* leftmost bit to process in new word */
97	PixelType rightbit = mask[PPW-1]; /* rightmost bit to process in new word */	97	PixelType rightbit = mfbGetmask(PPW-1); /* rightmost bit to process in new word */
98	int dashIndex;	98	int dashIndex;
99	int dashOffset;	99	int dashOffset;
100	int dashRemaining;	100	int dashRemaining;
Lines 125-131 Link Here
125		125
126	e = saveE;	126	e = saveE;
127	len = saveLen;	127	len = saveLen;
128	bit = mask[x1 & PIM];	128	bit = mfbGetmask(x1 & PIM);
129		129
130	rop = fgrop;	130	rop = fgrop;
131	if (!isDoubleDash)	131	if (!isDoubleDash)

Lines 102-108 Link Here

(-)afb/afbclip.c (-1 / +1 lines)
102	register BoxPtr prectO, prectN;	102	register BoxPtr prectO, prectN;
103	BoxPtr FirstRect, rects, prectLineStart;	103	BoxPtr FirstRect, rects, prectLineStart;
104	Bool fInBox, fSame;	104	Bool fInBox, fSame;
105	register PixelType mask0 = mask[0];	105	register PixelType mask0 = mfbGetmask(0);
106	PixelType *pwLine;	106	PixelType *pwLine;
107	int nWidth;	107	int nWidth;
108		108





		switch (rrops[d]) {
			case RROP_BLACK:
				bitmask = mfbGetrmask(x1 & PIM);
				Duff(len, *addrl &= bitmask; afbScanlineInc(addrl, nlwidth) );
				break;

			case RROP_WHITE:
				bitmask = mfbGetmask(x1 & PIM);
				Duff(len, *addrl |= bitmask; afbScanlineInc(addrl, nlwidth) );
				break;

			case RROP_INVERT:
				bitmask = mfbGetmask(x1 & PIM);
				Duff(len, *addrl ^= bitmask; afbScanlineInc(addrl, nlwidth) );
				break;






					switch(rrops[d]) {
						case RROP_BLACK:
							*addrl &= mfbGetrmask(x2 & PIM);
							break;
						case RROP_WHITE:
							*addrl |= mfbGetmask(x2 & PIM);
							break;
						case RROP_INVERT:
							*addrl ^= mfbGetmask(x2 & PIM);
							break;
						case RROP_NOP:
							break;


					switch (rop) {
						case RROP_BLACK:
							*addrl &= mfbGetrmask(x2 & PIM);
							break;
						case RROP_WHITE:
							*addrl |= mfbGetmask(x2 & PIM);
							break;

						case RROP_INVERT:
							*addrl ^= mfbGetmask(x2 & PIM);
							break;

						case RROP_NOP:

Lines 30-35 Link Here

(-)afb/afbmodule.c (-1 / +11 lines)
30	#include "xf86Module.h"	30	#include "xf86Module.h"
31	#include "afb.h"	31	#include "afb.h"
32		32
		33	static MODULESETUPPROTO(afbSetup);
		34
33	static XF86ModuleVersionInfo VersRec =	35	static XF86ModuleVersionInfo VersRec =
34	{	36	{
35	"afb",	37	"afb",
Lines 44-49 Link Here
44	{0,0,0,0} /* signature, to be patched into the file by a tool */	46	{0,0,0,0} /* signature, to be patched into the file by a tool */
45	};	47	};
46		48
47	XF86ModuleData afbModuleData = { &VersRec, NULL, NULL };	49	XF86ModuleData afbModuleData = { &VersRec, afbSetup, NULL };
		50
		51	static pointer
		52	afbSetup(pointer module, pointer opts, int errmaj, int errmin)
		53	{
		54	/* This modules requires mfb, so load it */
		55	return LoadSubModule(module, "mfb", NULL, NULL, NULL, NULL,
		56	errmaj, errmin);
		57	}
48		58
49	#endif	59	#endif

Lines 164-170 Link Here

(-)afb/afbpixmap.c (-2 / +2 lines)
164	if (rep*width != PPW)	164	if (rep*width != PPW)
165	return;	165	return;
166		166
167	mask = endtab[width];	167	mask = mfbGetendtab(width);
168		168
169	p = (PixelType *)(pPixmap->devPrivate.ptr);	169	p = (PixelType *)(pPixmap->devPrivate.ptr);
170		170
Lines 206-212 Link Here
206	while(pw < pwFinal) {	206	while(pw < pwFinal) {
207	t = *pw;	207	t = *pw;
208	*pw++ = SCRRIGHT(t, rw) \|	208	*pw++ = SCRRIGHT(t, rw) \|
209	(SCRLEFT(t, (PPW-rw)) & endtab[rw]);	209	(SCRLEFT(t, (PPW-rw)) & mfbGetendtab(rw));
210	}	210	}
211	} else {	211	} else {
212	/* We no longer do this. Validate doesn't try to rotate odd-size	212	/* We no longer do this. Validate doesn't try to rotate odd-size

Lines 113-119 Link Here

(-)afb/afbpolypnt.c (-3 / +3 lines)
113	y = ppt->y + pDrawable->y;	113	y = ppt->y + pDrawable->y;
114	if ((x >= pbox->x1) && (x < pbox->x2) &&	114	if ((x >= pbox->x1) && (x < pbox->x2) &&
115	(y >= pbox->y1) && (y < pbox->y2))	115	(y >= pbox->y1) && (y < pbox->y2))
116	*afbScanline(addrl, x, y, nlwidth) &= rmask[x & PIM];	116	*afbScanline(addrl, x, y, nlwidth) &= mfbGetrmask(x & PIM);
117	}	117	}
118	break;	118	break;
119		119
Lines 123-129 Link Here
123	y = ppt->y + pDrawable->y;	123	y = ppt->y + pDrawable->y;
124	if ((x >= pbox->x1) && (x < pbox->x2) &&	124	if ((x >= pbox->x1) && (x < pbox->x2) &&
125	(y >= pbox->y1) && (y < pbox->y2))	125	(y >= pbox->y1) && (y < pbox->y2))
126	*afbScanline(addrl, x, y, nlwidth) \|= mask[x & PIM];	126	*afbScanline(addrl, x, y, nlwidth) \|= mfbGetmask(x & PIM);
127	}	127	}
128	break;	128	break;
129		129
Lines 133-139 Link Here
133	y = ppt->y + pDrawable->y;	133	y = ppt->y + pDrawable->y;
134	if ((x >= pbox->x1) && (x < pbox->x2) &&	134	if ((x >= pbox->x1) && (x < pbox->x2) &&
135	(y >= pbox->y1) && (y < pbox->y2))	135	(y >= pbox->y1) && (y < pbox->y2))
136	*afbScanline(addrl, x, y, nlwidth) ^= mask[x & PIM];	136	*afbScanline(addrl, x, y, nlwidth) ^= mfbGetmask(x & PIM);
137	}	137	}
138	break;	138	break;
139		139

Lines 184-190 Link Here

(-)afb/afbpushpxl.c (-2 / +2 lines)
184	pwEnd = pwLineStart + dxDivPPW;	184	pwEnd = pwLineStart + dxDivPPW;
185	while(pw < pwEnd) {	185	while(pw < pwEnd) {
186	w = *pw;	186	w = *pw;
187	mask = endtab[1];	187	mask = mfbGetendtab(1);
188	for(ib = 0; ib < PPW; ib++) {	188	for(ib = 0; ib < PPW; ib++) {
189	if(w & mask) {	189	if(w & mask) {
190	if(!fInBox) {	190	if(!fInBox) {
Lines 214-220 Link Here
214	if(ibEnd) {	214	if(ibEnd) {
215	/* Process final partial word on line */	215	/* Process final partial word on line */
216	w = *pw;	216	w = *pw;
217	mask = endtab[1];	217	mask = mfbGetendtab(1);
218	for(ib = 0; ib < ibEnd; ib++) {	218	for(ib = 0; ib < ibEnd; ib++) {
219	if(w & mask) {	219	if(w & mask) {
220	if(!fInBox) {	220	if(!fInBox) {

Lines 296-302 Link Here

(-)afb/afbtegblt.c (-1 / +1 lines)
296	widthGlyphs = widthGlyph * PGSZB;	296	widthGlyphs = widthGlyph * PGSZB;
297		297
298	#ifdef USE_LEFTBITS	298	#ifdef USE_LEFTBITS
299	glyphMask = endtab[widthGlyph];	299	glyphMask = mfbGetendtab(widthGlyph);
300	glyphBytes = GLYPHWIDTHBYTESPADDED(*ppci);	300	glyphBytes = GLYPHWIDTHBYTESPADDED(*ppci);
301	#endif	301	#endif
302		302

Lines 65-70 Link Here

(-)cfb/Imakefile.inc (-1 / +2 lines)
65	XFMODOBJ = cfbmodule.o	65	XFMODOBJ = cfbmodule.o
66	#endif	66	#endif
67		67
		68	XCOMM THIS IS STUPID
68	#if !(defined(IHaveModules) && defined(LinkDirectory))	69	#if !(defined(IHaveModules) && defined(LinkDirectory))
69	CFBCMAP = cfbcmap.o	70	CFBCMAP = cfbcmap.o
70	#endif	71	#endif
Lines 91-97 Link Here
91	cfbtileoddC.o cfbtileoddG.o cfbtile32C.o cfbtile32G.o \	92	cfbtileoddC.o cfbtileoddG.o cfbtile32C.o cfbtile32G.o \
92	cfbfillsp.o cfbsetsp.o cfbscrinit.o cfballpriv.o \	93	cfbfillsp.o cfbsetsp.o cfbscrinit.o cfballpriv.o \
93	cfbpntwin.o cfbmskbits.o cfbpixmap.o \	94	cfbpntwin.o cfbmskbits.o cfbpixmap.o \
94	$(CFBCMAP) cfbzerarcC.o cfbzerarcX.o cfbzerarcG.o \	95	cfbcmap.o cfbzerarcC.o cfbzerarcX.o cfbzerarcG.o \
95	cfbfillarcC.o cfbfillarcG.o \	96	cfbfillarcC.o cfbfillarcG.o \
96	cfbigblt8.o cfbglblt8.o cfbtegblt.o cfbbstore.o \	97	cfbigblt8.o cfbglblt8.o cfbtegblt.o cfbbstore.o \
97	cfbpolypnt.o \	98	cfbpolypnt.o \

Lines 42-48 Link Here

(-)cfb/cfballpriv.c (-1 / +1 lines)
42	#include "cfbmskbits.h"	42	#include "cfbmskbits.h"
43	#include "mibstore.h"	43	#include "mibstore.h"
44		44
45	#if PSZ==8	45	#if 1 \|\| PSZ==8
46	int cfbWindowPrivateIndex;	46	int cfbWindowPrivateIndex;
47	int cfbGCPrivateIndex;	47	int cfbGCPrivateIndex;
48	#endif	48	#endif




#else /* PSZ == 8 */

#define mfbmaskbits(x, w, startmask, endmask, nlw) \
    startmask = mfbGetstarttab((x)&0x1f); \
    endmask = mfbGetendtab(((x)+(w)) & 0x1f); \
    if (startmask) \
	nlw = (((w) - (32 - ((x)&0x1f))) >> 5); \
    else \
	nlw = (w) >> 5;

#define mfbmaskpartialbits(x, w, mask) \
    mask = mfbGetpartmasks((x)&0x1f,(w)&0x1f);

#define LeftMost    0
#define StepBit(bit, inc)  ((bit) += (inc))


	oldalu = pGC->alu;
    	if ((pGC->fgPixel & 1) == 0 && (pGC->bgPixel&1) == 1)
	    pGC->alu = mfbGetInverseAlu(pGC->alu);
    	else if ((pGC->fgPixel & 1) == (pGC->bgPixel & 1))
	    pGC->alu = mfbReduceRop(pGC->alu, pGC->fgPixel);
	ret = cfbCopyPlaneReduce(pSrcDrawable, pDstDrawable,




#else /*  PSZ == 8 */

#define mfbmaskbits(x, w, startmask, endmask, nlw) \
    startmask = mfbGetstarttab((x)&0x1f); \
    endmask = mfbGetendtab(((x)+(w)) & 0x1f); \
    if (startmask) \
	nlw = (((w) - (32 - ((x)&0x1f))) >> 5); \
    else \
	nlw = (w) >> 5;

#define mfbmaskpartialbits(x, w, mask) \
    mask = mfbGetpartmasks((x)&0x1f,(w)&0x1f);

#define LeftMost    0
#define StepBit(bit, inc)  ((bit) += (inc))

Lines 85-95 Link Here

(-)cfb/cfbgc.c (-2 / +26 lines)
85	# define usePolyGlyphBlt miPolyGlyphBlt	85	# define usePolyGlyphBlt miPolyGlyphBlt
86	#endif	86	#endif
87		87
		88	void cfbUnPushPixels (GCPtr, PixmapPtr, DrawablePtr, int, int, int, int);
		89
88	#ifdef FOUR_BIT_CODE	90	#ifdef FOUR_BIT_CODE
89	# define usePushPixels cfbPushPixels8	91	# define usePushPixels cfbPushPixels8
90	#else	92	#else
91	#ifndef LOWMEMFTPT	93	#ifndef LOWMEMFTPT
92	# define usePushPixels mfbPushPixels	94	# define usePushPixels cfbUnPushPixels
93	#else	95	#else
94	# define usePushPixels miPushPixels	96	# define usePushPixels miPushPixels
95	#endif /* ifndef LOWMEMFTPT */	97	#endif /* ifndef LOWMEMFTPT */
Lines 284-289 Link Here
284	pGC->clientClip = NULL;	286	pGC->clientClip = NULL;
285	pGC->clientClipType = CT_NONE;	287	pGC->clientClipType = CT_NONE;
286		288
		289	if (cfbNonTEOps.PushPixels == cfbUnPushPixels)
		290	{
		291	cfbTEOps1Rect.PushPixels = mfbPushPixelsWeak();
		292	cfbNonTEOps1Rect.PushPixels = mfbPushPixelsWeak();
		293	cfbTEOps.PushPixels = mfbPushPixelsWeak();
		294	cfbNonTEOps.PushPixels = mfbPushPixelsWeak();
		295	}
		296
287	/*	297	/*
288	* some of the output primitives aren't really necessary, since they	298	* some of the output primitives aren't really necessary, since they
289	* will be filled in ValidateGC because of dix/CreateGC() setting all	299	* will be filled in ValidateGC because of dix/CreateGC() setting all
Lines 767-773 Link Here
767	#endif	777	#endif
768	#ifdef FOUR_BIT_CODE	778	#ifdef FOUR_BIT_CODE
769	#ifndef LOWMEMFTPT	779	#ifndef LOWMEMFTPT
770	pGC->ops->PushPixels = mfbPushPixels;	780	pGC->ops->PushPixels = mfbPushPixelsWeak();
771	#else	781	#else
772	pGC->ops->PushPixels = miPushPixels;	782	pGC->ops->PushPixels = miPushPixels;
773	#endif /* ifndef LOWMEMFTPT */	783	#endif /* ifndef LOWMEMFTPT */
Lines 789-791 Link Here
789	}	799	}
790	}	800	}
791	}	801	}
		802
		803	/*
		804	* this is never called, it just exists to have its address
		805	* taken in mfbCreateGC.
		806	*/
		807	static void
		808	cfbUnPushPixels (pGC, pBitmap, pDrawable, dx, dy, xOrg, yOrg)
		809	GCPtr pGC;
		810	PixmapPtr pBitmap;
		811	DrawablePtr pDrawable;
		812	int dx, dy, xOrg, yOrg;
		813	{
		814	return;
		815	}





#ifdef USE_LEFTBITS
typedef	unsigned char	*glyphPointer;
extern CfbBits endtab[];

#define GlyphBits(bits,width,dst)	getleftbits(bits,width,dst); \
					(dst) &= widthMask; \

#ifdef USE_LEFTBITS
	    w = pci->metrics.rightSideBearing - pci->metrics.leftSideBearing;
	    widthGlyph = PADGLYPHWIDTHBYTES(w);
	    widthMask = mfbGetendtab(w);
#endif
	    do {
	    	dst = dstLine;

#ifdef USE_LEFTBITS
	    w = pci->metrics.rightSideBearing - pci->metrics.leftSideBearing;
	    widthGlyph = PADGLYPHWIDTHBYTES(w);
	    widthMask = mfbGetendtab(w);
#endif
	    switch (cfb8ComputeClipMasks32 (pBox, numRects, xG, yG, w, hTmp, clips))
 	    {

Lines 94-106 Link Here

(-)cfb/cfbmap.h (+14 lines)
94	#undef cfbFillSpanTileOddGeneral	94	#undef cfbFillSpanTileOddGeneral
95	#undef cfbFinishScreenInit	95	#undef cfbFinishScreenInit
96	#undef cfbGCFuncs	96	#undef cfbGCFuncs
		97	#undef cfbGCPrivateIndex
97	#undef cfbGetImage	98	#undef cfbGetImage
98	#undef cfbGetScreenPixmap	99	#undef cfbGetScreenPixmap
99	#undef cfbGetSpans	100	#undef cfbGetSpans
100	#undef cfbHorzS	101	#undef cfbHorzS
101	#undef cfbImageGlyphBlt8	102	#undef cfbImageGlyphBlt8
		103	#undef cfbInitializeColormap
		104	#undef cfbInstallColormap
102	#undef cfbLineSD	105	#undef cfbLineSD
103	#undef cfbLineSS	106	#undef cfbLineSS
		107	#undef cfbListInstalledColormaps
104	#undef cfbMapWindow	108	#undef cfbMapWindow
105	#undef cfbMatchCommon	109	#undef cfbMatchCommon
106	#undef cfbNonTEOps	110	#undef cfbNonTEOps
Lines 116-121 Link Here
116	#undef cfbPositionWindow	120	#undef cfbPositionWindow
117	#undef cfbPutImage	121	#undef cfbPutImage
118	#undef cfbReduceRasterOp	122	#undef cfbReduceRasterOp
		123	#undef cfbResolveColor
119	#undef cfbRestoreAreas	124	#undef cfbRestoreAreas
120	#undef cfbSaveAreas	125	#undef cfbSaveAreas
121	#undef cfbScreenInit	126	#undef cfbScreenInit
Lines 136-146 Link Here
136	#undef cfbTEOps1Rect	141	#undef cfbTEOps1Rect
137	#undef cfbTile32FSCopy	142	#undef cfbTile32FSCopy
138	#undef cfbTile32FSGeneral	143	#undef cfbTile32FSGeneral
		144	#undef cfbUninstallColormap
139	#undef cfbUnmapWindow	145	#undef cfbUnmapWindow
140	#undef cfbUnnaturalStippleFS	146	#undef cfbUnnaturalStippleFS
141	#undef cfbUnnaturalTileFS	147	#undef cfbUnnaturalTileFS
142	#undef cfbValidateGC	148	#undef cfbValidateGC
143	#undef cfbVertS	149	#undef cfbVertS
		150	#undef cfbWindowPrivateIndex
144	#undef cfbXRotatePixmap	151	#undef cfbXRotatePixmap
145	#undef cfbYRotatePixmap	152	#undef cfbYRotatePixmap
146	#undef cfbZeroPolyArcSS8Copy	153	#undef cfbZeroPolyArcSS8Copy
Lines 263-275 Link Here
263	#define cfbFillSpanTileOddGeneral CFBNAME(FillSpanTileOddGeneral)	270	#define cfbFillSpanTileOddGeneral CFBNAME(FillSpanTileOddGeneral)
264	#define cfbFinishScreenInit CFBNAME(FinishScreenInit)	271	#define cfbFinishScreenInit CFBNAME(FinishScreenInit)
265	#define cfbGCFuncs CFBNAME(GCFuncs)	272	#define cfbGCFuncs CFBNAME(GCFuncs)
		273	#define cfbGCPrivateIndex CFBNAME(GCPrivateIndex)
266	#define cfbGetImage CFBNAME(GetImage)	274	#define cfbGetImage CFBNAME(GetImage)
267	#define cfbGetScreenPixmap CFBNAME(GetScreenPixmap)	275	#define cfbGetScreenPixmap CFBNAME(GetScreenPixmap)
268	#define cfbGetSpans CFBNAME(GetSpans)	276	#define cfbGetSpans CFBNAME(GetSpans)
269	#define cfbHorzS CFBNAME(HorzS)	277	#define cfbHorzS CFBNAME(HorzS)
270	#define cfbImageGlyphBlt8 CFBNAME(ImageGlyphBlt8)	278	#define cfbImageGlyphBlt8 CFBNAME(ImageGlyphBlt8)
		279	#define cfbInitializeColormap CFBNAME(InitializeColormap)
		280	#define cfbInstallColormap CFBNAME(InstallColormap)
271	#define cfbLineSD CFBNAME(LineSD)	281	#define cfbLineSD CFBNAME(LineSD)
272	#define cfbLineSS CFBNAME(LineSS)	282	#define cfbLineSS CFBNAME(LineSS)
		283	#define cfbListInstalledColormaps CFBNAME(ListInstalledColormaps)
273	#define cfbMapWindow CFBNAME(MapWindow)	284	#define cfbMapWindow CFBNAME(MapWindow)
274	#define cfbMatchCommon CFBNAME(MatchCommon)	285	#define cfbMatchCommon CFBNAME(MatchCommon)
275	#define cfbNonTEOps CFBNAME(NonTEOps)	286	#define cfbNonTEOps CFBNAME(NonTEOps)
Lines 285-290 Link Here
285	#define cfbPositionWindow CFBNAME(PositionWindow)	296	#define cfbPositionWindow CFBNAME(PositionWindow)
286	#define cfbPutImage CFBNAME(PutImage)	297	#define cfbPutImage CFBNAME(PutImage)
287	#define cfbReduceRasterOp CFBNAME(ReduceRasterOp)	298	#define cfbReduceRasterOp CFBNAME(ReduceRasterOp)
		299	#define cfbResolveColor CFBNAME(ResolveColor)
288	#define cfbRestoreAreas CFBNAME(RestoreAreas)	300	#define cfbRestoreAreas CFBNAME(RestoreAreas)
289	#define cfbSaveAreas CFBNAME(SaveAreas)	301	#define cfbSaveAreas CFBNAME(SaveAreas)
290	#define cfbScreenInit CFBNAME(ScreenInit)	302	#define cfbScreenInit CFBNAME(ScreenInit)
Lines 305-315 Link Here
305	#define cfbTEOps1Rect CFBNAME(TEOps1Rect)	317	#define cfbTEOps1Rect CFBNAME(TEOps1Rect)
306	#define cfbTile32FSCopy CFBNAME(Tile32FSCopy)	318	#define cfbTile32FSCopy CFBNAME(Tile32FSCopy)
307	#define cfbTile32FSGeneral CFBNAME(Tile32FSGeneral)	319	#define cfbTile32FSGeneral CFBNAME(Tile32FSGeneral)
		320	#define cfbUninstallColormap CFBNAME(UninstallColormap)
308	#define cfbUnmapWindow CFBNAME(UnmapWindow)	321	#define cfbUnmapWindow CFBNAME(UnmapWindow)
309	#define cfbUnnaturalStippleFS CFBNAME(UnnaturalStippleFS)	322	#define cfbUnnaturalStippleFS CFBNAME(UnnaturalStippleFS)
310	#define cfbUnnaturalTileFS CFBNAME(UnnaturalTileFS)	323	#define cfbUnnaturalTileFS CFBNAME(UnnaturalTileFS)
311	#define cfbValidateGC CFBNAME(ValidateGC)	324	#define cfbValidateGC CFBNAME(ValidateGC)
312	#define cfbVertS CFBNAME(VertS)	325	#define cfbVertS CFBNAME(VertS)
		326	#define cfbWindowPrivateIndex CFBNAME(WindowPrivateIndex)
313	#define cfbXRotatePixmap CFBNAME(XRotatePixmap)	327	#define cfbXRotatePixmap CFBNAME(XRotatePixmap)
314	#define cfbYRotatePixmap CFBNAME(YRotatePixmap)	328	#define cfbYRotatePixmap CFBNAME(YRotatePixmap)
315	#define cfbZeroPolyArcSS8Copy CFBNAME(ZeroPolyArcSSCopy)	329	#define cfbZeroPolyArcSS8Copy CFBNAME(ZeroPolyArcSSCopy)

Lines 60-67 Link Here

(-)cfb/cfbpixmap.c (-3 / +1 lines)
60	#include "cfb.h"	60	#include "cfb.h"
61	#include "cfbmskbits.h"	61	#include "cfbmskbits.h"
62		62
63	extern CfbBits endtab[];
64
65	PixmapPtr	63	PixmapPtr
66	cfbCreatePixmap (pScreen, width, height, depth)	64	cfbCreatePixmap (pScreen, width, height, depth)
67	ScreenPtr pScreen;	65	ScreenPtr pScreen;
Lines 160-166 Link Here
160	if (rep*width != PGSZ)	158	if (rep*width != PGSZ)
161	return;	159	return;
162		160
163	mask = endtab[width];	161	mask = mfbGetendtab(width);
164		162
165	p = (CfbBits *)(pPixmap->devPrivate.ptr);	163	p = (CfbBits *)(pPixmap->devPrivate.ptr);
166	for (h=0; h < pPixmap->drawable.height; h++)	164	for (h=0; h < pPixmap->drawable.height; h++)




    pScreen->defColormap = FakeClientID(0);
    /* let CreateDefColormap do whatever it wants for pixels */ 
    pScreen->blackPixel = pScreen->whitePixel = (Pixel) 0;
    pScreen->QueryBestSize = mfbQueryBestSizeWeak();
    /* SaveScreen */
    pScreen->GetImage = cfbGetImage;
    pScreen->GetSpans = cfbGetSpans;

    pScreen->CopyWindow = cfbCopyWindow;
    pScreen->CreatePixmap = cfbCreatePixmap;
    pScreen->DestroyPixmap = cfbDestroyPixmap;
    pScreen->RealizeFont = mfbRealizeFontWeak();
    pScreen->UnrealizeFont = mfbUnrealizeFontWeak();
    pScreen->CreateGC = cfbCreateGC;
    pScreen->CreateColormap = cfbInitializeColormap;
    pScreen->DestroyColormap = DestroyColormapNoop;

    pScreen->ListInstalledColormaps = cfbListInstalledColormaps;
    pScreen->StoreColors = StoreColorsNoop;
    pScreen->ResolveColor = cfbResolveColor;
    pScreen->BitmapToRegion = mfbPixmapToRegionWeak();

    mfbRegisterCopyPlaneProc (pScreen, cfbCopyPlane);
    return TRUE;

Lines 4-10 Link Here

(-)cfb/cfbtab.h (+2 lines)
4	#define _CFBTAB_H_	4	#define _CFBTAB_H_
5		5
6	/* prototypes */	6	/* prototypes */
		7	#if 0
7	extern int starttab[32], endtab[32];	8	extern int starttab[32], endtab[32];
8	extern unsigned int partmasks[32][32];	9	extern unsigned int partmasks[32][32];
		10	#endif
9		11
10	#endif /* _CFBTAB_H_ */	12	#endif /* _CFBTAB_H_ */

Lines 160-166 Link Here

(-)cfb/cfbteblt8.c (-2 / +1 lines)
160	#endif	160	#endif
161		161
162	#ifdef USE_LEFTBITS	162	#ifdef USE_LEFTBITS
163	extern CfbBits endtab[];
164		163
165	#define IncChar(c) (c = (glyphPointer) (((char *) c) + glyphBytes))	164	#define IncChar(c) (c = (glyphPointer) (((char *) c) + glyphBytes))
166		165
Lines 408-414 Link Here
408	#endif	407	#endif
409		408
410	#ifdef USE_LEFTBITS	409	#ifdef USE_LEFTBITS
411	glyphMask = endtab[widthGlyph];	410	glyphMask = mfbGetendtab(widthGlyph);
412	glyphBytes = GLYPHWIDTHBYTESPADDED(*ppci);	411	glyphBytes = GLYPHWIDTHBYTESPADDED(*ppci);
413	#endif	412	#endif
414		413

Lines 93-105 Link Here

(-)cfb/cfbunmap.h (+7 lines)
93	#undef cfbFillSpanTileOddGeneral	93	#undef cfbFillSpanTileOddGeneral
94	#undef cfbFinishScreenInit	94	#undef cfbFinishScreenInit
95	#undef cfbGCFuncs	95	#undef cfbGCFuncs
		96	#undef cfbGCPrivateIndex
96	#undef cfbGetImage	97	#undef cfbGetImage
97	#undef cfbGetScreenPixmap	98	#undef cfbGetScreenPixmap
98	#undef cfbGetSpans	99	#undef cfbGetSpans
99	#undef cfbHorzS	100	#undef cfbHorzS
100	#undef cfbImageGlyphBlt8	101	#undef cfbImageGlyphBlt8
		102	#undef cfbInitializeColormap
		103	#undef cfbInstallColormap
101	#undef cfbLineSD	104	#undef cfbLineSD
102	#undef cfbLineSS	105	#undef cfbLineSS
		106	#undef cfbListInstalledColormaps
103	#undef cfbMapWindow	107	#undef cfbMapWindow
104	#undef cfbMatchCommon	108	#undef cfbMatchCommon
105	#undef cfbNonTEOps	109	#undef cfbNonTEOps
Lines 115-120 Link Here
115	#undef cfbPositionWindow	119	#undef cfbPositionWindow
116	#undef cfbPutImage	120	#undef cfbPutImage
117	#undef cfbReduceRasterOp	121	#undef cfbReduceRasterOp
		122	#undef cfbResolveColor
118	#undef cfbRestoreAreas	123	#undef cfbRestoreAreas
119	#undef cfbSaveAreas	124	#undef cfbSaveAreas
120	#undef cfbScreenInit	125	#undef cfbScreenInit
Lines 135-145 Link Here
135	#undef cfbTEOps1Rect	140	#undef cfbTEOps1Rect
136	#undef cfbTile32FSCopy	141	#undef cfbTile32FSCopy
137	#undef cfbTile32FSGeneral	142	#undef cfbTile32FSGeneral
		143	#undef cfbUninstallColormap
138	#undef cfbUnmapWindow	144	#undef cfbUnmapWindow
139	#undef cfbUnnaturalStippleFS	145	#undef cfbUnnaturalStippleFS
140	#undef cfbUnnaturalTileFS	146	#undef cfbUnnaturalTileFS
141	#undef cfbValidateGC	147	#undef cfbValidateGC
142	#undef cfbVertS	148	#undef cfbVertS
		149	#undef cfbWindowPrivateIndex
143	#undef cfbXRotatePixmap	150	#undef cfbXRotatePixmap
144	#undef cfbYRotatePixmap	151	#undef cfbYRotatePixmap
145	#undef cfbZeroPolyArcSS8Copy	152	#undef cfbZeroPolyArcSS8Copy

Lines 1053-1057 Link Here

(-)mfb/maskbits.c (+4 lines)
1053	{ O,O,O,I, }, /* set 0xf 1 */	1053	{ O,O,O,I, }, /* set 0xf 1 */
1054	};	1054	};
1055		1055
		1056	mergeRopPtr mergeGetRopBits(int i) {
		1057	return &mergeRopBits[i];
		1058	}
		1059
1056	#undef O	1060	#undef O
1057	#undef I	1061	#undef I

Lines 396-402 Link Here

(-)mfb/maskbits.h (-1 / +1 lines)
396	else \	396	else \
397	{ \	397	{ \
398	register int d = PPW-(x); \	398	register int d = PPW-(x); \
399	(pdst) = ((pdst) & endtab[x]) \| (SCRRIGHT((src), x)); \	399	(pdst) = ((pdst) & mfbGetendtab(x)) \| (SCRRIGHT((src), x)); \
400	(pdst)[1] = ((pdst)[1] & mfbGetstarttab(n)) \| \	400	(pdst)[1] = ((pdst)[1] & mfbGetstarttab(n)) \| \
401	(SCRLEFT(src, d) & mfbGetendtab(n)); \	401	(SCRLEFT(src, d) & mfbGetendtab(n)); \
402	} \	402	} \




} mergeRopRec, *mergeRopPtr;

extern mergeRopRec	mergeRopBits[16];
extern mergeRopPtr	mergeGetRopBits(int i);

#if defined(PPW) && defined(PGSZ) && (PPW != PGSZ)	/* cfb */
#define DeclareMergeRop() MfbBits   _ca1 = 0, _cx1 = 0, _ca2 = 0, _cx2 = 0;

    MfbBits   _pm; \
    mergeRopPtr  _bits; \
    _pm = PFILL(pm); \
    _bits = mergeGetRopBits(alu); \
    _ca1 = _bits->ca1 &  _pm; \
    _cx1 = _bits->cx1 | ~_pm; \
    _ca2 = _bits->ca2 &  _pm; \

#define InitializeMergeRop24(alu,pm) {\
    register int i; \
    register MfbBits _pm = (pm) & 0xFFFFFF; \
    mergeRopPtr  _bits = mergeGetRopBits(alu); \
    MfbBits _bits_ca1 = _bits->ca1; \
    MfbBits _bits_cx1 = _bits->cx1; \
    MfbBits _bits_ca2 = _bits->ca2; \

#define InitializeMergeRop24(alu,pm) {\
    register int i; \
    register MfbBits _pm = (pm) & cfbmask[0]; \
    mergeRopPtr  _bits = mergeGetRopBits(alu); \
    MfbBits _bits_ca1 = _bits->ca1 & cfbmask[0]; \
    MfbBits _bits_cx1 = _bits->cx1 & cfbmask[0]; \
    MfbBits _bits_ca2 = _bits->ca2 & cfbmask[0]; \

#else /* mfb */
#define InitializeMergeRop(alu,pm) {\
    mergeRopPtr  _bits; \
    _bits = mergeGetRopBits(alu); \
    _ca1 = _bits->ca1; \
    _cx1 = _bits->cx1; \
    _ca2 = _bits->ca2; \

#define MROP_DECLARE_REG()	register MROP_DECLARE()
#define MROP_INITIALIZE(alu,pm)	{ \
    mergeRopPtr  _bits; \
    _bits = mergeGetRopBits(alu); \
    _ca1 = _bits->ca1; \
    _cx1 = _bits->cx1; \
}

Lines 64-70 Link Here

(-)mfb/mfb.h (-1 / +33 lines)
64	#include "mibstore.h"	64	#include "mibstore.h"
65		65
66	extern int InverseAlu[];	66	extern int InverseAlu[];
67		67	extern int mfbGetInverseAlu(int i);
68		68
69	/* warning: PixelType definition duplicated in maskbits.h */	69	/* warning: PixelType definition duplicated in maskbits.h */
70	#ifndef PixelType	70	#ifndef PixelType
Lines 229-234 Link Here
229	extern RegionPtr mfbPixmapToRegion(	229	extern RegionPtr mfbPixmapToRegion(
230	PixmapPtr /pPix/	230	PixmapPtr /pPix/
231	);	231	);
		232
		233	#ifndef MFB_PROTOTYPES_ONLY
		234	typedef RegionPtr (*mfbPixmapToRegionProc)(PixmapPtr);
		235
		236	extern mfbPixmapToRegionProc *mfbPixmapToRegionWeak(void);
		237	#endif
		238
232	/* mfbcmap.c */	239	/* mfbcmap.c */
233		240
234	extern int mfbListInstalledColormaps(	241	extern int mfbListInstalledColormaps(
Lines 371-376 Link Here
371	ScreenPtr /pscr/,	378	ScreenPtr /pscr/,
372	FontPtr /pFont/	379	FontPtr /pFont/
373	);	380	);
		381
		382	#ifndef MFB_PROTOTYPES_ONLY
		383	typedef void (*mfbRealizeFontProc)(ScreenPtr, FontPtr);
		384	typedef void (*mfbUnrealizeFontProc)(ScreenPtr, FontPtr);
		385
		386	extern mfbRealizeFontProc *mfbRealizeFontWeak(void);
		387	extern mfbUnrealizeFontProc *mfbUnrealizeFontWeak(void);
		388	#endif
		389
374	/* mfbgc.c */	390	/* mfbgc.c */
375		391
376	extern Bool mfbCreateGC(	392	extern Bool mfbCreateGC(
Lines 490-495 Link Here
490	unsigned short * /pheight/,	506	unsigned short * /pheight/,
491	ScreenPtr /pScreen/	507	ScreenPtr /pScreen/
492	);	508	);
		509
		510	#ifndef MFB_PROTOTYPES_ONLY
		511	typedef void (mfbQueryBestSizeProc)(int, unsigned short , unsigned short *,
		512	ScreenPtr);
		513
		514	extern mfbQueryBestSizeProc *mfbQueryBestSizeWeak(void);
		515	#endif
		516
493	/* mfbpablack.c */	517	/* mfbpablack.c */
494		518
495	extern void mfbSolidBlackArea(	519	extern void mfbSolidBlackArea(
Lines 680-685 Link Here
680	int /xOrg/,	704	int /xOrg/,
681	int /yOrg/	705	int /yOrg/
682	);	706	);
		707
		708	#ifndef MFB_PROTOTYPES_ONLY
		709	typedef void (*mfbPushPixelsProc)(GCPtr, PixmapPtr, DrawablePtr, int, int,
		710	int, int);
		711
		712	extern mfbPushPixelsProc *mfbPushPixelsWeak(void);
		713	#endif
		714
683	/* mfbscrclse.c */	715	/* mfbscrclse.c */
684		716
685	extern Bool mfbCloseScreen(	717	extern Bool mfbCloseScreen(

Lines 268-270 Link Here

(-)mfb/mfbclip.c (+6 lines)
268	#endif	268	#endif
269	return(pReg);	269	return(pReg);
270	}	270	}
		271
		272	mfbPixmapToRegionProc *
		273	mfbPixmapToRegionWeak(void)
		274	{
		275	return mfbPixmapToRegion;
		276	}

Lines 62-67 Link Here

(-)mfb/mfbfont.c (+12 lines)
62	return (TRUE);	62	return (TRUE);
63	}	63	}
64		64
		65	mfbRealizeFontProc *
		66	mfbRealizeFontWeak(void)
		67	{
		68	return mfbRealizeFont;
		69	}
		70
65	/ARGSUSED/	71	/ARGSUSED/
66	Bool	72	Bool
67	mfbUnrealizeFont( pscr, pFont)	73	mfbUnrealizeFont( pscr, pFont)
Lines 70-72 Link Here
70	{	76	{
71	return (TRUE);	77	return (TRUE);
72	}	78	}
		79
		80	mfbUnrealizeFontProc *
		81	mfbUnrealizeFontWeak(void)
		82	{
		83	return mfbUnrealizeFont;
		84	}

Lines 1454-1459 Link Here

(-)mfb/mfbgc.c (+6 lines)
1454	GXset	1454	GXset
1455	};	1455	};
1456		1456
		1457	int mfbGetInverseAlu(i)
		1458	int i;
		1459	{
		1460	return InverseAlu[i];
		1461	}
		1462
1457	int	1463	int
1458	mfbReduceRop(alu, src)	1464	mfbReduceRop(alu, src)
1459	register int alu;	1465	register int alu;

Lines 89-91 Link Here

(-)mfb/mfbmisc.c (+5 lines)
89	}	89	}
90	}	90	}
91		91
		92	mfbQueryBestSizeProc *
		93	mfbQueryBestSizeWeak(void)
		94	{
		95	return mfbQueryBestSize;
		96	}

Lines 276-278 Link Here

(-)mfb/mfbpushpxl.c (+5 lines)
276	(*pGC->ops->FillSpans)(pDrawable, pGC, ipt, pt, width, TRUE);	276	(*pGC->ops->FillSpans)(pDrawable, pGC, ipt, pt, width, TRUE);
277	}	277	}
278	}	278	}
		279
		280	mfbPushPixelsProc *mfbPushPixelsWeak(void)
		281	{
		282	return mfbPushPixels;
		283	}

Return to bug 61063

Lines 973-987 Link Here

(-)cfb/cfbbitblt.c (-4 / +4 lines)
973	#else /* PSZ == 8 */	973	#else /* PSZ == 8 */
974		974
975	#define mfbmaskbits(x, w, startmask, endmask, nlw) \	975	#define mfbmaskbits(x, w, startmask, endmask, nlw) \
976	startmask = starttab[(x)&0x1f]; \	976	startmask = mfbGetstarttab((x)&0x1f); \
977	endmask = endtab[((x)+(w)) & 0x1f]; \	977	endmask = mfbGetendtab(((x)+(w)) & 0x1f); \
978	if (startmask) \	978	if (startmask) \
979	nlw = (((w) - (32 - ((x)&0x1f))) >> 5); \	979	nlw = (((w) - (32 - ((x)&0x1f))) >> 5); \
980	else \	980	else \
981	nlw = (w) >> 5;	981	nlw = (w) >> 5;
982		982
983	#define mfbmaskpartialbits(x, w, mask) \	983	#define mfbmaskpartialbits(x, w, mask) \
984	mask = partmasks[(x)&0x1f][(w)&0x1f];	984	mask = mfbGetpartmasks((x)&0x1f,(w)&0x1f);
985		985
986	#define LeftMost 0	986	#define LeftMost 0
987	#define StepBit(bit, inc) ((bit) += (inc))	987	#define StepBit(bit, inc) ((bit) += (inc))
Lines 1389-1395 Link Here
1389		1389
1390	oldalu = pGC->alu;	1390	oldalu = pGC->alu;
1391	if ((pGC->fgPixel & 1) == 0 && (pGC->bgPixel&1) == 1)	1391	if ((pGC->fgPixel & 1) == 0 && (pGC->bgPixel&1) == 1)
1392	pGC->alu = InverseAlu[pGC->alu];	1392	pGC->alu = mfbGetInverseAlu(pGC->alu);
1393	else if ((pGC->fgPixel & 1) == (pGC->bgPixel & 1))	1393	else if ((pGC->fgPixel & 1) == (pGC->bgPixel & 1))
1394	pGC->alu = mfbReduceRop(pGC->alu, pGC->fgPixel);	1394	pGC->alu = mfbReduceRop(pGC->alu, pGC->fgPixel);
1395	ret = cfbCopyPlaneReduce(pSrcDrawable, pDstDrawable,	1395	ret = cfbCopyPlaneReduce(pSrcDrawable, pDstDrawable,

Lines 245-259 Link Here

(-)cfb/cfbcppl.c (-3 / +3 lines)
245	#else /* PSZ == 8 */	245	#else /* PSZ == 8 */
246		246
247	#define mfbmaskbits(x, w, startmask, endmask, nlw) \	247	#define mfbmaskbits(x, w, startmask, endmask, nlw) \
248	startmask = starttab[(x)&0x1f]; \	248	startmask = mfbGetstarttab((x)&0x1f); \
249	endmask = endtab[((x)+(w)) & 0x1f]; \	249	endmask = mfbGetendtab(((x)+(w)) & 0x1f); \
250	if (startmask) \	250	if (startmask) \
251	nlw = (((w) - (32 - ((x)&0x1f))) >> 5); \	251	nlw = (((w) - (32 - ((x)&0x1f))) >> 5); \
252	else \	252	else \
253	nlw = (w) >> 5;	253	nlw = (w) >> 5;
254		254
255	#define mfbmaskpartialbits(x, w, mask) \	255	#define mfbmaskpartialbits(x, w, mask) \
256	mask = partmasks[(x)&0x1f][(w)&0x1f];	256	mask = mfbGetpartmasks((x)&0x1f,(w)&0x1f);
257		257
258	#define LeftMost 0	258	#define LeftMost 0
259	#define StepBit(bit, inc) ((bit) += (inc))	259	#define StepBit(bit, inc) ((bit) += (inc))

Lines 186-202 Link Here

(-)afb/afbhrzvert.c (-3 / +3 lines)
186		186
187	switch (rrops[d]) {	187	switch (rrops[d]) {
188	case RROP_BLACK:	188	case RROP_BLACK:
189	bitmask = rmask[x1 & PIM];	189	bitmask = mfbGetrmask(x1 & PIM);
190	Duff(len, *addrl &= bitmask; afbScanlineInc(addrl, nlwidth) );	190	Duff(len, *addrl &= bitmask; afbScanlineInc(addrl, nlwidth) );
191	break;	191	break;
192		192
193	case RROP_WHITE:	193	case RROP_WHITE:
194	bitmask = mask[x1 & PIM];	194	bitmask = mfbGetmask(x1 & PIM);
195	Duff(len, *addrl \|= bitmask; afbScanlineInc(addrl, nlwidth) );	195	Duff(len, *addrl \|= bitmask; afbScanlineInc(addrl, nlwidth) );
196	break;	196	break;
197		197
198	case RROP_INVERT:	198	case RROP_INVERT:
199	bitmask = mask[x1 & PIM];	199	bitmask = mfbGetmask(x1 & PIM);
200	Duff(len, *addrl ^= bitmask; afbScanlineInc(addrl, nlwidth) );	200	Duff(len, *addrl ^= bitmask; afbScanlineInc(addrl, nlwidth) );
201	break;	201	break;
202		202

Lines 401-413 Link Here

(-)afb/afbline.c (-6 / +6 lines)
401		401
402	switch(rrops[d]) {	402	switch(rrops[d]) {
403	case RROP_BLACK:	403	case RROP_BLACK:
404	*addrl &= rmask[x2 & PIM];	404	*addrl &= mfbGetrmask(x2 & PIM);
405	break;	405	break;
406	case RROP_WHITE:	406	case RROP_WHITE:
407	*addrl \|= mask[x2 & PIM];	407	*addrl \|= mfbGetmask(x2 & PIM);
408	break;	408	break;
409	case RROP_INVERT:	409	case RROP_INVERT:
410	*addrl ^= mask[x2 & PIM];	410	*addrl ^= mfbGetmask(x2 & PIM);
411	break;	411	break;
412	case RROP_NOP:	412	case RROP_NOP:
413	break;	413	break;
Lines 679-692 Link Here
679		679
680	switch (rop) {	680	switch (rop) {
681	case RROP_BLACK:	681	case RROP_BLACK:
682	*addrl &= rmask[x2 & PIM];	682	*addrl &= mfbGetrmask(x2 & PIM);
683	break;	683	break;
684	case RROP_WHITE:	684	case RROP_WHITE:
685	*addrl \|= mask[x2 & PIM];	685	*addrl \|= mfbGetmask(x2 & PIM);
686	break;	686	break;
687		687
688	case RROP_INVERT:	688	case RROP_INVERT:
689	*addrl ^= mask[x2 & PIM];	689	*addrl ^= mfbGetmask(x2 & PIM);
690	break;	690	break;
691		691
692	case RROP_NOP:	692	case RROP_NOP:

Lines 64-70 Link Here

(-)cfb/cfbglblt8.c (-3 / +2 lines)
64		64
65	#ifdef USE_LEFTBITS	65	#ifdef USE_LEFTBITS
66	typedef unsigned char *glyphPointer;	66	typedef unsigned char *glyphPointer;
67	extern CfbBits endtab[];
68		67
69	#define GlyphBits(bits,width,dst) getleftbits(bits,width,dst); \	68	#define GlyphBits(bits,width,dst) getleftbits(bits,width,dst); \
70	(dst) &= widthMask; \	69	(dst) &= widthMask; \
Lines 251-257 Link Here
251	#ifdef USE_LEFTBITS	250	#ifdef USE_LEFTBITS
252	w = pci->metrics.rightSideBearing - pci->metrics.leftSideBearing;	251	w = pci->metrics.rightSideBearing - pci->metrics.leftSideBearing;
253	widthGlyph = PADGLYPHWIDTHBYTES(w);	252	widthGlyph = PADGLYPHWIDTHBYTES(w);
254	widthMask = endtab[w];	253	widthMask = mfbGetendtab(w);
255	#endif	254	#endif
256	do {	255	do {
257	dst = dstLine;	256	dst = dstLine;
Lines 380-386 Link Here
380	#ifdef USE_LEFTBITS	379	#ifdef USE_LEFTBITS
381	w = pci->metrics.rightSideBearing - pci->metrics.leftSideBearing;	380	w = pci->metrics.rightSideBearing - pci->metrics.leftSideBearing;
382	widthGlyph = PADGLYPHWIDTHBYTES(w);	381	widthGlyph = PADGLYPHWIDTHBYTES(w);
383	widthMask = endtab[w];	382	widthMask = mfbGetendtab(w);
384	#endif	383	#endif
385	switch (cfb8ComputeClipMasks32 (pBox, numRects, xG, yG, w, hTmp, clips))	384	switch (cfb8ComputeClipMasks32 (pBox, numRects, xG, yG, w, hTmp, clips))
386	{	385	{

Lines 99-105 Link Here

(-)cfb/cfbscrinit.c (-4 / +4 lines)
99	pScreen->defColormap = FakeClientID(0);	99	pScreen->defColormap = FakeClientID(0);
100	/* let CreateDefColormap do whatever it wants for pixels */	100	/* let CreateDefColormap do whatever it wants for pixels */
101	pScreen->blackPixel = pScreen->whitePixel = (Pixel) 0;	101	pScreen->blackPixel = pScreen->whitePixel = (Pixel) 0;
102	pScreen->QueryBestSize = mfbQueryBestSize;	102	pScreen->QueryBestSize = mfbQueryBestSizeWeak();
103	/* SaveScreen */	103	/* SaveScreen */
104	pScreen->GetImage = cfbGetImage;	104	pScreen->GetImage = cfbGetImage;
105	pScreen->GetSpans = cfbGetSpans;	105	pScreen->GetSpans = cfbGetSpans;
Lines 114-121 Link Here
114	pScreen->CopyWindow = cfbCopyWindow;	114	pScreen->CopyWindow = cfbCopyWindow;
115	pScreen->CreatePixmap = cfbCreatePixmap;	115	pScreen->CreatePixmap = cfbCreatePixmap;
116	pScreen->DestroyPixmap = cfbDestroyPixmap;	116	pScreen->DestroyPixmap = cfbDestroyPixmap;
117	pScreen->RealizeFont = mfbRealizeFont;	117	pScreen->RealizeFont = mfbRealizeFontWeak();
118	pScreen->UnrealizeFont = mfbUnrealizeFont;	118	pScreen->UnrealizeFont = mfbUnrealizeFontWeak();
119	pScreen->CreateGC = cfbCreateGC;	119	pScreen->CreateGC = cfbCreateGC;
120	pScreen->CreateColormap = cfbInitializeColormap;	120	pScreen->CreateColormap = cfbInitializeColormap;
121	pScreen->DestroyColormap = DestroyColormapNoop;	121	pScreen->DestroyColormap = DestroyColormapNoop;
Lines 124-130 Link Here
124	pScreen->ListInstalledColormaps = cfbListInstalledColormaps;	124	pScreen->ListInstalledColormaps = cfbListInstalledColormaps;
125	pScreen->StoreColors = StoreColorsNoop;	125	pScreen->StoreColors = StoreColorsNoop;
126	pScreen->ResolveColor = cfbResolveColor;	126	pScreen->ResolveColor = cfbResolveColor;
127	pScreen->BitmapToRegion = mfbPixmapToRegion;	127	pScreen->BitmapToRegion = mfbPixmapToRegionWeak();
128		128
129	mfbRegisterCopyPlaneProc (pScreen, cfbCopyPlane);	129	mfbRegisterCopyPlaneProc (pScreen, cfbCopyPlane);
130	return TRUE;	130	return TRUE;

Lines 39-44 Link Here

(-)mfb/mergerop.h (-5 / +6 lines)
39	} mergeRopRec, *mergeRopPtr;	39	} mergeRopRec, *mergeRopPtr;
40		40
41	extern mergeRopRec mergeRopBits[16];	41	extern mergeRopRec mergeRopBits[16];
		42	extern mergeRopPtr mergeGetRopBits(int i);
42		43
43	#if defined(PPW) && defined(PGSZ) && (PPW != PGSZ) /* cfb */	44	#if defined(PPW) && defined(PGSZ) && (PPW != PGSZ) /* cfb */
44	#define DeclareMergeRop() MfbBits _ca1 = 0, _cx1 = 0, _ca2 = 0, _cx2 = 0;	45	#define DeclareMergeRop() MfbBits _ca1 = 0, _cx1 = 0, _ca2 = 0, _cx2 = 0;
Lines 59-65 Link Here
59	MfbBits _pm; \	60	MfbBits _pm; \
60	mergeRopPtr _bits; \	61	mergeRopPtr _bits; \
61	_pm = PFILL(pm); \	62	_pm = PFILL(pm); \
62	_bits = &mergeRopBits[alu]; \	63	_bits = mergeGetRopBits(alu); \
63	_ca1 = _bits->ca1 & _pm; \	64	_ca1 = _bits->ca1 & _pm; \
64	_cx1 = _bits->cx1 \| ~_pm; \	65	_cx1 = _bits->cx1 \| ~_pm; \
65	_ca2 = _bits->ca2 & _pm; \	66	_ca2 = _bits->ca2 & _pm; \
Lines 70-76 Link Here
70	#define InitializeMergeRop24(alu,pm) {\	71	#define InitializeMergeRop24(alu,pm) {\
71	register int i; \	72	register int i; \
72	register MfbBits _pm = (pm) & 0xFFFFFF; \	73	register MfbBits _pm = (pm) & 0xFFFFFF; \
73	mergeRopPtr _bits = &mergeRopBits[alu]; \	74	mergeRopPtr _bits = mergeGetRopBits(alu); \
74	MfbBits _bits_ca1 = _bits->ca1; \	75	MfbBits _bits_ca1 = _bits->ca1; \
75	MfbBits _bits_cx1 = _bits->cx1; \	76	MfbBits _bits_cx1 = _bits->cx1; \
76	MfbBits _bits_ca2 = _bits->ca2; \	77	MfbBits _bits_ca2 = _bits->ca2; \
Lines 88-94 Link Here
88	#define InitializeMergeRop24(alu,pm) {\	89	#define InitializeMergeRop24(alu,pm) {\
89	register int i; \	90	register int i; \
90	register MfbBits _pm = (pm) & cfbmask[0]; \	91	register MfbBits _pm = (pm) & cfbmask[0]; \
91	mergeRopPtr _bits = &mergeRopBits[alu]; \	92	mergeRopPtr _bits = mergeGetRopBits(alu); \
92	MfbBits _bits_ca1 = _bits->ca1 & cfbmask[0]; \	93	MfbBits _bits_ca1 = _bits->ca1 & cfbmask[0]; \
93	MfbBits _bits_cx1 = _bits->cx1 & cfbmask[0]; \	94	MfbBits _bits_cx1 = _bits->cx1 & cfbmask[0]; \
94	MfbBits _bits_ca2 = _bits->ca2 & cfbmask[0]; \	95	MfbBits _bits_ca2 = _bits->ca2 & cfbmask[0]; \
Lines 111-117 Link Here
111	#else /* mfb */	112	#else /* mfb */
112	#define InitializeMergeRop(alu,pm) {\	113	#define InitializeMergeRop(alu,pm) {\
113	mergeRopPtr _bits; \	114	mergeRopPtr _bits; \
114	_bits = &mergeRopBits[alu]; \	115	_bits = mergeGetRopBits(alu); \
115	_ca1 = _bits->ca1; \	116	_ca1 = _bits->ca1; \
116	_cx1 = _bits->cx1; \	117	_cx1 = _bits->cx1; \
117	_ca2 = _bits->ca2; \	118	_ca2 = _bits->ca2; \
Lines 328-334 Link Here
328	#define MROP_DECLARE_REG() register MROP_DECLARE()	329	#define MROP_DECLARE_REG() register MROP_DECLARE()
329	#define MROP_INITIALIZE(alu,pm) { \	330	#define MROP_INITIALIZE(alu,pm) { \
330	mergeRopPtr _bits; \	331	mergeRopPtr _bits; \
331	_bits = &mergeRopBits[alu]; \	332	_bits = mergeGetRopBits(alu); \
332	_ca1 = _bits->ca1; \	333	_ca1 = _bits->ca1; \
333	_cx1 = _bits->cx1; \	334	_cx1 = _bits->cx1; \
334	}	335	}