Import of XFree86 4.0.99.1X_4_0_99_1

24 files changed, 87 insertions, 86 deletions

diff --git a/xc/programs/Xserver/Xprint/pcl/Imakefile b/xc/programs/Xserver/Xprint/pcl/Imakefile
index d6586cab6..525367fbb 100644
--- a/xc/programs/Xserver/Xprint/pcl/Imakefile
+++ b/xc/programs/Xserver/Xprint/pcl/Imakefile
@@ -1,8 +1,9 @@
-XCOMM $XFree86: xc/programs/Xserver/Xprint/pcl/Imakefile,v 1.5 1999/07/18 15:47:37 dawes Exp $
+XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:48:07 cpqbld Exp $
 
 
 
-XCOMM $XConsortium: Imakefile /main/1 1996/09/28 17:00:10 rws $
+
+XCOMM $XFree86: xc/programs/Xserver/Xprint/pcl/Imakefile,v 1.6 2001/01/17 22:36:29 dawes Exp $
 
 #include <Server.tmpl>
 
diff --git a/xc/programs/Xserver/Xprint/pcl/Pcl.h b/xc/programs/Xserver/Xprint/pcl/Pcl.h
index 31e0bbbd3..419a8a793 100644
--- a/xc/programs/Xserver/Xprint/pcl/Pcl.h
+++ b/xc/programs/Xserver/Xprint/pcl/Pcl.h
@@ -1,4 +1,4 @@
-/* $XConsortium: Pcl.h /main/3 1996/12/30 14:56:18 kaleb $ */
+/* $Xorg: Pcl.h,v 1.3 2000/08/17 19:48:07 cpqbld Exp $ */
 /*******************************************************************
 **
 **    *********************************************************
@@ -44,7 +44,7 @@ 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/Pcl.h,v 1.5 1999/12/13 02:12:53 robin Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/pcl/Pcl.h,v 1.7 2001/01/19 17:10:50 dawes Exp $ */
 
 #ifndef _PCL_H_
 #define _PCL_H_
@@ -555,7 +555,6 @@ extern Bool PclPositionWindow(
     int x,
     int y);
 extern Bool PclUnmapWindow(WindowPtr pWindow);
