Remove printer font support.

Xprint is just insidious, isn't it.

6 files changed, 1 insertions, 413 deletions

diff --git a/src/fc/fserve.c b/src/fc/fserve.c
index 07ada34..3980fb0 100644
--- a/src/fc/fserve.c
+++ b/src/fc/fserve.c
@@ -3200,70 +3200,3 @@ fs_register_fpe_functions(void)
 			 NULL,
 			 NULL);
 }
-
-static int
-check_fs_open_font(pointer client, FontPathElementPtr fpe, Mask flags, 
-		   char *name, int namelen, 
-		   fsBitmapFormat format, fsBitmapFormatMask fmask, 
-		   XID id, FontPtr *ppfont,
-		   char **alias, FontPtr non_cachable_font)
-{
-    if (XpClientIsBitmapClient(client))
-	return (fs_open_font(client, fpe, flags, name, namelen, format, 
-			fmask, id, ppfont, alias, non_cachable_font) );
-    return BadFontName;
-}
-
-static int
-check_fs_list_fonts(pointer client, FontPathElementPtr fpe, 
-		    char *pattern, int patlen, int maxnames, 
-		    FontNamesPtr newnames)
-{
-    if (XpClientIsBitmapClient(client))
-	return (fs_list_fonts(client, fpe, pattern, patlen, maxnames, 
-		newnames));
-    return BadFontName;
-}
-
-static int
-check_fs_start_list_with_info(pointer client, FontPathElementPtr fpe, 
-			      char *pattern, int len, int maxnames, 
-			      pointer *pdata)
-{
-    if (XpClientIsBitmapClient(client))
-	return (fs_start_list_with_info(client, fpe, pattern, len, maxnames,
-		pdata));
-    return BadFontName;
-}
-
-static int
-check_fs_next_list_with_info(pointer client, FontPathElementPtr fpe, 
-			     char **namep, int *namelenp, 
-			     FontInfoPtr *pFontInfo, int *numFonts,
-			     pointer private)
-{
-    if (XpClientIsBitmapClient(client))
-	return (fs_next_list_with_info(client, fpe, namep, namelenp, pFontInfo, 
-		numFonts,private));
-    return BadFontName;
-}
-
-void
-check_fs_register_fpe_functions(void)
-{
-    RegisterFPEFunctions(fs_name_check,
-			 fs_init_fpe,
-			 fs_free_fpe,
-			 fs_reset_fpe,
-			 check_fs_open_font,
-			 fs_close_font,
-			 check_fs_list_fonts,
-			 check_fs_start_list_with_info,
-			 check_fs_next_list_with_info,
-			 fs_wakeup,
-			 fs_client_died,
-			 _fs_load_glyphs,
-			 NULL,
-			 NULL,
-			 NULL);
-}
diff --git a/src/fontfile/Makefile.am b/src/fontfile/Makefile.am
index 45d1dba..05aded2 100644
--- a/src/fontfile/Makefile.am
+++ b/src/fontfile/Makefile.am
@@ -18,7 +18,6 @@ libfontfile_la_SOURCES = 	\
 	decompress.c		\
 	defaults.c		\
 	dirfile.c		\
-	ffcheck.c		\
 	fileio.c		\
 	filewr.c		\
 	fontdir.c		\
@@ -26,7 +25,6 @@ libfontfile_la_SOURCES = 	\
 	fontfile.c		\
 	fontscale.c		\
 	gunzip.c		\
-	printerfont.c		\
 	register.c		\
 	renderers.c		\
 	catalogue.c
