diff options
author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-06-26 21:08:37 -0700 |
---|---|---|
committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-06-26 21:11:42 -0700 |
commit | 74003cdc55c5ca091c0804328c3d140b2b38baa4 (patch) | |
tree | 098b18eb22ca3b33119f70376ad8dfa0bc48ead7 /xlsfonts.c | |
parent | 36c17f9c944955968450da73decbbb4def72a115 (diff) |
Remove unused Xprint support
BUILD_PRINTSUPPORT has never been defined in autoconf/automake builds,
so it hasn't been built since 6.9
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Diffstat (limited to 'xlsfonts.c')
-rw-r--r-- | xlsfonts.c | 223 |
1 files changed, 0 insertions, 223 deletions
@@ -32,9 +32,6 @@ in this Software without prior written authorization from The Open Group. #include <stdio.h> #include <stdlib.h> #include <limits.h> -#ifdef BUILD_PRINTSUPPORT -#include <X11/XprintUtil/xprintutil.h> -#endif /* BUILD_PRINTSUPPORT */ #include "dsimple.h" #define N_START INT_MAX /* Maximum # of fonts to start with (should @@ -61,18 +58,11 @@ static int min_max; typedef struct { char *name; XFontStruct *info; -#ifdef BUILD_PRINTSUPPORT - char *listfonts_modes; -#endif /* BUILD_PRINTSUPPORT */ } FontList; static FontList *font_list = NULL; /* Local prototypes */ -#ifdef BUILD_PRINTSUPPORT -static Bool IsListfontsModesChangeSupported(char *mode); -static int SetListfontsModes(const char *attrname, Bool enableattr); -#endif /* BUILD_PRINTSUPPORT */ static void get_list(char *pattern); static int compare(const void *arg1, const void *arg2); static void show_fonts(void); @@ -92,24 +82,11 @@ void usage(void) fprintf (stderr, " -C force columns\n"); fprintf (stderr, " -1 force single column\n"); fprintf (stderr, " -u keep output unsorted\n"); -#ifdef BUILD_PRINTSUPPORT - fprintf (stderr, " -r resolution set print resolution\n"); - fprintf (stderr, " -b list printer builtin fonts\n"); - fprintf (stderr, " -B do not list printer builtin fonts\n"); - fprintf (stderr, " -g list glyph fonts\n"); - fprintf (stderr, " -G do not list glyph fonts\n"); - fprintf (stderr, " -x mode enable listfont mode\n"); - fprintf (stderr, " -X mode disable listfont mode\n"); -#endif /* BUILD_PRINTSUPPORT */ fprintf (stderr, " -o use OpenFont/QueryFont instead of ListFonts\n"); fprintf (stderr, " -w width maximum width for multiple columns\n"); fprintf (stderr, " -n columns number of columns if multi column\n"); fprintf (stderr, " -display displayname X server to contact\n"); fprintf (stderr, " -d displayname (alias for -display displayname)\n"); -#ifdef BUILD_PRINTSUPPORT - fprintf (stderr, " -printer printername printer to use\n"); - fprintf (stderr, " -p printername (alias for -p printername)\n"); -#endif /* BUILD_PRINTSUPPORT */ fprintf (stderr, "\n"); Close_Display(); exit(EXIT_FAILURE); @@ -118,23 +95,12 @@ void usage(void) int main(int argc, char **argv) { int argcnt = 0, i; -#ifdef BUILD_PRINTSUPPORT - char *mode; -#endif INIT_NAME; /* Handle command line arguments, open display */ Setup_Display_And_Screen(&argc, argv); -#ifdef BUILD_PRINTSUPPORT - if (printer_output) { - /* XListFonts*()/XLoadFont*() honor xp-listfonts-modes only - * if there is an context _SET_ for this display */ - XpSetContext(dpy, pcontext); - } -#endif /* BUILD_PRINTSUPPORT */ - for (argv++, argc--; argc; argv++, argc--) { if (argv[0][0] == '-') { if (argcnt > 0) usage (); @@ -175,83 +141,6 @@ int main(int argc, char **argv) case 'u': sort_output = False; break; -#ifdef BUILD_PRINTSUPPORT - case 'r': - { - const char *resname; - XpuResolutionList rlist; - int num_rlist; - XpuResolutionRec *res; - - if (--argc <= 0) usage (); - argv++; - resname = argv[0]; - - if (!printer_output) - Fatal_Error("Option '%c' only supported for printers.", argv[0][i]); - rlist = XpuGetResolutionList(dpy, pcontext, &num_rlist); - if (!rlist) - Fatal_Error("Could not get list of supported resolutions (Server configuration error ?)."); - res = XpuFindResolutionByName(rlist, num_rlist, resname); - if (!res) - Fatal_Error("Could not find resolution '%s'.", resname); - XpuSetDocResolution(dpy, pcontext, res); - XpuFreeResolutionList(rlist); - } - goto next; - case 'b': - mode = "xp-list-internal-printer-fonts"; - if (!printer_output) - Fatal_Error("Option '%c' only supported for printers.", argv[0][i]); - if (!IsListfontsModesChangeSupported(mode)) - Fatal_Error("Printer does not support changing '%s'.", mode); - SetListfontsModes(mode, True); - break; - case 'B': - mode = "xp-list-internal-printer-fonts"; - if (!printer_output) - Fatal_Error("Option '%c' only supported for printers.", argv[0][i]); - if (!IsListfontsModesChangeSupported(mode)) - Fatal_Error("Printer does not support changing '%s'.", mode); - SetListfontsModes(mode, False); - break; - case 'g': - mode = "xp-list-glyph-fonts"; - if (!printer_output) - Fatal_Error("Option '%c' only supported for printers.", argv[0][i]); - if (!IsListfontsModesChangeSupported(mode)) - Fatal_Error("Printer does not support changing '%s'.", mode); - SetListfontsModes(mode, True); - break; - case 'G': - mode = "xp-list-glyph-fonts"; - if (!printer_output) - Fatal_Error("Option '%c' only supported for printers.", argv[0][i]); - if (!IsListfontsModesChangeSupported(mode)) - Fatal_Error("Printer does not support changing '%s'.", mode); - SetListfontsModes(mode, False); - break; - case 'x': - if (--argc <= 0) usage (); - argv++; - mode = argv[0]; - if (!printer_output) - Fatal_Error("Option '%c' only supported for printers.", argv[0][i-1]); - if (!IsListfontsModesChangeSupported(mode)) - Fatal_Error("Printer does not support changing '%s'.", mode); - SetListfontsModes(mode, True); - goto next; - case 'X': - if (--argc <= 0) usage (); - argv++; - mode = argv[0]; - if (!printer_output) - Fatal_Error("Option '%c' only supported for printers.", argv[0][i-1]); - if (!IsListfontsModesChangeSupported(mode)) - Fatal_Error("Printer does not support changing '%s'.", mode); - SetListfontsModes(mode, False); - goto next; -#endif /* BUILD_PRINTSUPPORT */ default: usage(); break; @@ -274,86 +163,6 @@ int main(int argc, char **argv) return EXIT_SUCCESS; } -#ifdef BUILD_PRINTSUPPORT -/* This should be moved to XprintUtils */ -static -Bool IsListfontsModesChangeSupported(char *mode) -{ - char *value; - Bool isSupported; - - value = XpGetOneAttribute(dpy, pcontext, XPPrinterAttr, "xp-listfonts-modes-supported"); - if (!value) - return False; - - isSupported = (strstr(value, mode) != NULL)?(True):(False); - XFree(value); - - return isSupported; -} - -/* XXX: This should be moved to XprintUtils (and should have a Document/Page-level - * option and should verify that the matching leven supports xp-listfonts-modes - * changes)*/ -static -int SetListfontsModes(const char *attrname, Bool enableattr) -{ - char *value, - *newvalue; - - value = XpGetOneAttribute(dpy, pcontext, XPDocAttr, "xp-listfonts-modes"); - if (!value) - value = strdup(""); - - /* Set attribute */ - if (enableattr) - { - /* Return success if |attrname| is already set */ - if (strstr(value, attrname) != NULL) - { - XFree(value); - return 1; /* success */ - } - - newvalue = malloc(strlen(value) + strlen(attrname) + 2); - if (!newvalue) - { - XFree(value); - Fatal_Error("SetListfontsModes: No memory."); - } - - sprintf(newvalue, "%s %s", value, attrname); - XpuSetOneAttribute(dpy, pcontext, XPDocAttr, "*xp-listfonts-modes", newvalue, XPAttrMerge); - - free(newvalue); - XFree(value); - return 1; /* success */ - } - else - { - char *s, /* copy string "source" */ - *d; /* copy string "destination" */ - - /* Return success if |attrname| not set */ - d = strstr(value, attrname); - if (d == NULL) - { - XFree(value); - return 1; /* success */ - } - - /* strip |attrname| from |value| */ - s = d+strlen(attrname); - while( (*d++ = *s++) != '\0' ) - ; - - XpuSetOneAttribute(dpy, pcontext, XPDocAttr, "*xp-listfonts-modes", value, XPAttrMerge); - - XFree(value); - return 1; /* success */ - } -} -#endif /* BUILD_PRINTSUPPORT */ static void get_list(char *pattern) @@ -405,24 +214,6 @@ void get_list(char *pattern) font_list[font_cnt].info = info + i; else font_list[font_cnt].info = NULL; - -#ifdef BUILD_PRINTSUPPORT - if (printer_output) { - char *listfonts_modes; - - listfonts_modes = XpGetOneAttribute(dpy, pcontext, XPDocAttr, "xp-listfonts-modes"); - - /* Save status of xp-listfonts-modes */ - font_list[font_cnt].listfonts_modes = strdup(listfonts_modes?listfonts_modes:""); - - if (listfonts_modes) - XFree(listfonts_modes); - } - else - { - font_list[font_cnt].listfonts_modes = NULL; - } -#endif /* BUILD_PRINTSUPPORT */ font_cnt++; } @@ -454,13 +245,6 @@ void show_fonts(void) if (long_list > L_MEDIUM) { for (i = 0; i < font_cnt; i++) { -#ifdef BUILD_PRINTSUPPORT - if (printer_output) { - /* Restore saved xp-listfonts-modes status */ - XpuSetOneAttribute(dpy, pcontext, XPDocAttr, "*xp-listfonts-modes", font_list[i].listfonts_modes, XPAttrMerge); - } -#endif /* BUILD_PRINTSUPPORT */ - do_query_font (dpy, font_list[i].name); } return; @@ -668,15 +452,8 @@ static char* stringValued [] = { /* values are atoms */ "RASTERIZER_VERSION", /* other registered font properties (see the X.org Registry, sec. 15) */ - -#ifdef BUILD_PRINTSUPPORT - /* Used by Xprint's Postscript and PDF DDX */ "_ADOBE_POSTSCRIPT_FONTNAME", - /* Used by Xprint's PCL DDXs */ - "PCL_FONT_NAME", -#endif /* BUILD_PRINTSUPPORT */ - /* unregistered font properties */ "CHARSET_COLLECTIONS", "CLASSIFICATION", |