-extern Bool PclUnmapWindow(WindowPtr pWindow);
 extern void PclCopyWindow(
     WindowPtr pWin,
     DDXPointRec ptOldOrg,
diff --git a/xc/programs/Xserver/Xprint/pcl/PclArc.c b/xc/programs/Xserver/Xprint/pcl/PclArc.c
index 45619a6f5..ca13b3a84 100644
--- a/xc/programs/Xserver/Xprint/pcl/PclArc.c
+++ b/xc/programs/Xserver/Xprint/pcl/PclArc.c
@@ -1,4 +1,4 @@
-/* $XConsortium: PclArc.c /main/1 1996/09/28 17:00:23 rws $ */
+/* $Xorg: PclArc.c,v 1.3 2000/08/17 19:48:07 cpqbld Exp $ */
 /*******************************************************************
 **
 **    *********************************************************
@@ -45,7 +45,7 @@ dealings in this Software without prior written authorization from said
 copyright holders.
 */
 
-/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclArc.c,v 1.4 1999/12/13 02:12:53 robin Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclArc.c,v 1.5 2001/01/17 22:36:30 dawes Exp $ */
 
 #include <stdio.h>
 #include <math.h>
diff --git a/xc/programs/Xserver/Xprint/pcl/PclArea.c b/xc/programs/Xserver/Xprint/pcl/PclArea.c
index 910422061..4c10f920b 100644
--- a/xc/programs/Xserver/Xprint/pcl/PclArea.c
+++ b/xc/programs/Xserver/Xprint/pcl/PclArea.c
@@ -1,4 +1,4 @@
-/* $XConsortium: PclArea.c /main/3 1996/12/30 16:36:46 kaleb $ */
+/* $Xorg: PclArea.c,v 1.3 2000/08/17 19:48:07 cpqbld Exp $ */
 /*******************************************************************
 **
 **    *********************************************************
@@ -44,7 +44,7 @@ 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/PclArea.c,v 1.7 1999/12/13 02:12:54 robin Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclArea.c,v 1.8 2001/01/17 22:36:30 dawes Exp $ */
 
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/xc/programs/Xserver/Xprint/pcl/PclAttVal.c b/xc/programs/Xserver/Xprint/pcl/PclAttVal.c
index 037d3ea35..88fcf23b5 100644
--- a/xc/programs/Xserver/Xprint/pcl/PclAttVal.c
+++ b/xc/programs/Xserver/Xprint/pcl/PclAttVal.c
@@ -1,5 +1,5 @@
 /*
- * $XConsortium: PclAttVal.c /main/1 1996/09/28 17:00:37 rws $
+ * $Xorg: PclAttVal.c,v 1.3 2000/08/17 19:48:07 cpqbld Exp $
  */
 /*
 (c) Copyright 1996 Hewlett-Packard Company
diff --git a/xc/programs/Xserver/Xprint/pcl/PclAttr.c b/xc/programs/Xserver/Xprint/pcl/PclAttr.c
index 6d23858b9..2612a821f 100644
--- a/xc/programs/Xserver/Xprint/pcl/PclAttr.c
+++ b/xc/programs/Xserver/Xprint/pcl/PclAttr.c
@@ -1,4 +1,4 @@
-/* $XConsortium: PclAttr.c /main/1 1996/09/28 17:00:45 rws $ */
+/* $Xorg: PclAttr.c,v 1.3 2000/08/17 19:48:07 cpqbld Exp $ */
 /*******************************************************************
 **
 **    *********************************************************
diff --git a/xc/programs/Xserver/Xprint/pcl/PclColor.c b/xc/programs/Xserver/Xprint/pcl/PclColor.c
index fc0be8ec3..e8e860b53 100644
--- a/xc/programs/Xserver/Xprint/pcl/PclColor.c
+++ b/xc/programs/Xserver/Xprint/pcl/PclColor.c
@@ -1,4 +1,4 @@
-/* $XConsortium: PclColor.c /main/4 1996/12/30 16:36:57 kaleb $ */
+/* $Xorg: PclColor.c,v 1.3 2000/08/17 19:48:07 cpqbld Exp $ */
 /*******************************************************************
 **
 **    *********************************************************
@@ -45,7 +45,7 @@ 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/PclColor.c,v 1.7 1999/12/13 02:12:54 robin Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclColor.c,v 1.8 2001/01/17 22:36:30 dawes Exp $ */
 
 #include <stdio.h>
 #include <string.h>
diff --git a/xc/programs/Xserver/Xprint/pcl/PclCursor.c b/xc/programs/Xserver/Xprint/pcl/PclCursor.c
index ed83b3d5d..7e463d498 100644
--- a/xc/programs/Xserver/Xprint/pcl/PclCursor.c
+++ b/xc/programs/Xserver/Xprint/pcl/PclCursor.c
@@ -1,6 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclCursor.c,v 1.3 1999/12/16 02:26:27 robin Exp $ */
-
-/* $XConsortium: PclCursor.c /main/1 1996/09/28 17:00:59 rws $ */
+/* $Xorg: PclCursor.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */
 /*******************************************************************
 **
 **    *********************************************************
@@ -46,6 +44,7 @@ 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/PclCursor.c,v 1.4 2001/01/17 22:36:30 dawes Exp $ */
 
 #include <stdio.h>
 
diff --git a/xc/programs/Xserver/Xprint/pcl/PclDef.h b/xc/programs/Xserver/Xprint/pcl/PclDef.h
index acc4a3e26..2638748b2 100644
--- a/xc/programs/Xserver/Xprint/pcl/PclDef.h
+++ b/xc/programs/Xserver/Xprint/pcl/PclDef.h
@@ -1,4 +1,4 @@
-/* $XConsortium: PclDef.h /main/1 1996/09/28 17:01:04 rws $ */
+/* $Xorg: PclDef.h,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */
 /*******************************************************************
 **
 **    *********************************************************
diff --git a/xc/programs/Xserver/Xprint/pcl/PclFonts.c b/xc/programs/Xserver/Xprint/pcl/PclFonts.c
index 59776eb08..ef4554a12 100644
--- a/xc/programs/Xserver/Xprint/pcl/PclFonts.c
+++ b/xc/programs/Xserver/Xprint/pcl/PclFonts.c
@@ -1,4 +1,4 @@
-/* $XConsortium: PclFonts.c /main/1 1996/09/28 17:01:09 rws $ */
+/* $Xorg: PclFonts.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */
 /*******************************************************************
 **
 **    *********************************************************
diff --git a/xc/programs/Xserver/Xprint/pcl/PclGC.c b/xc/programs/Xserver/Xprint/pcl/PclGC.c
index a73d3fab0..5fc1e2bad 100644
--- a/xc/programs/Xserver/Xprint/pcl/PclGC.c
+++ b/xc/programs/Xserver/Xprint/pcl/PclGC.c
@@ -1,4 +1,4 @@
-/* $TOG: PclGC.c /main/3 1997/06/11 17:53:43 samborn $ */
+/* $Xorg: PclGC.c,v 1.4 2000/08/17 19:48:08 cpqbld Exp $ */
 /*******************************************************************
 **
 **    *********************************************************
@@ -44,7 +44,7 @@ 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/PclGC.c,v 1.7 1999/12/13 02:12:55 robin Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclGC.c,v 1.9 2001/01/19 18:34:28 dawes Exp $ */
 
 #include "gcstruct.h"
 
@@ -107,14 +107,13 @@ PclCreateGC(GCPtr pGC)
 	  if( mfbCreateGC( pGC ) == FALSE )
 	    return FALSE;
       }