diff --git a/src/fontfile/ffcheck.c b/src/fontfile/ffcheck.c
deleted file mode 100644
index e7f8b85..0000000
--- a/src/fontfile/ffcheck.c
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
-
-Copyright 1991, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-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
-OPEN GROUP 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 name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/font/fontfile/ffcheck.c,v 1.15tsi Exp $ */
-
-/*
- * Author:  Keith Packard, MIT X Consortium
- */
-/* $NCDXorg: @(#)fontfile.c,v 1.6 1991/07/02 17:00:46 lemke Exp $ */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <X11/fonts/fntfilst.h>
-#include <X11/fonts/bitmap.h>
-
-/*
- * Map FPE functions to renderer functions
- */
-
-
-/* Here we must check the client to see if it has a context attached to
- * it that allows us to access the printer fonts
- */
-
-static int
-FontFileCheckOpenFont (pointer client, FontPathElementPtr fpe, Mask flags, 
-		       char *name, int namelen, 
-		       fsBitmapFormat format, fsBitmapFormatMask fmask,
-		       XID id, FontPtr *pFont, char **aliasName, 
-		       FontPtr non_cachable_font)
-{
-    if (XpClientIsBitmapClient(client))
-	return (FontFileOpenFont  (client, fpe, flags, name, namelen, format, 
-		fmask, id, pFont, aliasName, non_cachable_font));
-    return BadFontName;
-}
-
-static int
-FontFileCheckListFonts (pointer client, FontPathElementPtr fpe, 
-			char *pat, int len, int max, FontNamesPtr names)
-{
-    if (XpClientIsBitmapClient(client))
-	return FontFileListFonts (client, fpe, pat, len, max, names);
-    return BadFontName;
-}
-
-static int
-FontFileCheckStartListFontsWithInfo(pointer client, FontPathElementPtr fpe, 
-				    char *pat, int len, int max, 
-				    pointer *privatep)
-{
-    if (XpClientIsBitmapClient(client))
-	return FontFileStartListFontsWithInfo(client, fpe, pat, len, 
-				max, privatep);
-    return BadFontName;
-}
-
-static int
-FontFileCheckListNextFontWithInfo(pointer client, FontPathElementPtr fpe, 
-				  char **namep, int *namelenp, 
-				  FontInfoPtr *pFontInfo,
-				  int *numFonts, pointer private)
-{
-    if (XpClientIsBitmapClient(client))
-	return FontFileListNextFontWithInfo(client, fpe, namep, namelenp, 
-				pFontInfo, numFonts, private);
-    return BadFontName;
-}
-
-static int
-FontFileCheckStartListFontsAndAliases(pointer client, FontPathElementPtr fpe, 
-				      char *pat, int len, int max, 
-				      pointer *privatep)
-{
-    if (XpClientIsBitmapClient(client))
-	return FontFileStartListFontsAndAliases(client, fpe, pat, len, 
-				max, privatep);
-    return BadFontName;
-}
-
-static int
-FontFileCheckListNextFontOrAlias(pointer client, FontPathElementPtr fpe, 
-				 char **namep, int *namelenp, 
-				 char **resolvedp, int *resolvedlenp, 
-				 pointer private)
-{
-    if (XpClientIsBitmapClient(client))
-	return FontFileListNextFontOrAlias(client, fpe, namep, namelenp, 
-				resolvedp, resolvedlenp, private);
-    return BadFontName;
-}
-
-void
-FontFileCheckRegisterFpeFunctions (void)
-{
-#ifdef XFONT_BITMAP
-    /* bitmap is always builtin to libXfont now */
-    BitmapRegisterFontFileFunctions ();
-#endif
-
-#ifdef XFONT_FREETYPE
-    FreeTypeRegisterFontFileFunctions();
-#endif
-
-    RegisterFPEFunctions(FontFileNameCheck,
-			 FontFileInitFPE,
-			 FontFileFreeFPE,
-			 FontFileResetFPE,
-			 FontFileCheckOpenFont,
-			 FontFileCloseFont,
-			 FontFileCheckListFonts,
-			 FontFileCheckStartListFontsWithInfo,
-			 FontFileCheckListNextFontWithInfo,
-			 NULL,
-			 NULL,
-			 NULL,
-			 FontFileCheckStartListFontsAndAliases,
-			 FontFileCheckListNextFontOrAlias,
-			 FontFileEmptyBitmapSource);
-}
diff --git a/src/fontfile/printerfont.c b/src/fontfile/printerfont.c
deleted file mode 100644
index 0b6c19c..0000000
--- a/src/fontfile/printerfont.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/* $Xorg: printerfont.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */
-
-/*
-
-Copyright 1991, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-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
-OPEN GROUP 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 name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/font/fontfile/printerfont.c,v 1.5tsi Exp $ */
-
-/*
- * Author:  Keith Packard, MIT X Consortium
- */
-/* $NCDXorg: @(#)fontfile.c,v 1.6 1991/07/02 17:00:46 lemke Exp $ */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include    <X11/fonts/fntfilst.h>
-
-/*
- * Map FPE functions to renderer functions
- */
-
-#define PRINTERPATHPREFIX  "PRINTER:"
-
-/* STUB
-int XpClientIsPrintClient(client,fpe)
-pointer		client;
-FontPathElementPtr	fpe;
-{ return 1; }
- */
-
-static int
-PrinterFontNameCheck (char *name)
-{
-    if (strncmp(name,PRINTERPATHPREFIX,strlen(PRINTERPATHPREFIX)) != 0)
-	return 0;
-    name += strlen(PRINTERPATHPREFIX);
-#ifndef NCD
-    return *name == '/';
-#else
-    return ((strcmp(name, "built-ins") == 0) || (*name == '/'));
-#endif
-}
-
-static int
-PrinterFontInitFPE (FontPathElementPtr fpe)
-{
-    int			status;
-    FontDirectoryPtr	dir;
-    char *		name;
-
-    name = fpe->name + strlen(PRINTERPATHPREFIX);
-    status = FontFileReadDirectory (name, &dir);
-    if (status == Successful)
-    {
-	if (dir->nonScalable.used > 0)
-	    if (!FontFileRegisterBitmapSource (fpe))
-	    {
-		FontFileFreeFPE (fpe);
-		return AllocError;
-	    }
-	fpe->private = (pointer) dir;
-    }
-    return status;
-}
-
-/* Here we must check the client to see if it has a context attached to
- * it that allows us to access the printer fonts
- */
-
-static int
-PrinterFontOpenFont (pointer client, FontPathElementPtr fpe, Mask flags, 
-		     char *name, int namelen, 
-		     fsBitmapFormat format, fsBitmapFormatMask fmask,
-		     XID id, FontPtr *pFont, char **aliasName, 
-		     FontPtr non_cachable_font)
-{
-    if (XpClientIsPrintClient(client,fpe))
-	return (FontFileOpenFont  (client, fpe, flags, name, namelen, format, 
-		fmask, id, pFont, aliasName, non_cachable_font));
-    return BadFontName;
-}
-
-static int
-PrinterFontListFonts (pointer client, FontPathElementPtr fpe, char *pat, 
-		      int len, int max, FontNamesPtr names)
-{
-    if (XpClientIsPrintClient(client,fpe))
-	return FontFileListFonts (client, fpe, pat, len, max, names);
-    return BadFontName;
-}
-
-static int
-PrinterFontStartListFontsWithInfo(pointer client, FontPathElementPtr fpe, 
-				  char *pat, int len, int max, 
-				  pointer *privatep)
-{
-    if (XpClientIsPrintClient(client,fpe))
-	return FontFileStartListFontsWithInfo(client, fpe, pat, len, 
-				max, privatep);
-    return BadFontName;
-}
-
-static int
-PrinterFontListNextFontWithInfo(pointer client, FontPathElementPtr fpe, 
-				char **namep, int *namelenp, 
-				FontInfoPtr *pFontInfo,
-				int *numFonts, pointer private)
-{
-    if (XpClientIsPrintClient(client,fpe))
-	return FontFileListNextFontWithInfo(client, fpe, namep, namelenp, 
-				pFontInfo, numFonts, private);
-    return BadFontName;
-}
-
-static int
-PrinterFontStartListFontsAndAliases(pointer client, FontPathElementPtr fpe, 
-				    char *pat, int len, int max, 
-				    pointer *privatep)
-{
-    if (XpClientIsPrintClient(client,fpe))
-	return FontFileStartListFontsAndAliases(client, fpe, pat, len, 
-				max, privatep);
-    return BadFontName;
-}
-
-static int
-PrinterFontListNextFontOrAlias(pointer client, FontPathElementPtr fpe, 
-			       char **namep, int *namelenp, 
-			       char **resolvedp, int *resolvedlenp, 
-			       pointer private)
-{
-    if (XpClientIsPrintClient(client,fpe))
-	return FontFileListNextFontOrAlias(client, fpe, namep, namelenp, 
-				resolvedp, resolvedlenp, private);
-    return BadFontName;
-}
-
-void
-PrinterFontRegisterFpeFunctions (void)
-{
-    RegisterFPEFunctions(PrinterFontNameCheck,
-			 PrinterFontInitFPE,
-			 FontFileFreeFPE,
-			 FontFileResetFPE,
-			 PrinterFontOpenFont,
-			 FontFileCloseFont,
-			 PrinterFontListFonts,
-			 PrinterFontStartListFontsWithInfo,
-			 PrinterFontListNextFontWithInfo,
-			 NULL,
-			 NULL,
-			 NULL,
-			 PrinterFontStartListFontsAndAliases,
-			 PrinterFontListNextFontOrAlias,
-			 FontFileEmptyBitmapSource);
-}
diff --git a/src/stubs/Makefile.am b/src/stubs/Makefile.am
index cb3bb35..4d60c2a 100644
--- a/src/stubs/Makefile.am
+++ b/src/stubs/Makefile.am
@@ -22,5 +22,4 @@ libstubs_la_SOURCES = 		\
 	servclient.c		\
 	setfntauth.c		\
 	stfntcfnt.c		\
-	stubs.h			\
-	xpstubs.c
+	stubs.h	
diff --git a/src/stubs/xpstubs.c b/src/stubs/xpstubs.c
deleted file mode 100644
index 939b34f..0000000
--- a/src/stubs/xpstubs.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include "stubs.h"
-
-#ifdef __SUNPRO_C
-#pragma weak XpClientIsBitmapClient
-#pragma weak XpClientIsPrintClient
-#endif
-
-weak Bool
-XpClientIsBitmapClient(ClientPtr client)
-{
-    return True;
-}
-
-weak Bool
-XpClientIsPrintClient(ClientPtr client, FontPathElementPtr fpe)
-{
-    return False;
-}