merge latest (4.3.99.16) from XFree86 (vendor) branch

6 files changed, 14 insertions, 18 deletions

diff --git a/Xprint/ps/Ps.h b/Xprint/ps/Ps.h
index 9c65dc26f..7b0aaeb39 100644
--- a/Xprint/ps/Ps.h
+++ b/Xprint/ps/Ps.h
@@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group.
 **    *********************************************************
 ** 
 ********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xprint/ps/Ps.h,v 1.13 2001/12/21 21:02:05 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/ps/Ps.h,v 1.14 2003/07/16 01:38:34 dawes Exp $ */
 
 #ifndef _PS_H_
 #define _PS_H_
@@ -93,7 +93,7 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/extensions/Print.h>
 #include <X11/extensions/Printstr.h>
 
-#include "miscstruct.h"
+#include "regionstr.h"
 #include "fontstruct.h"
 #include "dixfontstr.h"
 #include "gcstruct.h"
diff --git a/Xprint/ps/PsFonts.c b/Xprint/ps/PsFonts.c
index 15abc4b88..9792dae4d 100644
--- a/Xprint/ps/PsFonts.c
+++ b/Xprint/ps/PsFonts.c
@@ -57,7 +57,7 @@ in this Software without prior written authorization from The Open Group.
  * or other dealings in this Software without prior written authorization
  * from said copyright holders.
  */
-/* $XFree86: xc/programs/Xserver/Xprint/ps/PsFonts.c,v 1.6 2001/12/19 21:55:59 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/ps/PsFonts.c,v 1.7 2003/07/16 01:38:34 dawes Exp $ */
 
 /*******************************************************************
 **
@@ -75,7 +75,7 @@ in this Software without prior written authorization from The Open Group.
 ** 
 ********************************************************************/
 
-#include "miscstruct.h"
+#include "regionstr.h"
 #include "fontstruct.h"
 #include "dixfontstr.h"
 #include "scrnintstr.h"
diff --git a/Xprint/ps/PsGC.c b/Xprint/ps/PsGC.c
index c1e12f57c..1c2877231 100644
--- a/Xprint/ps/PsGC.c
+++ b/Xprint/ps/PsGC.c
@@ -57,7 +57,7 @@ in this Software without prior written authorization from The Open Group.
  * or other dealings in this Software without prior written authorization
  * from said copyright holders.
  */
-/* $XFree86: xc/programs/Xserver/Xprint/ps/PsGC.c,v 1.6 2001/12/14 19:59:15 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/ps/PsGC.c,v 1.7 2003/10/29 22:11:55 tsi Exp $ */
 
 /*******************************************************************
 **
@@ -181,7 +181,6 @@ PsUpdateDrawableGC(
   GC               dGC;
   unsigned long    valid;
   int              i;
-  PsContextPrivPtr cPriv;
   BoxPtr           boxes;
 
   if (!PsGetDrawablePrivateStuff(pDrawable, &dGC, &valid, psOut, cMap))
@@ -233,8 +232,6 @@ PsUpdateDrawableGC(
         PsOut_Offset(*psOut, pDrawable->x, pDrawable->y);
         PsOut_Clip(*psOut, pGC->clientClipType, (PsClipPtr)pGC->clientClip);
       }
-      cPriv = ( PsGetContextFromWindow( (WindowPtr)pDrawable ) )
-             ->devPrivates[PsContextPrivateIndex].ptr;
       break;
   }
   return TRUE;
diff --git a/Xprint/ps/PsInit.c b/Xprint/ps/PsInit.c
index fe2471185..193fc0518 100644
--- a/Xprint/ps/PsInit.c
+++ b/Xprint/ps/PsInit.c
@@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group.
 **    *********************************************************
 **
 ********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xprint/ps/PsInit.c,v 1.13 2002/10/16 21:13:33 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/ps/PsInit.c,v 1.14 2003/10/29 22:11:55 tsi Exp $ */
 
 #include <stdio.h>
 #include <string.h>