-    else if( pGC->depth <= 8 )
-      {
-	  if( cfbCreateGC( 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
@@ -671,6 +670,7 @@ PclUpdateDrawableGC(
 		PclSendPattern( bits, sz, 8, h, w, 100, *outFile );
 		xfree( bits );
 	    }
+#if PSZ == 32
 	  else
 	    {
 		sz = h * PixmapBytePad( w, 24 );
@@ -680,6 +680,7 @@ PclUpdateDrawableGC(
 		PclSendPattern( bits, sz, 24, h, w, 100, *outFile );
 		xfree( bits );
 	    }
+#endif
       }
 
     if( changeMask & ( GCTileStipXOrigin | GCTileStipYOrigin ) )
@@ -763,8 +764,9 @@ PclUpdateDrawableGC(
 		      mfbGetImage( &(scratchPix->drawable), 0, 0, w, h, XYPixmap, ~0,
 				  bits );
 		  }
-		else if( pGC->depth <= 8 )
+		else if( pGC->depth <= 32 )
 		  {
+#if PSZ == 8
 		      cfbValidateGC( scratchGC, ~0L,
 				    (DrawablePtr)scratchPix );
 		      cfbCopyPlane( &(pGC->stipple->drawable),
@@ -772,16 +774,15 @@ PclUpdateDrawableGC(
 				   0, w, h, 0, 0, 1 );
 		      cfbGetImage( &(scratchPix->drawable), 0, 0, w, h, ZPixmap, ~0, 
 				  bits );
-		  }
-		else if( pGC->depth <= 32 )
-		  {
+#else
 		      cfb32ValidateGC( scratchGC, ~0L,
-				    (DrawablePtr)scratchPix );
-		      cfb32CopyPlane( &(pGC->stipple->drawable),
-				   (DrawablePtr)scratchPix, scratchGC, 0,
-				   0, w, h, 0, 0, 1 );
-		      cfb32GetImage( &(scratchPix->drawable), 0, 0, w, h, ZPixmap, ~0, 
-				  bits );
+				      (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
 		  }
 		PclSendPattern( bits, sz, pGC->depth, h, w, 101, *outFile );
 		FreeScratchGC( scratchGC );
@@ -996,13 +997,13 @@ PclValidateGC(
 	    {
 		mfbValidateGC( pGC, ~0, pDrawable );
 	    }
-	  else if( pDrawable->depth <= 8 )
-	    {
-		cfbValidateGC( pGC, ~0, pDrawable );
-	    }
 	  else if( pDrawable->depth <= 32 )
 	    {
+#if PSZ == 8
+		cfbValidateGC( pGC, ~0, pDrawable );
+#else
 		cfb32ValidateGC( pGC, ~0, pDrawable );
+#endif
 	    }
 	  return;
       }
diff --git a/xc/programs/Xserver/Xprint/pcl/PclInit.c b/xc/programs/Xserver/Xprint/pcl/PclInit.c
index 9c3605d2d..659f4dbe0 100644
--- a/xc/programs/Xserver/Xprint/pcl/PclInit.c
+++ b/xc/programs/Xserver/Xprint/pcl/PclInit.c
@@ -1,4 +1,4 @@
-/* $XConsortium: PclInit.c /main/3 1996/12/30 16:37:06 kaleb $ */
+/* $Xorg: PclInit.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */
 /*******************************************************************
 **
 **    *********************************************************
@@ -76,7 +76,7 @@ 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/PclInit.c,v 1.7 1999/12/13 02:12:55 robin Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclInit.c,v 1.8 2001/01/17 22:36:30 dawes Exp $ */
 
 #include <stdio.h>
 #include <string.h>
diff --git a/xc/programs/Xserver/Xprint/pcl/PclLine.c b/xc/programs/Xserver/Xprint/pcl/PclLine.c
index c1373aa16..3c10f97ca 100644
--- a/xc/programs/Xserver/Xprint/pcl/PclLine.c
+++ b/xc/programs/Xserver/Xprint/pcl/PclLine.c
@@ -1,4 +1,4 @@
-/* $XConsortium: PclLine.c /main/2 1996/12/30 14:56:54 kaleb $ */
+/* $Xorg: PclLine.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */
 /*******************************************************************
 **
 **    *********************************************************
@@ -44,7 +44,7 @@ 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/PclLine.c,v 1.6 1999/12/13 02:12:55 robin Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclLine.c,v 1.7 2001/01/17 22:36:30 dawes Exp $ */
 
 #include "Pcl.h"
 #include "gcstruct.h"
diff --git a/xc/programs/Xserver/Xprint/pcl/PclMisc.c b/xc/programs/Xserver/Xprint/pcl/PclMisc.c
index a72ba8c58..b5ffc7077 100644
--- a/xc/programs/Xserver/Xprint/pcl/PclMisc.c
+++ b/xc/programs/Xserver/Xprint/pcl/PclMisc.c
@@ -1,4 +1,4 @@
-/* $XConsortium: PclMisc.c /main/3 1996/12/30 14:56:58 kaleb $ */
+/* $Xorg: PclMisc.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */
 /*******************************************************************
 **
 **    *********************************************************
@@ -44,7 +44,7 @@ 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/PclMisc.c,v 1.7 2000/08/23 21:06:19 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclMisc.c,v 1.8 2001/01/17 22:36:30 dawes Exp $ */
 
 #ifdef __CYGWIN__
 #include <signal.h>
diff --git a/xc/programs/Xserver/Xprint/pcl/PclPixel.c b/xc/programs/Xserver/Xprint/pcl/PclPixel.c
index 7cac42c19..e1e950339 100644
--- a/xc/programs/Xserver/Xprint/pcl/PclPixel.c
+++ b/xc/programs/Xserver/Xprint/pcl/PclPixel.c
@@ -1,4 +1,4 @@
-/* $XConsortium: PclPixel.c /main/1 1996/09/28 17:01:49 rws $ */
+/* $Xorg: PclPixel.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */
 /*******************************************************************
 **
 **    *********************************************************
@@ -44,7 +44,7 @@ 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/PclPixel.c,v 1.4 1999/12/13 02:12:56 robin Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPixel.c,v 1.5 2001/01/17 22:36:30 dawes Exp $ */
 
 #include <stdio.h>
 
diff --git a/xc/programs/Xserver/Xprint/pcl/PclPixmap.c b/xc/programs/Xserver/Xprint/pcl/PclPixmap.c
index 64e718b2c..ba91fc9ec 100644
--- a/xc/programs/Xserver/Xprint/pcl/PclPixmap.c
+++ b/xc/programs/Xserver/Xprint/pcl/PclPixmap.c
@@ -1,6 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPixmap.c,v 1.3 1999/12/16 02:26:27 robin Exp $ */
-
-/* $XConsortium: PclPixmap.c /main/1 1996/09/28 17:01:58 rws $ */
+/* $Xorg: PclPixmap.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */
 /*******************************************************************
 **
 **    *********************************************************
@@ -46,6 +44,7 @@ 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.4 2001/01/17 22:36:30 dawes Exp $ */
 
 #include "Pcl.h"
 #include "cfb.h"
diff --git a/xc/programs/Xserver/Xprint/pcl/PclPolygon.c b/xc/programs/Xserver/Xprint/pcl/PclPolygon.c
index 669c30521..a5de77399 100644
--- a/xc/programs/Xserver/Xprint/pcl/PclPolygon.c
+++ b/xc/programs/Xserver/Xprint/pcl/PclPolygon.c
@@ -1,4 +1,4 @@
-/* $XConsortium: PclPolygon.c /main/2 1996/12/30 14:57:02 kaleb $ */
+/* $Xorg: PclPolygon.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */
 /*******************************************************************
 **
 **    *********************************************************
@@ -44,7 +44,7 @@ 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/PclPolygon.c,v 1.6 1999/12/13 02:12:56 robin Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPolygon.c,v 1.7 2001/01/17 22:36:30 dawes Exp $ */
 
 
 #include "Pcl.h"
diff --git a/xc/programs/Xserver/Xprint/pcl/PclPrint.c b/xc/programs/Xserver/Xprint/pcl/PclPrint.c
index 663f44022..79ca630a0 100644
--- a/xc/programs/Xserver/Xprint/pcl/PclPrint.c
+++ b/xc/programs/Xserver/Xprint/pcl/PclPrint.c
@@ -1,4 +1,4 @@
-/* $XConsortium: PclPrint.c /main/4 1996/12/30 16:37:15 kaleb $ */
+/* $Xorg: PclPrint.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */
 /*******************************************************************
 **
 **    *********************************************************
@@ -43,7 +43,7 @@ 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/PclPrint.c,v 1.5 1999/12/13 02:12:57 robin Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPrint.c,v 1.6 2001/01/17 22:36:30 dawes Exp $ */
 
 #include <stdio.h>
 #include <string.h>
diff --git a/xc/programs/Xserver/Xprint/pcl/PclSFonts.c b/xc/programs/Xserver/Xprint/pcl/PclSFonts.c
index 12f0bf3f0..b3005cd3d 100644
--- a/xc/programs/Xserver/Xprint/pcl/PclSFonts.c
+++ b/xc/programs/Xserver/Xprint/pcl/PclSFonts.c
@@ -1,4 +1,4 @@
-/* $XConsortium: PclSFonts.c /main/2 1996/12/30 14:57:11 kaleb $ */
+/* $Xorg: PclSFonts.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */
 /*******************************************************************
 **
 **    *********************************************************
@@ -45,7 +45,7 @@ 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/PclSFonts.c,v 1.4 1999/12/13 02:12:57 robin Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclSFonts.c,v 1.5 2001/01/17 22:36:30 dawes Exp $ */
 
 
 #include <stdio.h>
diff --git a/xc/programs/Xserver/Xprint/pcl/PclSFonts.h b/xc/programs/Xserver/Xprint/pcl/PclSFonts.h
index 6708d038c..5992c12af 100644
--- a/xc/programs/Xserver/Xprint/pcl/PclSFonts.h
+++ b/xc/programs/Xserver/Xprint/pcl/PclSFonts.h
@@ -1,4 +1,4 @@
-/* $XConsortium: PclSFonts.h /main/1 1996/09/28 17:02:39 rws $ */
+/* $Xorg: PclSFonts.h,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */
 #ifndef _PCLFONTS_H
 #define _PCLFONTS_H
 
diff --git a/xc/programs/Xserver/Xprint/pcl/PclSpans.c b/xc/programs/Xserver/Xprint/pcl/PclSpans.c
index c7eb4f452..98c17dcf9 100644
--- a/xc/programs/Xserver/Xprint/pcl/PclSpans.c
+++ b/xc/programs/Xserver/Xprint/pcl/PclSpans.c
@@ -1,4 +1,4 @@
-/* $XConsortium: PclSpans.c /main/2 1996/12/30 14:57:17 kaleb $ */
+/* $Xorg: PclSpans.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */
 /*******************************************************************
 **
 **    *********************************************************
@@ -44,7 +44,7 @@ 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/PclSpans.c,v 1.5 1999/12/13 02:12:57 robin Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclSpans.c,v 1.6 2001/01/17 22:36:30 dawes Exp $ */
 
 
 #include "Pcl.h"
diff --git a/xc/programs/Xserver/Xprint/pcl/PclText.c b/xc/programs/Xserver/Xprint/pcl/PclText.c
index 26e5f912e..39b943238 100644
--- a/xc/programs/Xserver/Xprint/pcl/PclText.c
+++ b/xc/programs/Xserver/Xprint/pcl/PclText.c
@@ -1,4 +1,4 @@
-/* $XConsortium: PclText.c /main/2 1996/12/30 14:57:22 kaleb $ */
+/* $Xorg: PclText.c,v 1.4 2000/08/17 19:48:08 cpqbld Exp $ */
 /*******************************************************************
 **
 **    *********************************************************
@@ -44,7 +44,7 @@ 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/PclText.c,v 1.6 1999/12/13 02:12:58 robin Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclText.c,v 1.8 2001/01/19 17:10:50 dawes Exp $ */
 
 #ifdef DO_TWO_BYTE_PCL
 #include "iconv.h"
@@ -150,7 +150,8 @@ char font_type;
 	 */
 	MACRO_START( outFile, pConPriv );
 	sprintf(t, "\033%%0B;PU%d,%dPD;TD1;DT%c,1;",
-                x + pDrawable->x, y + pDrawable->y, ETX);
+                x + pDrawable->x, y + pDrawable->y + pGC->font->info.fontAscent,
+		ETX);
 	SAVE_PCL( outFile, pConPriv, t );
 	SAVE_PCL_COUNT( outFile, pConPriv, "FI0;SS;LB", 9 );
 
@@ -196,7 +197,8 @@ char font_type;
 	 */
 	MACRO_START( outFile, pConPriv );
 	sprintf(t, "\033%%0B;PU%d,%dPD;TD1;DT%c,1;",
-		x + pDrawable->x, y + pDrawable->y, ETX);
+		x + pDrawable->x, y + pDrawable->y + pGC->font->info.fontAscent,
+		ETX);
 	SAVE_PCL( outFile, pConPriv, t );
 	selectSize(outFile, pConPriv, pin);
 	SAVE_PCL_COUNT( outFile, pConPriv, "FI0;SS;LB", 9 );
@@ -223,15 +225,14 @@ char font_type;
      * Convert the collection of rectangles into a proper region, then
      * intersect it with the clip region.
      */
-    box.x1 = x + charinfo[0]->metrics.leftSideBearing + pDrawable->x;
-    box.y1 = y - max_ascent + pDrawable->y;
-    box.x2 = x + w - charinfo[n-1]->metrics.characterWidth
-		+ charinfo[n-1]->metrics.rightSideBearing + pDrawable->x;
-    box.y2 = y + max_descent + pDrawable->y;
+    box.x1 = x +  pDrawable->x;
+    box.y1 = y - max_ascent + pDrawable->y + pGC->font->info.fontAscent;
+    box.x2 = x + w + pDrawable->x;
+    box.y2 = y + max_descent + pDrawable->y + pGC->font->info.fontAscent;
 
-    drawRegion = REGION_CREATE( pGC->pScreen, &box, 0 );
-    region = REGION_CREATE( pGC->pScreen, NULL, 0 );
-    REGION_INTERSECT( pGC->pScreen, region, drawRegion, pGC->pCompositeClip );
+    drawRegion = miRegionCreate( &box, 0 );
+    region = miRegionCreate( NULL, 0 );
+    miIntersect( region, drawRegion, pGC->pCompositeClip );
 
     /*
      * For each rectangle in the clip region, set the HP-GL/2 "input
@@ -335,7 +336,8 @@ char font_type;
 	 */
 	MACRO_START( outFile, pConPriv );
 	sprintf(t, "\033%%0B;PU%d,%dPD;TD1;DT%c,1;",
-		x + pDrawable->x, y + pDrawable->y, ETX);
+		x + pDrawable->x, y + pDrawable->y + pGC->font->info.fontAscent,
+		ETX);
 	SAVE_PCL( outFile, pConPriv, t );
 	SAVE_PCL_COUNT( outFile, pConPriv, "FI0;SS;LB", 9 );
 
@@ -393,7 +395,8 @@ char font_type;
 	 */
 	MACRO_START( outFile, pConPriv );
 	sprintf(t, "\033%%0B;PU%d,%dPD;TD1;DT%c,1;",
-		x + pDrawable->x, y + pDrawable->y, ETX);
+		x + pDrawable->x, y + pDrawable->y + pGC->font->info.fontAscent,
+		ETX);
 	SAVE_PCL( outFile, pConPriv, t );
 	sprintf(t, "TD0;\033%%1A");
 	SAVE_PCL( outFile, pConPriv, t );
@@ -421,15 +424,14 @@ char font_type;
      * Convert the collection of rectangles into a proper region, then
      * intersect it with the clip region.
      */
-    box.x1 = x + charinfo[0]->metrics.leftSideBearing + pDrawable->x;
-    box.y1 = y - max_ascent + pDrawable->y;
-    box.x2 = x + w - charinfo[n-1]->metrics.characterWidth
-		+ charinfo[n-1]->metrics.rightSideBearing + pDrawable->x;
-    box.y2 = y + max_descent + pDrawable->y;
-
-    drawRegion = REGION_CREATE( pGC->pScreen, &box, 0 );
-    region = REGION_CREATE( pGC->pScreen, NULL, 0 );
-    REGION_INTERSECT( pGC->pScreen, region, drawRegion, pGC->pCompositeClip );
+    box.x1 = x + pDrawable->x;
+    box.y1 = y - max_ascent + pDrawable->y + pGC->font->info.fontAscent;
+    box.x2 = x + w + pDrawable->x;
+    box.y2 = y + max_descent + pDrawable->y + pGC->font->info.fontAscent;
+
+    drawRegion = miRegionCreate( &box, 0 );
+    region = miRegionCreate( NULL, 0 );
+    miIntersect( region, drawRegion, pGC->pCompositeClip );
 
     /*
      * For each rectangle in the clip region, set the HP-GL/2 "input
diff --git a/xc/programs/Xserver/Xprint/pcl/PclWindow.c b/xc/programs/Xserver/Xprint/pcl/PclWindow.c
index 2fef1415f..1a0925a84 100644
--- a/xc/programs/Xserver/Xprint/pcl/PclWindow.c
+++ b/xc/programs/Xserver/Xprint/pcl/PclWindow.c
@@ -1,4 +1,4 @@
-/* $XConsortium: PclWindow.c /main/3 1996/12/30 16:37:28 kaleb $ */
+/* $Xorg: PclWindow.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */
 /*******************************************************************
 **
 **    *********************************************************
@@ -44,7 +44,7 @@ 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/PclWindow.c,v 1.7 1998/12/20 11:57:27 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclWindow.c,v 1.8 2001/01/17 22:36:30 dawes Exp $ */
 
 
 #include <stdio.h>
diff --git a/xc/programs/Xserver/Xprint/pcl/Pclmap.h b/xc/programs/Xserver/Xprint/pcl/Pclmap.h
index 67f246517..5bac74ac3 100644
--- a/xc/programs/Xserver/Xprint/pcl/Pclmap.h
+++ b/xc/programs/Xserver/Xprint/pcl/Pclmap.h
@@ -1,4 +1,4 @@
-/* $XConsortium: Pclmap.h /main/2 1996/11/16 15:27:02 rws $ */
+/* $Xorg: Pclmap.h,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */
 /*
 (c) Copyright 1996 Hewlett-Packard Company
 (c) Copyright 1996 International Business Machines Corp.
@@ -30,7 +30,7 @@ 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/Pclmap.h,v 1.3 1999/12/13 02:12:58 robin Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/pcl/Pclmap.h,v 1.4 2001/01/17 22:36:30 dawes Exp $ */
 
 #ifndef _PCLMAP_H_
 #define _PCLMAP_H_