Attachment 3580 Details for Bug 4766 – xprint-use-fb-1.patch

[patch] xprint-use-fb-1.patch

xprint-use-fb-1.patch (text/plain), 26.20 KB, created by Adam Jackson on 2005-10-18 12:46:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Jackson

Created: 2005-10-18 12:46:09 UTC

Size: 26.20 KB

patch

obsolete

> AttrValid.h      |    2 -
> Imakefile        |    7 +--
> Oid.h            |    2 -
> pcl/Imakefile    |   10 ++---
> pcl/PclArea.c    |   85 +++++++++---------------------------------
> pcl/PclColor.c   |    8 ++--
> pcl/PclGC.c      |  110 +++++++++----------------------------------------------
> pcl/PclInit.c    |   20 ++++------
> pcl/PclPixmap.c  |   85 ------------------------------------------
> ps/Imakefile     |    4 +-
> ps/PsInit.c      |    4 +-
> raster/Imakefile |    8 +---
> raster/Raster.c  |   15 ++-----
> 13 files changed, 69 insertions(+), 291 deletions(-)
>
>Index: AttrValid.h
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/Xprint/AttrValid.h,v
>retrieving revision 1.3
>diff -u -d -p -r1.3 AttrValid.h
>--- AttrValid.h	3 Jul 2005 07:01:09 -0000	1.3
>+++ AttrValid.h	18 Oct 2005 19:37:52 -0000
>@@ -182,7 +182,7 @@ void XpPutMediumSSAttr(XpContextPtr pCon
> 		       XPAttributes pool,
> 		       XpOid oid,
> 		       const XpOidMediumSS* msss);
>-const XpOidMediumSS* XpGetDefaultMediumSS();
>+const XpOidMediumSS* XpGetDefaultMediumSS(void);
> 
> /*
>  * XpOidTrayMediumList-valued attribute access
>Index: Imakefile
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/Xprint/Imakefile,v
>retrieving revision 1.6
>diff -u -d -p -r1.6 Imakefile
>--- Imakefile	23 Mar 2005 19:58:45 -0000	1.6
>+++ Imakefile	18 Oct 2005 19:37:52 -0000
>@@ -75,15 +75,14 @@ SUBDIRS = $(RASTDIR) $(PCLDIR) $(MPCLDIR
> 
> #endif
> 
>-   INCLUDES = -I$(XINCLUDESRC) -I. -I../mfb -I../mi -I../cfb \
>+   INCLUDES = -I$(XINCLUDESRC) -I. -I../fb -I../mi \
>              -I../include -I$(TOP)/include -I$(LIBSRC) \
>              -I$(EXTINCSRC) -I$(FONTINCSRC) -I$(XLIBSRC)
> 
> 
>    LINTLIBS = $(TOP)/server/dix/llib-ldix.ln $(TOP)/server/os/llib-los.ln \
>-	      $(TOP)/server/ddx/mfb/llib-lmfb.ln \
>-	      $(TOP)/server/ddx/mi/llib-lmi.ln \
>-	      $(TOP)/server/ddx/cfb/llib-lcfb.ln
>+	      $(TOP)/server/ddx/fb/llib-lfb.ln \
>+	      $(TOP)/server/ddx/mi/llib-lmi.ln
> 
> DEFINES = -DXPRINTDIR=\"$(XPRINTDIR)\" $(RASTDEF) $(PCLDEF) $(MPCLDEF) \
>          $(PSDEF) $(MKTMP_DEFINES) -UXFree86LOADER -D_XP_PRINT_SERVER_
>Index: Oid.h
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/Xprint/Oid.h,v
>retrieving revision 1.5
>diff -u -d -p -r1.5 Oid.h
>--- Oid.h	7 Jul 2005 02:47:06 -0000	1.5
>+++ Oid.h	18 Oct 2005 19:37:53 -0000
>@@ -210,7 +210,7 @@ char* XpOidListString(const XpOidList*);
> /*
>  * XpOidLinkedList public methods
>  */
>-XpOidLinkedList* XpOidLinkedListNew();
>+XpOidLinkedList* XpOidLinkedListNew(void);
> void XpOidLinkedListDelete(XpOidLinkedList*);
> #define XpOidLinkedListCount(l) ((l) ? (l)->count : 0)
> XpOid XpOidLinkedListGetOid(XpOidLinkedList* list, int i);
>Index: pcl/Imakefile
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/Xprint/pcl/Imakefile,v
>retrieving revision 1.2
>diff -u -d -p -r1.2 Imakefile
>--- pcl/Imakefile	23 Apr 2004 18:57:50 -0000	1.2
>+++ pcl/Imakefile	18 Oct 2005 19:37:53 -0000
>@@ -19,12 +19,12 @@ PCL_DRIVER = -DXP_PCL_COLOR
> 
> SRCS1 =	PclInit.c PclMisc.c PclWindow.c PclFonts.c PclPrint.c \
>         PclArea.c PclArc.c PclGC.c PclLine.c PclPixel.c PclPolygon.c \
>-	PclSpans.c PclText.c PclCursor.c PclAttr.c PclPixmap.c PclSFonts.c \
>+	PclSpans.c PclText.c PclCursor.c PclAttr.c PclSFonts.c \
> 	PclColor.c PclAttVal.c
> 
> OBJS1 = PclInit.o PclMisc.o PclWindow.o PclFonts.o PclPrint.o \
>         PclArea.o PclArc.o PclGC.o PclLine.o PclPixel.o PclPolygon.o \
>-	PclSpans.o PclText.o PclCursor.o PclAttr.o PclPixmap.o PclSFonts.o \
>+	PclSpans.o PclText.o PclCursor.o PclAttr.o PclSFonts.o \
> 	PclColor.o PclAttVal.o
> 
> SRCS = $(SRCS1)
>@@ -36,11 +36,10 @@ DEFINES = -DPSZ=PixelSize $(PCL_DRIVER) 
>    INCLUDES = -I. -I$(XINCLUDESRC) -I.. -I$(LIBSRC) \
> 	      -I../../include -I$(TOP)/include \
> 	      -I$(TOP)/include/extensions -I$(TOP)/include/fonts \
>-	      -I../../mi -I../../mfb -I../../cfb
>+	      -I../../mi -I../../fb -I../../render
> 
>    LINTLIBS = ../../dix/llib-ldix.ln ../../os/llib-los.ln \
>-	      ../../mfb/llib-lmfb.ln ../../mi/llib-lmi.ln \
>-	      ../../cfb/llib-lcfb.ln
>+	      ../../fb/llib-lfb.ln ../../mi/llib-lmi.ln
> 
> NormalLibraryObjectRule()
> 
>@@ -64,7 +63,6 @@ LinkSourceFile(PclInit.c,LinkDirectory)
> LinkSourceFile(PclLine.c,LinkDirectory)
> LinkSourceFile(PclMisc.c,LinkDirectory)
> LinkSourceFile(PclPixel.c,LinkDirectory)
>-LinkSourceFile(PclPixmap.c,LinkDirectory)
> LinkSourceFile(PclPolygon.c,LinkDirectory)
> LinkSourceFile(PclPrint.c,LinkDirectory)
> LinkSourceFile(PclSFonts.c,LinkDirectory)
>Index: pcl/PclArea.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/Xprint/pcl/PclArea.c,v
>retrieving revision 1.3
>diff -u -d -p -r1.3 PclArea.c
>--- pcl/PclArea.c	3 Jul 2005 07:01:10 -0000	1.3
>+++ pcl/PclArea.c	18 Oct 2005 19:37:53 -0000
>@@ -57,10 +57,7 @@ copyright holders.
> #include "pixmapstr.h"
> #include "region.h"
> 
>-#include "cfb.h"
>-#if 1
>-#include "cfb32.h"
>-#endif
>+#include "fb.h"
> 
> void
> PclPutImage(DrawablePtr pDrawable,
>@@ -129,11 +126,7 @@ PclPutImage(DrawablePtr pDrawable,
> 		      gcv[0] = i;
> 		      DoChangeGC( pGC, GCPlaneMask, gcv, 0 );
> 		      ValidateGC( pDrawable, pGC );
>-		      if (pPixmap->drawable.depth <= 8 )
>-			cfbPutImage( (DrawablePtr)pPixmap, pGC, 1, x, y, w, h,
>-				  leftPad, XYBitmap, pImage );
>-		      else if (pPixmap->drawable.depth <= 32 )
>-			cfb32PutImage( (DrawablePtr)pPixmap, pGC, 1, x, y, w, h,
>+		      fbPutImage( (DrawablePtr)pPixmap, pGC, 1, x, y, w, h,
> 				  leftPad, XYBitmap, pImage );
> 		  }
> 	    }
>@@ -170,13 +163,13 @@ PclMonoPixmapFragment(FILE *outFile,
> 
>     /*
>      * Create a storage area large enough to hold the entire pixmap,
>-     * then use mfbGetImage to get the appropriate bits.
>+     * then use fbGetImage to get the appropriate bits.
>      */
>     h = y2 - y1;
>     w = BitmapBytePad( x2 - x1 );
> 
>     bits = (char *)xalloc( h * w );
>-    mfbGetImage( (DrawablePtr)pix, x1, y1, x2 - x1, h,
>+    fbGetImage( (DrawablePtr)pix, x1, y1, x2 - x1, h,
> 		XYPixmap, ~0, bits );
> 
>     /*
>@@ -226,18 +219,13 @@ PclColorPixmapFragment(FILE *outFile,
> 
>     /*
>      * Create a storage area large enough to hold the entire pixmap,
>-     * then use cfbGetImage to get the appropriate bits.
>+     * then use fbGetImage to get the appropriate bits.
>      */
>     h = y2 - y1;
>     w = PixmapBytePad( x2 - x1, pix->drawable.depth );
> 
>     bits = (char *)xalloc( h * w );
>-    if (pix->drawable.depth <= 8)
>-	cfbGetImage( (DrawablePtr)pix, x1, y1, x2 - x1, h,
>-		ZPixmap, ~0, bits );
>-    else if (pix->drawable.depth <= 32)
>-	cfb32GetImage( (DrawablePtr)pix, x1, y1, x2 - x1, h,
>-		ZPixmap, ~0, bits );
>+    fbGetImage( (DrawablePtr)pix, x1, y1, x2 - x1, h, ZPixmap, ~0, bits );
> 
>     /*
>      * Move the cursor to the appropriate place on the page.  We have
>@@ -306,20 +294,10 @@ PclCopyArea(DrawablePtr pSrc,
> 
>     /*
>      * If we're copying from a pixmap to a pixmap, we just use the
>-     * mfb/cfb code to do the work.
>+     * fb code to do the work.
>      */
>     if( pDst->type == DRAWABLE_PIXMAP )
>-      {
>-	  if( pSrc->depth == 1 )
>-	    return mfbCopyArea( pSrc, pDst, pGC, srcx, srcy, width,
>-			height, dstx, dsty );
>-	  else if( pSrc->depth <= 8 )
>-	    return cfbCopyArea( pSrc, pDst, pGC, srcx, srcy, width,
>-			height, dstx, dsty );
>-	  else if( pSrc->depth <= 32 )
>-	    return cfb32CopyArea( pSrc, pDst, pGC, srcx, srcy, width,
>-			height, dstx, dsty );
>-      }
>+      fbCopyArea( pSrc, pDst, pGC, srcx, srcy, width, height, dstx, dsty );
> 
> /*
>     PclGetDrawablePrivateStuff( pSrc, &srcGC, &valid, &srcFile );
>@@ -328,7 +306,7 @@ PclCopyArea(DrawablePtr pSrc,
> 
>     /*
>      * If we're copying to a window, we have to do some actual
>-     * drawing, instead of just handing it off to mfb or cfb.  Start
>+     * drawing, instead of just handing it off to fb.  Start
>      * by determining the region that will be drawn.
>      */
>     box.x1 = srcx;
>@@ -427,28 +405,16 @@ PclCopyPlane(DrawablePtr pSrc,
>     if( pSrc->type == DRAWABLE_WINDOW )
>       return NULL;
> 
>-    /*
>-     * Copying from a pixmap to a pixmap is already implemented by
>-     * mfb/cfb.
>-     */
>+    /* Copying from a pixmap to a pixmap is already implemented by fb. */
>     if( pSrc->type == DRAWABLE_PIXMAP &&
>        pDst->type == DRAWABLE_PIXMAP )
>-      {
>-	  if( pDst->depth == 1 )
>-	    return mfbCopyPlane( pSrc, pDst, pGC, srcx, srcy, width,
>-				height, dstx, dsty, plane );
>-	  else if( pDst->depth <= 8 )
>-	    return cfbCopyPlane( pSrc, pDst, pGC, srcx, srcy, width,
>-				height, dstx, dsty, plane );
>-	  else if( pDst->depth <= 32 )
>-	    return cfb32CopyPlane( pSrc, pDst, pGC, srcx, srcy, width,
>-				height, dstx, dsty, plane );
>-      }
>+      fbCopyPlane( pSrc, pDst, pGC, srcx, srcy, width, height,
>+                   dstx, dsty, plane );
> 
>     /*
>-     * We can use the mfb/cfbCopyPlane function to do the work of grabbing
>-     * the plane and converting it to the desired visual.  Once that's
>-     * done, we already know how to do a CopyArea.
>+     * We can use fbCopyPlane to do the work of grabbing the plane and
>+     * converting it to the desired visual.  Once that's done, we already
>+     * know how to do a CopyArea.
>      */
>     scratchPix = (*pDst->pScreen->CreatePixmap)( pDst->pScreen, width,
> 						height, pDst->depth );
>@@ -456,24 +422,9 @@ PclCopyPlane(DrawablePtr pSrc,
>     scratchGC = GetScratchGC( pDst->depth, pDst->pScreen );
>     CopyGC( pGC, scratchGC, ~0L );
> 
>-    if( pDst->depth == 1 )
>-      {
>-	  mfbValidateGC( scratchGC, ~0L, (DrawablePtr)scratchPix );
>-	  mfbCopyPlane( pSrc, (DrawablePtr)scratchPix, scratchGC,
>-		       srcx, srcy, width, height, 0, 0, plane );
>-      }
>-    else if( pDst->depth <= 8 )
>-      {
>-	  cfbValidateGC( scratchGC, ~0L, (DrawablePtr)scratchPix );
>-	  cfbCopyPlane( pSrc, (DrawablePtr)scratchPix, scratchGC,
>-		       srcx, srcy, width, height, 0, 0, plane );
>-      }
>-    else if( pDst->depth <= 32 )
>-      {
>-	  cfb32ValidateGC( scratchGC, ~0L, (DrawablePtr)scratchPix );
>-	  cfb32CopyPlane( pSrc, (DrawablePtr)scratchPix, scratchGC,
>-		       srcx, srcy, width, height, 0, 0, plane );
>-      }
>+    fbValidateGC( scratchGC, ~0L, (DrawablePtr)scratchPix );
>+    fbCopyPlane( pSrc, (DrawablePtr)scratchPix, scratchGC,
>+		 srcx, srcy, width, height, 0, 0, plane );
> 
>     reg = PclCopyArea( (DrawablePtr)scratchPix, pDst, pGC, 0, 0, width,
> 		      height, dstx, dsty );
>Index: pcl/PclColor.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/Xprint/pcl/PclColor.c,v
>retrieving revision 1.3
>diff -u -d -p -r1.3 PclColor.c
>--- pcl/PclColor.c	3 Jul 2005 07:01:10 -0000	1.3
>+++ pcl/PclColor.c	18 Oct 2005 19:37:53 -0000
>@@ -64,7 +64,7 @@ copyright holders.
> #include "resource.h"
> 
> #include "Pcl.h"
>-#include "cfb.h"
>+#include "fb.h"
> 
> static void lookup(unsigned char *src,
> 		unsigned char *dst,
>@@ -80,10 +80,10 @@ static void trilinear(unsigned char *p,
> 
> /*
>  * This seems to be (and is) a duplication of effort; one would think
>- * that cfbCreateDefColormap would be sufficient.  It almost is.  The
>+ * that fbCreateDefColormap would be sufficient.  It almost is.  The
>  * only change made in this function is that the black and white pixels
>  * are allocated with three separate variables for red, green and blue
>- * values, instead of the single variable in cfbCreateDefColormap.  The
>+ * values, instead of the single variable in fbCreateDefColormap.  The
>  * single variable leads to the one value being corrected by
>  * ResolveColor three times, which leads to incorrect colors.
>  */
>@@ -137,7 +137,7 @@ PclCreateColormap(ColormapPtr pColor)
> 	/*
> 	 * Use existing code to initialize the values in the colormap
> 	 */
>-	cfbInitializeColormap( pColor );
>+	fbInitializeColormap( pColor );
> 
> 	/*
> 	 * Set up the mapping between the color map and the context
>Index: pcl/PclGC.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/Xprint/pcl/PclGC.c,v
>retrieving revision 1.3
>diff -u -d -p -r1.3 PclGC.c
>--- pcl/PclGC.c	3 Jul 2005 07:01:10 -0000	1.3
>+++ pcl/PclGC.c	18 Oct 2005 19:37:53 -0000
>@@ -56,9 +56,7 @@ copyright holders.
> #include "pixmapstr.h"
> #include "colormapst.h"
> #include "windowstr.h"
>-#include "cfb.h"
>-#include "cfb32.h"
>-#include "migc.h"
>+#include "fb.h"
> #include "scrnintstr.h"
> #include "resource.h"
> 
>@@ -106,22 +104,8 @@ static GCFuncs PclGCFuncs = 
> Bool
> PclCreateGC(GCPtr pGC)
> {
>-    if( pGC->depth == 1 )
>-      {
>-	  if( mfbCreateGC( pGC ) == FALSE )
>-	    return FALSE;
>-      }
>-    else if( pGC->depth <= 32 )
>-      {
>-#if PSZ == 8 
>-	  if( cfbCreateGC( pGC ) == FALSE )
>-#else
>-	  if( cfb32CreateGC( pGC ) == FALSE )
>-#endif
>-	    return FALSE;
>-      }
>-    else
>-	  return FALSE;
>+    if (fbCreateGC(pGC) == FALSE)
>+        return FALSE;
> 
>     pGC->clientClip = NULL;
>     pGC->clientClipType = CT_NONE;
>@@ -135,7 +119,7 @@ PclCreateGC(GCPtr pGC)
> void
> PclDestroyGC(GCPtr pGC)
> {
>-    /* Handle the mfb and cfb, which share a GC private struct */
>+    /* fb doesn't specialize DestroyGC */
>     miDestroyGC( pGC );
> }
> 
>@@ -655,34 +639,12 @@ PclUpdateDrawableGC(
> 	  h = pGC->tile.pixmap->drawable.height;
> 	  w = pGC->tile.pixmap->drawable.width;
> 
>-	  if( pGC->tile.pixmap->drawable.depth == 1 )
>-	    {
>-		sz = h * BitmapBytePad( w );
>-
>-		bits = (char *)xalloc( sz );
>-		mfbGetImage(&(pGC->tile.pixmap->drawable), 0, 0, w, h, XYPixmap, ~0, bits);
>-		PclSendPattern( bits, sz, 1, h, w, 100, *outFile );
>-		xfree( bits );
>-	    }
>-	  else if( pGC->tile.pixmap->drawable.depth == 8 )
>-	    {
>-		sz = h * PixmapBytePad( w, 8 );
>-		bits = (char *)xalloc( sz );
>-		cfbGetImage(&(pGC->tile.pixmap->drawable), 0, 0, w, h, ZPixmap, ~0, bits);
>-		PclSendPattern( bits, sz, 8, h, w, 100, *outFile );
>-		xfree( bits );
>-	    }
>-#if PSZ == 32
>-	  else
>-	    {
>-		sz = h * PixmapBytePad( w, 24 );
>-		
>-		bits = (char *)xalloc( sz );
>-		cfb32GetImage(&(pGC->tile.pixmap->drawable), 0, 0, w, h, ZPixmap, ~0, bits);
>-		PclSendPattern( bits, sz, 24, h, w, 100, *outFile );
>-		xfree( bits );
>-	    }
>-#endif
>+          sz = h * PixmapBytePad(w, pGC->tile.pixmap->drawable.depth);
>+          bits = (char *)xalloc(sz);
>+          fbGetImage(&(pGC->tile.pixmap->drawable), 0, 0, w, h, XYPixmap, ~0,
>+                     bits);
>+          PclSendPattern( bits, sz, 1, h, w, 100, *outFile );
>+	  xfree( bits );
>       }
> 
>     if( changeMask & ( GCTileStipXOrigin | GCTileStipYOrigin ) )
>@@ -717,7 +679,7 @@ PclUpdateDrawableGC(
> 		sz = h * BitmapBytePad( w );
> 
> 		bits = (char *)xalloc( sz );
>-		mfbGetImage( &(pGC->stipple->drawable), 0, 0, w, h, XYPixmap, ~0, bits );
>+		fbGetImage( &(pGC->stipple->drawable), 0, 0, w, h, XYPixmap, ~0, bits );
> 
> 		w2 = ( w / 8 ) + ( ( w%8 ) ? 1 : 0 );
> 		/*
>@@ -755,37 +717,12 @@ PclUpdateDrawableGC(
> 						w, h, pGC->depth );
> 		scratchGC = GetScratchGC( pGC->depth, pGC->pScreen );
> 		CopyGC( pGC, scratchGC, ~0L );
>-		
>-		if( pGC->depth == 1 )
>-		  {
>-		      mfbValidateGC( scratchGC, ~0L,
>-				    (DrawablePtr)scratchPix );
>-		      mfbCopyPlane( &(pGC->stipple->drawable),
>-				   (DrawablePtr)scratchPix, scratchGC, 0,
>-				   0, w, h, 0, 0, 1 );
>-		      mfbGetImage( &(scratchPix->drawable), 0, 0, w, h, XYPixmap, ~0,
>-				  bits );
>-		  }
>-		else if( pGC->depth <= 32 )
>-		  {
>-#if PSZ == 8
>-		      cfbValidateGC( scratchGC, ~0L,
>-				    (DrawablePtr)scratchPix );
>-		      cfbCopyPlane( &(pGC->stipple->drawable),
>-				   (DrawablePtr)scratchPix, scratchGC, 0,
>-				   0, w, h, 0, 0, 1 );
>-		      cfbGetImage( &(scratchPix->drawable), 0, 0, w, h, ZPixmap, ~0, 
>-				  bits );
>-#else
>-		      cfb32ValidateGC( scratchGC, ~0L,
>-				      (DrawablePtr)scratchPix );
>-		      cfb32CopyPlane( pGC->stipple,
>-				     (DrawablePtr)scratchPix, scratchGC, 0,
>-				     0, w, h, 0, 0, 1 );
>-		      cfb32GetImage( scratchPix, 0, 0, w, h, ZPixmap, ~0,
>-				    bits );
>-#endif
>-		  }
>+
>+                fbValidateGC(scratchGC, ~0L, (DrawablePtr)scratchPix);
>+		fbCopyPlane(&(pGC->stipple->drawable), (DrawablePtr)scratchPix,
>+                            scratchGC, 0, 0, w, h, 0, 0, 1);
>+		fbGetImage(&(scratchPix->drawable), 0, 0, w, h, XYPixmap, ~0,
>+			   bits);
> 		PclSendPattern( bits, sz, pGC->depth, h, w, 101, *outFile );
> 		FreeScratchGC( scratchGC );
> 		(*pGC->pScreen->DestroyPixmap)( scratchPix );
>@@ -994,18 +931,7 @@ PclValidateGC(
>      */
>     if( pDrawable->type == DRAWABLE_PIXMAP )
>       {
>-	  if( pDrawable->depth == 1 )
>-	    {
>-		mfbValidateGC( pGC, ~0, pDrawable );
>-	    }
>-	  else if( pDrawable->depth <= 32 )
>-	    {
>-#if PSZ == 8
>-		cfbValidateGC( pGC, ~0, pDrawable );
>-#else
>-		cfb32ValidateGC( pGC, ~0, pDrawable );
>-#endif
>-	    }
>+          fbValidateGC(pGC, ~0, pDrawable);
> 	  return;
>       }
> 
>Index: pcl/PclInit.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/Xprint/pcl/PclInit.c,v
>retrieving revision 1.6
>diff -u -d -p -r1.6 PclInit.c
>--- pcl/PclInit.c	3 Jul 2005 07:01:10 -0000	1.6
>+++ pcl/PclInit.c	18 Oct 2005 19:37:53 -0000
>@@ -89,7 +89,7 @@ copyright holders.
> 
> #include "Pcl.h"
> 
>-#include "cfb.h"
>+#include "fb.h"
> #include <X11/Xos.h>	/* for unlink() */
> 
> #include "attributes.h"
>@@ -200,18 +200,16 @@ InitializePclDriver(
>     maxRes = MAX( xRes, yRes );
> 
> #ifdef XP_PCL_COLOR
>-    cfbScreenInit( pScreen, NULL, maxDim, maxDim, maxRes, maxRes,
>-		  maxRes );
>-    /*
>-     * Clean up the fields that we stomp (code taken from cfbCloseScreen)
>-     */
>+    fbScreenInit( pScreen, NULL, maxDim, maxDim, maxRes, maxRes,
>+		  maxRes, 8 ); /* XXX what's the depth here? */
>+    /* Clean up the fields that we stomp (code taken from fbCloseScreen) */
>     for( i = 0; (int) i < pScreen->numDepths; i++ )
>       xfree( pScreen->allowedDepths[i].vids );
>     xfree( pScreen->allowedDepths );
>     xfree( pScreen->visuals );
> #else
>-    mfbScreenInit( pScreen, NULL, maxDim, maxDim, maxRes, maxRes,
>-		  maxRes );
>+    fbScreenInit( pScreen, NULL, maxDim, maxDim, maxRes, maxRes,
>+		  maxRes, 1 );
> #endif /* XP_PCL_COLOR */
> 
>     miInitializeBackingStore ( pScreen );
>@@ -241,8 +239,8 @@ InitializePclDriver(
>     pScreen->PaintWindowBorder = PclPaintWindow;
>     pScreen->CopyWindow = PclCopyWindow; /* XXX Hard routine to write! */
> 
>-    pScreen->CreatePixmap = PclCreatePixmap;
>-    pScreen->DestroyPixmap = PclDestroyPixmap;
>+    pScreen->CreatePixmap = fbCreatePixmap;
>+    pScreen->DestroyPixmap = fbDestroyPixmap;
>     pScreen->RealizeFont = PclRealizeFont;
>     pScreen->UnrealizeFont = PclUnrealizeFont;
>     pScreen->CreateGC = PclCreateGC;
>@@ -257,7 +255,7 @@ InitializePclDriver(
>     pScreen->ResolveColor = PclResolveColor;
> */
> 
>-    pScreen->BitmapToRegion = mfbPixmapToRegion;
>+    pScreen->BitmapToRegion = fbPixmapToRegion;
> 
>     pScreen->ConstrainCursor = PclConstrainCursor;
>     pScreen->CursorLimits = PclCursorLimits;
>Index: pcl/PclPixmap.c
>===================================================================
>RCS file: pcl/PclPixmap.c
>diff -N pcl/PclPixmap.c
>--- pcl/PclPixmap.c	3 Jul 2005 07:01:10 -0000	1.3
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,85 +0,0 @@
>-/* $Xorg: PclPixmap.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */
>-/*******************************************************************
>-**
>-**    *********************************************************
>-**    *
>-**    *  File:		PclPixmap.c
>-**    *
>-**    *  Contents:
>-**    *                 Pixmap handling code for the PCL DDX driver
>-**    *
>-**    *  Created:	2/19/96
>-**    *
>-**    *********************************************************
>-** 
>-********************************************************************/
>-/*
>-(c) Copyright 1996 Hewlett-Packard Company
>-(c) Copyright 1996 International Business Machines Corp.
>-(c) Copyright 1996 Sun Microsystems, Inc.
>-(c) Copyright 1996 Novell, Inc.
>-(c) Copyright 1996 Digital Equipment Corp.
>-(c) Copyright 1996 Fujitsu Limited
>-(c) Copyright 1996 Hitachi, Ltd.
>-
>-Permission is hereby granted, free of charge, to any person obtaining a copy
>-of this software and associated documentation files (the "Software"), to deal
>-in the Software without restriction, including without limitation the rights
>-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
>-copies of the Software, and to permit persons to whom the Software is
>-furnished to do so, subject to the following conditions:
>-
>-The above copyright notice and this permission notice shall be included in
>-all copies or substantial portions of the Software.
>-
>-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
>-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
>-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
>-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
>-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
>-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
>-
>-Except as contained in this notice, the names of the copyright holders shall
>-not be used in advertising or otherwise to promote the sale, use or other
>-dealings in this Software without prior written authorization from said
>-copyright holders.
>-*/
>-/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPixmap.c,v 1.3 1999/12/16 02:26:27 robin Exp $ */
>-
>-#ifdef HAVE_DIX_CONFIG_H
>-#include <dix-config.h>
>-#endif
>-
>-#include "Pcl.h"
>-#include "cfb.h"
>-#include "cfb32.h"
>-#include "mfb.h"
>-#include "pixmapstr.h"
>-
>-PixmapPtr
>-PclCreatePixmap(ScreenPtr pScreen,
>-		int width,
>-		int height,
>-		int depth)
>-{
>-    if( depth == 1 )
>-      return mfbCreatePixmap( pScreen, width, height, depth );
>-    else if( depth <= 8 )
>-      return cfbCreatePixmap( pScreen, width, height, depth );
>-    else if( depth <= 32 )
>-      return cfb32CreatePixmap( pScreen, width, height, depth );
>-    return 0;
>-}
>-
>-
>-Bool
>-PclDestroyPixmap(PixmapPtr pPixmap)
>-{
>-    if( pPixmap->drawable.depth == 1 )
>-      return mfbDestroyPixmap( pPixmap );
>-    else if( pPixmap->drawable.depth <= 8 )
>-      return cfbDestroyPixmap( pPixmap );
>-    else if( pPixmap->drawable.depth <= 32 )
>-      return cfb32DestroyPixmap( pPixmap );
>-    return 0;
>-}
>Index: ps/Imakefile
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/Xprint/ps/Imakefile,v
>retrieving revision 1.9
>diff -u -d -p -r1.9 Imakefile
>--- ps/Imakefile	1 Apr 2005 21:45:20 -0000	1.9
>+++ ps/Imakefile	18 Oct 2005 19:37:53 -0000
>@@ -68,13 +68,13 @@ XCOMM (see http://xprint.mozdev.org/bugs
> XCOMM   DEFINES = -DPSOUT_USE_DEEPCOLOR -DXP_PSTEXT -DBM_CACHE $(VENDOR_DEFINES) $(TTF2PT1_DEFINES) $(FT_DEFINES)
>    DEFINES = -UXFree86LOADER -DPSOUT_USE_DEEPCOLOR -DXP_PSTEXT -D_XP_PRINT_SERVER_ $(VENDOR_DEFINES) $(TTF2PT1_DEFINES) $(FT_DEFINES) $(EXT_DEFINES)
> 
>-   INCLUDES = -I. -I../../mi -I../../mfb -I$(LIBSRC) \
>+   INCLUDES = -I. -I../../mi -I../../fb -I$(LIBSRC) -I../../render \
>              -I$(XINCLUDESRC) -I../../include -I.. -I$(TOP)/include \
>              -I$(EXTINCSRC) -I$(FONTINCSRC) -I$(FONTLIBSRC)/include \
>              $(FT2INCS) -I../../../../lib/font/FreeType
> 
>    LINTLIBS = $(TOP)/server/dix/llib-ldix.ln $(TOP)/server/os/llib-los.ln \
>-	      $(TOP)/server/ddx/mfb/llib-lmfb.ln \
>+	      $(TOP)/server/ddx/fb/llib-lfb.ln \
> 	      $(TOP)/server/ddx/mi/llib-lmi.ln
> 
> NormalLibraryObjectRule()
>Index: ps/PsInit.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/Xprint/ps/PsInit.c,v
>retrieving revision 1.11
>diff -u -d -p -r1.11 PsInit.c
>--- ps/PsInit.c	3 Jul 2005 07:01:13 -0000	1.11
>+++ ps/PsInit.c	18 Oct 2005 19:37:53 -0000
>@@ -89,7 +89,7 @@ in this Software without prior written a
> #include "mi.h"
> #include "micmap.h"
> #include "AttrValid.h"
>-#include "mfb.h"
>+#include "fb.h"
> 
> #include "windowstr.h"
> #include "DiPrint.h"
>@@ -194,7 +194,7 @@ InitializePsDriver(ndx, pScreen, argc, a
>   pScreen->StoreColors            = PsStoreColors;
>   pScreen->ResolveColor           = PsResolveColor;
>     /* Will BitmapToRegion make any difference at all? */
>-  pScreen->BitmapToRegion         = mfbPixmapToRegion;
>+  pScreen->BitmapToRegion         = fbPixmapToRegion;
> 
>   visuals    = (VisualPtr) xalloc(16*sizeof(VisualRec));
>   depths     = (DepthPtr)  xalloc(16*sizeof(DepthRec));
>Index: raster/Imakefile
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/Xprint/raster/Imakefile,v
>retrieving revision 1.2
>diff -u -d -p -r1.2 Imakefile
>--- raster/Imakefile	23 Apr 2004 18:58:26 -0000	1.2
>+++ raster/Imakefile	18 Oct 2005 19:37:53 -0000
>@@ -9,14 +9,12 @@ SRCS = $(SRCS1)
> 
> OBJS = $(OBJS1)
> 
>-   INCLUDES = -I. -I$(XINCLUDESRC) -I.. -I$(LIBSRC) \
>-             -I../../cfb -I../../mfb -I../../mi \
>-             -I../../include -I$(TOP)/include -I$(FONTINCSRC)
>+   INCLUDES = -I. -I$(XINCLUDESRC) -I.. -I$(LIBSRC) -I../../mi -I../../fb \
>+             -I../../render -I../../include -I$(TOP)/include -I$(FONTINCSRC)
> 
> 
>    LINTLIBS = ../../dix/llib-ldix.ln ../../os/llib-los.ln \
>-	      ../../mfb/llib-lmfb.ln ../../mi/llib-lmi.ln \
>-	      ../../cfb/llib-lcfb.ln
>+	      ../../fb/llib-lfb.ln ../../mi/llib-lmi.ln
> 
>    DEFINES  = -D_XP_PRINT_SERVER_ -UXFree86LOADER
> 
>Index: raster/Raster.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/Xprint/raster/Raster.c,v
>retrieving revision 1.6
>diff -u -d -p -r1.6 Raster.c
>--- raster/Raster.c	3 Jul 2005 08:53:37 -0000	1.6
>+++ raster/Raster.c	18 Oct 2005 19:37:53 -0000
>@@ -74,7 +74,7 @@ copyright holders.
> #include "windowstr.h"
> #include "propertyst.h"
> #include "servermd.h"	/* needed for IMAGE_BUFSIZE */
>-#include "mfb.h"
>+#include "fb.h"
> #include "mi.h"
> 
> #include <X11/extensions/Print.h>
>@@ -222,20 +222,13 @@ InitializeRasterDriver(
>     /*
>      * Have to allocate maxDim X maxDim to allow for landscape mode.
>      */
>-    mfbScreenInit(pScreen, pPriv->pBits, maxDim, maxDim, maxRes,
>-		  maxRes, maxDim);
>+    fbScreenInit(pScreen, pPriv->pBits, maxDim, maxDim, maxRes,
>+		 maxRes, maxDim, 1);
>     miInitializeBackingStore(pScreen);
>     pScreen->blackPixel = 1;
>     pScreen->whitePixel = 0;
>-    if(mfbCreateDefColormap(pScreen) == FALSE)
>+    if(fbCreateDefColormap(pScreen) == FALSE)
> 	; /* XXX what do I do if it fails? */
>-    
>-    /*
>-    cfbScreenInit(pScreen, pPriv->pBits, maxWidth, maxHeight, maxXres,
>-		  maxYres, maxWidth);
>-    miInitializeBackingStore(pScreen);
>-    scalingScreenInit(pScreen);
>-    */
> 
>     pScreen->SaveScreen = (SaveScreenProcPtr)_XpBoolNoop;
>     pPriv->ChangeWindowAttributes = pScreen->ChangeWindowAttributes;

Actions: View | Splinter Review

Attachments on bug 4766: 3580 | 4474

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.