@@ -108,7 +108,9 @@ InitializePsDriver(ndx, pScreen, argc, argv)
   int         argc;
   char      **argv;
 {
+#if 0
   PsScreenPrivPtr   pPriv;
+#endif
   int               nVisuals;
   int               nDepths;
   VisualPtr         visuals;
@@ -125,8 +127,10 @@ InitializePsDriver(ndx, pScreen, argc, argv)
  */
   AllocatePsPrivates(pScreen);
 
+#if 0
   pPriv = (PsScreenPrivPtr)pScreen->devPrivates[PsScreenPrivateIndex].ptr;
-/*pPriv->resDB = rmdb;*/
+  pPriv->resDB = rmdb;
+#endif
 
   pScreen->defColormap            = (Colormap) FakeClientID(0);
   pScreen->blackPixel             = 1;
diff --git a/Xprint/ps/PsText.c b/Xprint/ps/PsText.c
index 41ba592f6..b04d910d5 100644
--- a/Xprint/ps/PsText.c
+++ b/Xprint/ps/PsText.c
@@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group.
 **    *********************************************************
 ** 
 ********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xprint/ps/PsText.c,v 1.12 2001/12/14 19:59:17 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/ps/PsText.c,v 1.13 2003/10/29 22:11:55 tsi Exp $ */
 
 #include "Ps.h"
 #include "gcstruct.h"
@@ -164,7 +164,6 @@ PsPolyText8(
 	/* If Type1 font, try to download to printer first */
 	if(strstr(ffname, "Type1") && readFontName(ffname, file_name, dlfnam)) 
 	{
-            int          iso;
             int          siz;
             float        mtx[4];
             PsOutPtr     psOut;
@@ -177,7 +176,6 @@ PsPolyText8(
             PsOut_Offset(psOut, pDrawable->x, pDrawable->y);
        	    PsOut_Color(psOut, PsGetPixelColor(cMap, pGC->fgPixel)); 
        	    siz = PsGetFontSize(pGC->font, mtx);
-       	    iso = PsIsISOLatin1Encoding(pGC->font);
        	    if( !siz ) PsOut_TextAttrsMtx(psOut, file_name, mtx, 1); 
             else PsOut_TextAttrs(psOut, file_name, siz, 1); 
        	    PsOut_Text(psOut, x, y, string, count, -1);
@@ -401,7 +399,7 @@ PsPolyGlyphBlt(
     int gWidth, gHeight;                /* width and height of glyph */
     register int nbyGlyphWidth;         /* bytes per scanline of glyph */
     int nbyPadGlyph;                    /* server padded line of glyph */
-    int w, tmpx;
+    int w;
     XID gcvals[3];
 
     pfont = pGC->font;
@@ -437,7 +435,6 @@ PsPolyGlyphBlt(
         PsDestroyPixmap(pPixmap);
         return;
     }
-    tmpx = 0;
     while(nGlyphs--)
     {
         pci = *pCharInfo++;
diff --git a/Xprint/ps/PsWindow.c b/Xprint/ps/PsWindow.c
index 87d8143aa..e39b602cb 100644
--- a/Xprint/ps/PsWindow.c
+++ b/Xprint/ps/PsWindow.c
@@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group.
 **    *********************************************************
 ** 
 ********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xprint/ps/PsWindow.c,v 1.12 2001/12/19 21:55:59 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/ps/PsWindow.c,v 1.13 2003/10/29 22:11:55 tsi Exp $ */
 
 #include <stdio.h>
 #include <string.h>
@@ -219,7 +219,6 @@ PsPaintWindow(
   RegionPtr pRegion,
   int       what)
 {
-  WindowPtr pRoot;
 
 #define FUNCTION        0
 #define FOREGROUND      1
@@ -299,7 +298,6 @@ PsPaintWindow(
   gcmask |= GCFunction | GCClipMask;
 
   i = pScreen->myNum;
-  pRoot = WindowTable[i];
 
   pBgWin = pWin;
   if (what == PW_BORDER)