From 105875357c72e58dea0fa50c3746f8f62e2b4243 Mon Sep 17 00:00:00 2001 From: Roland Mainz Date: Mon, 3 Jan 2005 01:06:35 +0000 Subject: xc/lib/XprintAppUtil/xpapputil.c xc/lib/XprintAppUtil/xpapputil.h xc/lib/XprintUtil/xprintutil.c xc/lib/XprintUtil/xprintutil.h xc/programs/glxgears/glxgears.c xc/programs/xdbedizzy/xdbedizzy.c xc/programs/xedit/Xedit-xprint.ad xc/programs/xedit/commands.c xc/programs/xlogo/print.c xc/programs/xlsfonts/xlsfonts.c xc/programs/xlsfonts/xlsfonts.man xc/programs/xlsfonts/xlsfonts.sgml xc/programs/xman/Xman-xprint.ad xc/programs/xman/handler.c xc/programs/xman/print.c xc/programs/xman/print.h xc/programs/xmore/XMore.ad xc/programs/xmore/print.c xc/programs/xmore/print.h xc/programs/xmore/printdialog.c xc/programs/xmore/printdialog.h xc/programs/xmore/printdialogprivates.h xc/programs/xmore/xmore.c xc/programs/xphelloworld/xpawhelloworld/xpawhelloworld.c xc/programs/xphelloworld/xphelloworld/xphelloworld.c xc/programs/xphelloworld/xpsimplehelloworld/xpsimplehelloworld.c xc/programs/xphelloworld/xpxmhelloworld/xpxmhelloworld.c xc/programs/xphelloworld/xpxthelloworld/xpxthelloworld.c xc/programs/xplsprinters/xplsprinters.c //bugs.freedesktop.org/show_bug.cgi?id=1706) attachment #1615 (https://bugs.freedesktop.org/attachment.cgi?id=1615): XprintUtils 2004/Q3 update. This adds various new features to the XprintUtils library including support for page resolutions where X_resolution!=Y_resolution, listfonts-mode control and initial framework for the COLORSPACE extension. Patch by Roland Mainz and Julien Lafon . --- xlsfonts.c | 24 ++++++++++++++++++++++++ xlsfonts.man | 12 ++++++++++-- xlsfonts.sgml | 18 ++++++++++++++++++ 3 files changed, 52 insertions(+), 2 deletions(-) diff --git a/xlsfonts.c b/xlsfonts.c index 9718c93..4e2be2b 100644 --- a/xlsfonts.c +++ b/xlsfonts.c @@ -93,6 +93,7 @@ void usage(void) 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"); @@ -173,6 +174,29 @@ int main(int argc, char **argv) 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) diff --git a/xlsfonts.man b/xlsfonts.man index 325ce06..b92484a 100644 --- a/xlsfonts.man +++ b/xlsfonts.man @@ -1,5 +1,5 @@ .\" -*- coding: us-ascii -*- -.TH xlsfonts __appmansuffix__ "8 October 2004" +.TH xlsfonts __appmansuffix__ "25 October 2004" .SH NAME xlsfonts \- server font list displayer for X .SH SYNOPSIS @@ -15,7 +15,7 @@ xlsfonts \- server font list displayer for X \fBxlsfonts\fR \kx .if (\nxu > (\n(.lu / 2)) .nr x (\n(.lu / 5) 'in \n(.iu+\nxu -\fB\-printer \fBprintername\fR\fR [\fB\-l\fR] [\fB\-ll\fR] [\fB\-lll\fR] [\fB\-m\fR] [\fB\-C\fR] [\fB\-1\fR] [\fB\-w \fBwidth\fR\fR] [\fB\-n \fBcolumns\fR\fR] [\fB\-u\fR] [\fB\-o\fR] [\fB\-b\fR] [\fB\-B\fR] [\fB\-g\fR] [\fB\-G\fR] [\fB\-x \fBmode\fR\fR] [\fB\-X \fBmode\fR\fR] [\fB\-fn \fBpattern\fR\fR] +\fB\-printer \fBprintername\fR\fR [\fB\-l\fR] [\fB\-ll\fR] [\fB\-lll\fR] [\fB\-m\fR] [\fB\-C\fR] [\fB\-1\fR] [\fB\-w \fBwidth\fR\fR] [\fB\-n \fBcolumns\fR\fR] [\fB\-u\fR] [\fB\-o\fR] [\fB\-r \fBresolution\fR\fR] [\fB\-b\fR] [\fB\-B\fR] [\fB\-g\fR] [\fB\-G\fR] [\fB\-x \fBmode\fR\fR] [\fB\-X \fBmode\fR\fR] [\fB\-fn \fBpattern\fR\fR] 'in \n(.iu-\nxu .ad b .SH DESCRIPTION @@ -82,6 +82,14 @@ This is useful if ListFonts or ListFontsWithInfo fail to list a known font (as is the case with some scaled font systems). .TP +\fB\-r \fIresolutionname\fB\fR +Set print resolution name (usually values like \fB300dpi\fR +or \fB300x600\fR, see output of xplsprinters). +This may alter the output of xlsfonts if there are printer +fonts which get enabled/disabled on per-resolution basis by the DDX. + +(printer mode only) +.TP \fB\-b\fR List printer builtin fonts. This is the same as \fB\-x xp\-list\-internal\-printer\-fonts\fR. diff --git a/xlsfonts.sgml b/xlsfonts.sgml index fa46518..ff313ca 100644 --- a/xlsfonts.sgml +++ b/xlsfonts.sgml @@ -79,6 +79,8 @@ manual volume numbers. + + @@ -266,6 +268,22 @@ manual volume numbers. + + + + + + Set print resolution name (usually values like 300dpi + or 300x600, see output of xplsprinters). + This may alter the output of xlsfonts if there are printer + fonts which get enabled/disabled on per-resolution basis by the DDX. + + + (printer mode only) + + + + -- cgit v1.2.3