mirror of
https://github.com/openbsd/xenocara.git
synced 2025-12-08 18:28:43 +00:00
Update to xlsfonts 1.0.3
This commit is contained in:
matthieu
@@ -1,3 +1,161 @@
|
||||
commit 922c6ce1384df559116d764598b81c375e9e5790
|
||||
Author: Julien Cristau <jcristau@debian.org>
|
||||
Date: Sat Jun 12 01:53:46 2010 +0200
|
||||
|
||||
Bump to 1.0.3
|
||||
|
||||
commit 94e0301bc885226fa938d97cdea80aa0641852e4
|
||||
Author: Julien Cristau <jcristau@debian.org>
|
||||
Date: Sat Jun 12 01:53:24 2010 +0200
|
||||
|
||||
Require xorg-macros 1.4 for INSTALL_CMD
|
||||
|
||||
commit b8a4fec22f8c625b9fa5f48ebb135a4251fb95cd
|
||||
Author: Julien Cristau <jcristau@debian.org>
|
||||
Date: Sat Jun 12 01:48:45 2010 +0200
|
||||
|
||||
Use string literals as format strings
|
||||
|
||||
Allows gcc to check argument types, and avoids warnings:
|
||||
xlsfonts.c:632: warning: format not a string literal, argument types not checked
|
||||
|
||||
commit f21fa74b794b301c022519bb319a952642bb55fc
|
||||
Author: Julien Cristau <jcristau@debian.org>
|
||||
Date: Sat Jun 12 01:44:28 2010 +0200
|
||||
|
||||
Remove _bitmap_error prototype from dsimple.c
|
||||
|
||||
The function itself was dropped in
|
||||
77c46f5ed8d96106ff117f89932ada0439193cb6.
|
||||
|
||||
commit df4fc8e66daef31fb4d6dba92ad2b590043c2c16
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Thu Feb 11 10:08:07 2010 -0500
|
||||
|
||||
config: move CWARNFLAGS from configure.ac to Makefile.am
|
||||
|
||||
Compiler warning flags should be explicitly set in the makefile
|
||||
rather than being merged with other packages compiler flags.
|
||||
|
||||
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||
|
||||
commit 4942d87b8f285b5c297850243f2321fe52417d89
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Thu Nov 26 09:19:54 2009 -0500
|
||||
|
||||
Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
|
||||
|
||||
Now that the INSTALL file is generated.
|
||||
Allows running make maintainer-clean.
|
||||
|
||||
commit f3b063653c915f8cf14c255ce155f9c3dcd7de5e
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Wed Oct 28 14:09:08 2009 -0400
|
||||
|
||||
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
|
||||
|
||||
Add missing INSTALL file. Use standard GNU file on building tarball
|
||||
README may have been updated
|
||||
Remove AUTHORS file as it is empty and no content available yet.
|
||||
Remove NEWS file as it is empty and no content available yet.
|
||||
|
||||
commit 71409ac8501b5199683609752175d6207b909dd1
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Tue Oct 27 15:07:25 2009 -0400
|
||||
|
||||
Deploy the new XORG_DEFAULT_OPTIONS #24242
|
||||
|
||||
This macro aggregate a number of existing macros that sets commmon
|
||||
X.Org components configuration options. It shields the configuration file from
|
||||
future changes.
|
||||
|
||||
commit 509023d3d1915658768c245faeb4291c7082303b
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Mon Oct 26 22:08:39 2009 -0400
|
||||
|
||||
Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
|
||||
|
||||
ChangeLog filename is known to Automake and requires no further
|
||||
coding in the makefile.
|
||||
|
||||
commit db151b864af443a00c7ddb45fb950b86c786b62a
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Thu Oct 22 12:34:15 2009 -0400
|
||||
|
||||
.gitignore: use common defaults with custom section # 24239
|
||||
|
||||
Using common defaults will reduce errors and maintenance.
|
||||
Only the very small or inexistent custom section need periodic maintenance
|
||||
when the structure of the component changes. Do not edit defaults.
|
||||
|
||||
commit c275d500f99c45730a171f072499824d8bbac52f
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Sun Sep 27 16:05:57 2009 -0400
|
||||
|
||||
Makefile.am: do not include autogen.sh in distribution #24183
|
||||
|
||||
This is a private build script that should not be distributed
|
||||
|
||||
commit 945735806c440ca4127e54fe3fd34d53e192a138
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Thu Oct 1 14:54:26 2009 -0700
|
||||
|
||||
Add README with pointers to mailing lists, bugzilla, & git
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
|
||||
commit 77c46f5ed8d96106ff117f89932ada0439193cb6
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Fri Jun 26 21:19:42 2009 -0700
|
||||
|
||||
Remove unused code from dsimple.c
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
|
||||
commit 74003cdc55c5ca091c0804328c3d140b2b38baa4
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Fri Jun 26 21:08:37 2009 -0700
|
||||
|
||||
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>
|
||||
|
||||
commit 36c17f9c944955968450da73decbbb4def72a115
|
||||
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
|
||||
Date: Thu Jan 22 15:56:40 2009 -0200
|
||||
|
||||
Correct make distcheck.
|
||||
|
||||
commit 1ac29d73633d50b37871f60db95de47fad58cd93
|
||||
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
|
||||
Date: Sun Mar 16 18:27:14 2008 -0300
|
||||
|
||||
Compile warning fixes.
|
||||
|
||||
Ansify functions in dsimple.c.
|
||||
Protect unused variables around the related ifdef.
|
||||
|
||||
commit dae232f6b65e06c44d8f2332a9d10f68115d7c79
|
||||
Author: Branden Robinson <branden@debian.org>
|
||||
Date: Fri Feb 11 02:14:27 2005 -0500
|
||||
|
||||
Do not spew usage on connection error
|
||||
|
||||
General philosophy:
|
||||
|
||||
The user should only be shown a usage message when:
|
||||
* it is asked for with a --help option or the like.
|
||||
* the command line is syntactically invalid.
|
||||
|
||||
commit 78779cf48ec892325c4e3a9962f4a96c1c4c4b89
|
||||
Author: James Cloos <cloos@jhcloos.com>
|
||||
Date: Thu Dec 6 15:51:08 2007 -0500
|
||||
|
||||
Add missing PHONY line for automatic ChangeLog generation
|
||||
|
||||
commit c06da04f53d4f85ff67c73db3a8f24750297f1d7
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Thu Feb 1 13:53:37 2007 -0800
|
||||
|
||||
@@ -1,6 +1,297 @@
|
||||
Installation Instructions
|
||||
*************************
|
||||
|
||||
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
|
||||
2006, 2007, 2008 Free Software Foundation, Inc.
|
||||
|
||||
This file is free documentation; the Free Software Foundation gives
|
||||
unlimited permission to copy, distribute and modify it.
|
||||
|
||||
Basic Installation
|
||||
==================
|
||||
|
||||
Briefly, the shell commands `./configure; make; make install' should
|
||||
configure, build, and install this package. The following
|
||||
more-detailed instructions are generic; see the `README' file for
|
||||
instructions specific to this package.
|
||||
|
||||
The `configure' shell script attempts to guess correct values for
|
||||
various system-dependent variables used during compilation. It uses
|
||||
those values to create a `Makefile' in each directory of the package.
|
||||
It may also create one or more `.h' files containing system-dependent
|
||||
definitions. Finally, it creates a shell script `config.status' that
|
||||
you can run in the future to recreate the current configuration, and a
|
||||
file `config.log' containing compiler output (useful mainly for
|
||||
debugging `configure').
|
||||
|
||||
It can also use an optional file (typically called `config.cache'
|
||||
and enabled with `--cache-file=config.cache' or simply `-C') that saves
|
||||
the results of its tests to speed up reconfiguring. Caching is
|
||||
disabled by default to prevent problems with accidental use of stale
|
||||
cache files.
|
||||
|
||||
If you need to do unusual things to compile the package, please try
|
||||
to figure out how `configure' could check whether to do them, and mail
|
||||
diffs or instructions to the address given in the `README' so they can
|
||||
be considered for the next release. If you are using the cache, and at
|
||||
some point `config.cache' contains results you don't want to keep, you
|
||||
may remove or edit it.
|
||||
|
||||
The file `configure.ac' (or `configure.in') is used to create
|
||||
`configure' by a program called `autoconf'. You need `configure.ac' if
|
||||
you want to change it or regenerate `configure' using a newer version
|
||||
of `autoconf'.
|
||||
|
||||
The simplest way to compile this package is:
|
||||
|
||||
1. `cd' to the directory containing the package's source code and type
|
||||
`./configure' to configure the package for your system.
|
||||
|
||||
Running `configure' might take a while. While running, it prints
|
||||
some messages telling which features it is checking for.
|
||||
|
||||
2. Type `make' to compile the package.
|
||||
|
||||
3. Optionally, type `make check' to run any self-tests that come with
|
||||
the package.
|
||||
|
||||
4. Type `make install' to install the programs and any data files and
|
||||
documentation.
|
||||
|
||||
5. You can remove the program binaries and object files from the
|
||||
source code directory by typing `make clean'. To also remove the
|
||||
files that `configure' created (so you can compile the package for
|
||||
a different kind of computer), type `make distclean'. There is
|
||||
also a `make maintainer-clean' target, but that is intended mainly
|
||||
for the package's developers. If you use it, you may have to get
|
||||
all sorts of other programs in order to regenerate files that came
|
||||
with the distribution.
|
||||
|
||||
6. Often, you can also type `make uninstall' to remove the installed
|
||||
files again.
|
||||
|
||||
Compilers and Options
|
||||
=====================
|
||||
|
||||
Some systems require unusual options for compilation or linking that
|
||||
the `configure' script does not know about. Run `./configure --help'
|
||||
for details on some of the pertinent environment variables.
|
||||
|
||||
You can give `configure' initial values for configuration parameters
|
||||
by setting variables in the command line or in the environment. Here
|
||||
is an example:
|
||||
|
||||
./configure CC=c99 CFLAGS=-g LIBS=-lposix
|
||||
|
||||
*Note Defining Variables::, for more details.
|
||||
|
||||
Compiling For Multiple Architectures
|
||||
====================================
|
||||
|
||||
You can compile the package for more than one kind of computer at the
|
||||
same time, by placing the object files for each architecture in their
|
||||
own directory. To do this, you can use GNU `make'. `cd' to the
|
||||
directory where you want the object files and executables to go and run
|
||||
the `configure' script. `configure' automatically checks for the
|
||||
source code in the directory that `configure' is in and in `..'.
|
||||
|
||||
With a non-GNU `make', it is safer to compile the package for one
|
||||
architecture at a time in the source code directory. After you have
|
||||
installed the package for one architecture, use `make distclean' before
|
||||
reconfiguring for another architecture.
|
||||
|
||||
On MacOS X 10.5 and later systems, you can create libraries and
|
||||
executables that work on multiple system types--known as "fat" or
|
||||
"universal" binaries--by specifying multiple `-arch' options to the
|
||||
compiler but only a single `-arch' option to the preprocessor. Like
|
||||
this:
|
||||
|
||||
./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
|
||||
CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
|
||||
CPP="gcc -E" CXXCPP="g++ -E"
|
||||
|
||||
This is not guaranteed to produce working output in all cases, you
|
||||
may have to build one architecture at a time and combine the results
|
||||
using the `lipo' tool if you have problems.
|
||||
|
||||
Installation Names
|
||||
==================
|
||||
|
||||
By default, `make install' installs the package's commands under
|
||||
`/usr/local/bin', include files under `/usr/local/include', etc. You
|
||||
can specify an installation prefix other than `/usr/local' by giving
|
||||
`configure' the option `--prefix=PREFIX'.
|
||||
|
||||
You can specify separate installation prefixes for
|
||||
architecture-specific files and architecture-independent files. If you
|
||||
pass the option `--exec-prefix=PREFIX' to `configure', the package uses
|
||||
PREFIX as the prefix for installing programs and libraries.
|
||||
Documentation and other data files still use the regular prefix.
|
||||
|
||||
In addition, if you use an unusual directory layout you can give
|
||||
options like `--bindir=DIR' to specify different values for particular
|
||||
kinds of files. Run `configure --help' for a list of the directories
|
||||
you can set and what kinds of files go in them.
|
||||
|
||||
If the package supports it, you can cause programs to be installed
|
||||
with an extra prefix or suffix on their names by giving `configure' the
|
||||
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
|
||||
|
||||
Optional Features
|
||||
=================
|
||||
|
||||
Some packages pay attention to `--enable-FEATURE' options to
|
||||
`configure', where FEATURE indicates an optional part of the package.
|
||||
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
|
||||
is something like `gnu-as' or `x' (for the X Window System). The
|
||||
`README' should mention any `--enable-' and `--with-' options that the
|
||||
package recognizes.
|
||||
|
||||
For packages that use the X Window System, `configure' can usually
|
||||
find the X include and library files automatically, but if it doesn't,
|
||||
you can use the `configure' options `--x-includes=DIR' and
|
||||
`--x-libraries=DIR' to specify their locations.
|
||||
|
||||
Particular systems
|
||||
==================
|
||||
|
||||
On HP-UX, the default C compiler is not ANSI C compatible. If GNU
|
||||
CC is not installed, it is recommended to use the following options in
|
||||
order to use an ANSI C compiler:
|
||||
|
||||
./configure CC="cc -Ae"
|
||||
|
||||
and if that doesn't work, install pre-built binaries of GCC for HP-UX.
|
||||
|
||||
On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
|
||||
parse its `<wchar.h>' header file. The option `-nodtk' can be used as
|
||||
a workaround. If GNU CC is not installed, it is therefore recommended
|
||||
to try
|
||||
|
||||
./configure CC="cc"
|
||||
|
||||
and if that doesn't work, try
|
||||
|
||||
./configure CC="cc -nodtk"
|
||||
|
||||
Specifying the System Type
|
||||
==========================
|
||||
|
||||
There may be some features `configure' cannot figure out
|
||||
automatically, but needs to determine by the type of machine the package
|
||||
will run on. Usually, assuming the package is built to be run on the
|
||||
_same_ architectures, `configure' can figure that out, but if it prints
|
||||
a message saying it cannot guess the machine type, give it the
|
||||
`--build=TYPE' option. TYPE can either be a short name for the system
|
||||
type, such as `sun4', or a canonical name which has the form:
|
||||
|
||||
CPU-COMPANY-SYSTEM
|
||||
|
||||
where SYSTEM can have one of these forms:
|
||||
|
||||
OS KERNEL-OS
|
||||
|
||||
See the file `config.sub' for the possible values of each field. If
|
||||
`config.sub' isn't included in this package, then this package doesn't
|
||||
need to know the machine type.
|
||||
|
||||
If you are _building_ compiler tools for cross-compiling, you should
|
||||
use the option `--target=TYPE' to select the type of system they will
|
||||
produce code for.
|
||||
|
||||
If you want to _use_ a cross compiler, that generates code for a
|
||||
platform different from the build platform, you should specify the
|
||||
"host" platform (i.e., that on which the generated programs will
|
||||
eventually be run) with `--host=TYPE'.
|
||||
|
||||
Sharing Defaults
|
||||
================
|
||||
|
||||
If you want to set default values for `configure' scripts to share,
|
||||
you can create a site shell script called `config.site' that gives
|
||||
default values for variables like `CC', `cache_file', and `prefix'.
|
||||
`configure' looks for `PREFIX/share/config.site' if it exists, then
|
||||
`PREFIX/etc/config.site' if it exists. Or, you can set the
|
||||
`CONFIG_SITE' environment variable to the location of the site script.
|
||||
A warning: not all `configure' scripts look for a site script.
|
||||
|
||||
Defining Variables
|
||||
==================
|
||||
|
||||
Variables not defined in a site shell script can be set in the
|
||||
environment passed to `configure'. However, some packages may run
|
||||
configure again during the build, and the customized values of these
|
||||
variables may be lost. In order to avoid this problem, you should set
|
||||
them in the `configure' command line, using `VAR=value'. For example:
|
||||
|
||||
./configure CC=/usr/local2/bin/gcc
|
||||
|
||||
causes the specified `gcc' to be used as the C compiler (unless it is
|
||||
overridden in the site shell script).
|
||||
|
||||
Unfortunately, this technique does not work for `CONFIG_SHELL' due to
|
||||
an Autoconf bug. Until the bug is fixed you can use this workaround:
|
||||
|
||||
CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
|
||||
|
||||
`configure' Invocation
|
||||
======================
|
||||
|
||||
`configure' recognizes the following options to control how it
|
||||
operates.
|
||||
|
||||
`--help'
|
||||
`-h'
|
||||
Print a summary of all of the options to `configure', and exit.
|
||||
|
||||
`--help=short'
|
||||
`--help=recursive'
|
||||
Print a summary of the options unique to this package's
|
||||
`configure', and exit. The `short' variant lists options used
|
||||
only in the top level, while the `recursive' variant lists options
|
||||
also present in any nested packages.
|
||||
|
||||
`--version'
|
||||
`-V'
|
||||
Print the version of Autoconf used to generate the `configure'
|
||||
script, and exit.
|
||||
|
||||
`--cache-file=FILE'
|
||||
Enable the cache: use and save the results of the tests in FILE,
|
||||
traditionally `config.cache'. FILE defaults to `/dev/null' to
|
||||
disable caching.
|
||||
|
||||
`--config-cache'
|
||||
`-C'
|
||||
Alias for `--cache-file=config.cache'.
|
||||
|
||||
`--quiet'
|
||||
`--silent'
|
||||
`-q'
|
||||
Do not print messages saying which checks are being made. To
|
||||
suppress all normal output, redirect it to `/dev/null' (any error
|
||||
messages will still be shown).
|
||||
|
||||
`--srcdir=DIR'
|
||||
Look for the package's source code in directory DIR. Usually
|
||||
`configure' can determine that directory automatically.
|
||||
|
||||
`--prefix=DIR'
|
||||
Use DIR as the installation prefix. *Note Installation Names::
|
||||
for more details, including other options available for fine-tuning
|
||||
the installation locations.
|
||||
|
||||
`--no-create'
|
||||
`-n'
|
||||
Run the configure checks, but stop before creating any output
|
||||
files.
|
||||
|
||||
`configure' also accepts some other, not widely useful, options. Run
|
||||
`configure --help' for more details.
|
||||
|
||||
Installation Instructions
|
||||
*************************
|
||||
|
||||
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
|
||||
Software Foundation, Inc.
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
bin_PROGRAMS = xlsfonts
|
||||
|
||||
xlsfonts_CFLAGS = $(XLSFONTS_CFLAGS)
|
||||
AM_CFLAGS = $(XLSFONTS_CFLAGS) $(CWARNFLAGS)
|
||||
xlsfonts_LDADD = $(XLSFONTS_LIBS)
|
||||
|
||||
xlsfonts_SOURCES = \
|
||||
@@ -32,19 +32,24 @@ xlsfonts_SOURCES = \
|
||||
appman_PRE = \
|
||||
xlsfonts.man
|
||||
|
||||
EXTRA_DIST = xlsfonts.sgml ChangeLog autogen.sh
|
||||
MAINTAINERCLEANFILES=ChangeLog
|
||||
EXTRA_DIST = xlsfonts.sgml autogen.sh
|
||||
|
||||
.PHONY: ChangeLog INSTALL
|
||||
|
||||
INSTALL:
|
||||
$(INSTALL_CMD)
|
||||
|
||||
ChangeLog:
|
||||
(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
|
||||
$(CHANGELOG_CMD)
|
||||
|
||||
dist-hook: ChangeLog
|
||||
dist-hook: ChangeLog INSTALL
|
||||
|
||||
appmandir = $(APP_MAN_DIR)
|
||||
|
||||
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
|
||||
|
||||
EXTRA_DIST += $(appman_PRE)
|
||||
MAINTAINERCLEANFILES = ChangeLog INSTALL
|
||||
CLEANFILES = $(appman_DATA)
|
||||
|
||||
SED = sed
|
||||
|
||||
@@ -62,7 +62,7 @@ bin_PROGRAMS = xlsfonts$(EXEEXT)
|
||||
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
|
||||
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
|
||||
$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
|
||||
compile config.guess config.sub depcomp install-sh missing
|
||||
config.guess config.sub depcomp install-sh missing
|
||||
subdir = .
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
|
||||
@@ -76,8 +76,7 @@ CONFIG_CLEAN_FILES =
|
||||
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"
|
||||
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
|
||||
PROGRAMS = $(bin_PROGRAMS)
|
||||
am_xlsfonts_OBJECTS = xlsfonts-dsimple.$(OBJEXT) \
|
||||
xlsfonts-xlsfonts.$(OBJEXT)
|
||||
am_xlsfonts_OBJECTS = dsimple.$(OBJEXT) xlsfonts.$(OBJEXT)
|
||||
xlsfonts_OBJECTS = $(am_xlsfonts_OBJECTS)
|
||||
am__DEPENDENCIES_1 =
|
||||
xlsfonts_DEPENDENCIES = $(am__DEPENDENCIES_1)
|
||||
@@ -117,6 +116,7 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
|
||||
AMDEP_FALSE = @AMDEP_FALSE@
|
||||
AMDEP_TRUE = @AMDEP_TRUE@
|
||||
AMTAR = @AMTAR@
|
||||
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||
APP_MAN_DIR = @APP_MAN_DIR@
|
||||
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
@@ -126,7 +126,10 @@ AWK = @AWK@
|
||||
CC = @CC@
|
||||
CCDEPMODE = @CCDEPMODE@
|
||||
CFLAGS = @CFLAGS@
|
||||
CHANGELOG_CMD = @CHANGELOG_CMD@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CWARNFLAGS = @CWARNFLAGS@
|
||||
CYGPATH_W = @CYGPATH_W@
|
||||
DEFS = @DEFS@
|
||||
DEPDIR = @DEPDIR@
|
||||
@@ -135,9 +138,12 @@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
|
||||
ECHO_C = @ECHO_C@
|
||||
ECHO_N = @ECHO_N@
|
||||
ECHO_T = @ECHO_T@
|
||||
EGREP = @EGREP@
|
||||
EXEEXT = @EXEEXT@
|
||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||
GREP = @GREP@
|
||||
INSTALL_CMD = @INSTALL_CMD@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
@@ -152,6 +158,19 @@ MAINT = @MAINT@
|
||||
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
|
||||
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MAN_SUBSTS = \
|
||||
-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
|
||||
-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
|
||||
-e 's|__xservername__|Xorg|g' \
|
||||
-e 's|__xconfigfile__|xorg.conf|g' \
|
||||
-e 's|__projectroot__|$(prefix)|g' \
|
||||
-e 's|__apploaddir__|$(appdefaultdir)|' \
|
||||
-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
|
||||
-e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
|
||||
-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
|
||||
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
|
||||
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
|
||||
|
||||
MISC_MAN_DIR = @MISC_MAN_DIR@
|
||||
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
|
||||
OBJEXT = @OBJEXT@
|
||||
@@ -163,15 +182,15 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
SED = sed
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
STRIP = @STRIP@
|
||||
VERSION = @VERSION@
|
||||
XLSFONTS_CFLAGS = @XLSFONTS_CFLAGS@
|
||||
XLSFONTS_LIBS = @XLSFONTS_LIBS@
|
||||
XORG_MAN_PAGE = @XORG_MAN_PAGE@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
ac_ct_STRIP = @ac_ct_STRIP@
|
||||
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
|
||||
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
||||
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
||||
am__include = @am__include@
|
||||
@@ -186,28 +205,35 @@ build_cpu = @build_cpu@
|
||||
build_os = @build_os@
|
||||
build_vendor = @build_vendor@
|
||||
datadir = @datadir@
|
||||
datarootdir = @datarootdir@
|
||||
docdir = @docdir@
|
||||
dvidir = @dvidir@
|
||||
exec_prefix = @exec_prefix@
|
||||
host = @host@
|
||||
host_alias = @host_alias@
|
||||
host_cpu = @host_cpu@
|
||||
host_os = @host_os@
|
||||
host_vendor = @host_vendor@
|
||||
htmldir = @htmldir@
|
||||
includedir = @includedir@
|
||||
infodir = @infodir@
|
||||
install_sh = @install_sh@
|
||||
libdir = @libdir@
|
||||
libexecdir = @libexecdir@
|
||||
localedir = @localedir@
|
||||
localstatedir = @localstatedir@
|
||||
mandir = @mandir@
|
||||
mkdir_p = @mkdir_p@
|
||||
oldincludedir = @oldincludedir@
|
||||
pdfdir = @pdfdir@
|
||||
prefix = @prefix@
|
||||
program_transform_name = @program_transform_name@
|
||||
psdir = @psdir@
|
||||
sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
sysconfdir = @sysconfdir@
|
||||
target_alias = @target_alias@
|
||||
xlsfonts_CFLAGS = $(XLSFONTS_CFLAGS)
|
||||
AM_CFLAGS = $(XLSFONTS_CFLAGS) $(CWARNFLAGS)
|
||||
xlsfonts_LDADD = $(XLSFONTS_LIBS)
|
||||
xlsfonts_SOURCES = \
|
||||
dsimple.c \
|
||||
@@ -217,29 +243,15 @@ xlsfonts_SOURCES = \
|
||||
appman_PRE = \
|
||||
xlsfonts.man
|
||||
|
||||
EXTRA_DIST = xlsfonts.sgml ChangeLog autogen.sh $(appman_PRE)
|
||||
MAINTAINERCLEANFILES = ChangeLog
|
||||
EXTRA_DIST = xlsfonts.sgml autogen.sh $(appman_PRE)
|
||||
appmandir = $(APP_MAN_DIR)
|
||||
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
|
||||
MAINTAINERCLEANFILES = ChangeLog INSTALL
|
||||
CLEANFILES = $(appman_DATA)
|
||||
SED = sed
|
||||
|
||||
# Strings to replace in man pages
|
||||
XORGRELSTRING = @PACKAGE_STRING@
|
||||
XORGMANNAME = X Version 11
|
||||
MAN_SUBSTS = \
|
||||
-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
|
||||
-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
|
||||
-e 's|__xservername__|Xorg|g' \
|
||||
-e 's|__xconfigfile__|xorg.conf|g' \
|
||||
-e 's|__projectroot__|$(prefix)|g' \
|
||||
-e 's|__apploaddir__|$(appdefaultdir)|' \
|
||||
-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
|
||||
-e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
|
||||
-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
|
||||
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
|
||||
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
|
||||
|
||||
SUFFIXES = .$(APP_MAN_SUFFIX) .man
|
||||
all: config.h
|
||||
$(MAKE) $(AM_MAKEFLAGS) all-am
|
||||
@@ -252,15 +264,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
|
||||
@for dep in $?; do \
|
||||
case '$(am__configure_deps)' in \
|
||||
*$$dep*) \
|
||||
echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
|
||||
cd $(srcdir) && $(AUTOMAKE) --gnu \
|
||||
echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
|
||||
cd $(srcdir) && $(AUTOMAKE) --foreign \
|
||||
&& exit 0; \
|
||||
exit 1;; \
|
||||
esac; \
|
||||
done; \
|
||||
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
|
||||
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
|
||||
cd $(top_srcdir) && \
|
||||
$(AUTOMAKE) --gnu Makefile
|
||||
$(AUTOMAKE) --foreign Makefile
|
||||
.PRECIOUS: Makefile
|
||||
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
||||
@case '$?' in \
|
||||
@@ -329,8 +341,8 @@ mostlyclean-compile:
|
||||
distclean-compile:
|
||||
-rm -f *.tab.c
|
||||
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xlsfonts-dsimple.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xlsfonts-xlsfonts.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsimple.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xlsfonts.Po@am__quote@
|
||||
|
||||
.c.o:
|
||||
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
|
||||
@@ -345,34 +357,6 @@ distclean-compile:
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
|
||||
|
||||
xlsfonts-dsimple.o: dsimple.c
|
||||
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xlsfonts_CFLAGS) $(CFLAGS) -MT xlsfonts-dsimple.o -MD -MP -MF "$(DEPDIR)/xlsfonts-dsimple.Tpo" -c -o xlsfonts-dsimple.o `test -f 'dsimple.c' || echo '$(srcdir)/'`dsimple.c; \
|
||||
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xlsfonts-dsimple.Tpo" "$(DEPDIR)/xlsfonts-dsimple.Po"; else rm -f "$(DEPDIR)/xlsfonts-dsimple.Tpo"; exit 1; fi
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dsimple.c' object='xlsfonts-dsimple.o' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xlsfonts_CFLAGS) $(CFLAGS) -c -o xlsfonts-dsimple.o `test -f 'dsimple.c' || echo '$(srcdir)/'`dsimple.c
|
||||
|
||||
xlsfonts-dsimple.obj: dsimple.c
|
||||
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xlsfonts_CFLAGS) $(CFLAGS) -MT xlsfonts-dsimple.obj -MD -MP -MF "$(DEPDIR)/xlsfonts-dsimple.Tpo" -c -o xlsfonts-dsimple.obj `if test -f 'dsimple.c'; then $(CYGPATH_W) 'dsimple.c'; else $(CYGPATH_W) '$(srcdir)/dsimple.c'; fi`; \
|
||||
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xlsfonts-dsimple.Tpo" "$(DEPDIR)/xlsfonts-dsimple.Po"; else rm -f "$(DEPDIR)/xlsfonts-dsimple.Tpo"; exit 1; fi
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dsimple.c' object='xlsfonts-dsimple.obj' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xlsfonts_CFLAGS) $(CFLAGS) -c -o xlsfonts-dsimple.obj `if test -f 'dsimple.c'; then $(CYGPATH_W) 'dsimple.c'; else $(CYGPATH_W) '$(srcdir)/dsimple.c'; fi`
|
||||
|
||||
xlsfonts-xlsfonts.o: xlsfonts.c
|
||||
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xlsfonts_CFLAGS) $(CFLAGS) -MT xlsfonts-xlsfonts.o -MD -MP -MF "$(DEPDIR)/xlsfonts-xlsfonts.Tpo" -c -o xlsfonts-xlsfonts.o `test -f 'xlsfonts.c' || echo '$(srcdir)/'`xlsfonts.c; \
|
||||
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xlsfonts-xlsfonts.Tpo" "$(DEPDIR)/xlsfonts-xlsfonts.Po"; else rm -f "$(DEPDIR)/xlsfonts-xlsfonts.Tpo"; exit 1; fi
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xlsfonts.c' object='xlsfonts-xlsfonts.o' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xlsfonts_CFLAGS) $(CFLAGS) -c -o xlsfonts-xlsfonts.o `test -f 'xlsfonts.c' || echo '$(srcdir)/'`xlsfonts.c
|
||||
|
||||
xlsfonts-xlsfonts.obj: xlsfonts.c
|
||||
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xlsfonts_CFLAGS) $(CFLAGS) -MT xlsfonts-xlsfonts.obj -MD -MP -MF "$(DEPDIR)/xlsfonts-xlsfonts.Tpo" -c -o xlsfonts-xlsfonts.obj `if test -f 'xlsfonts.c'; then $(CYGPATH_W) 'xlsfonts.c'; else $(CYGPATH_W) '$(srcdir)/xlsfonts.c'; fi`; \
|
||||
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xlsfonts-xlsfonts.Tpo" "$(DEPDIR)/xlsfonts-xlsfonts.Po"; else rm -f "$(DEPDIR)/xlsfonts-xlsfonts.Tpo"; exit 1; fi
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xlsfonts.c' object='xlsfonts-xlsfonts.obj' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xlsfonts_CFLAGS) $(CFLAGS) -c -o xlsfonts-xlsfonts.obj `if test -f 'xlsfonts.c'; then $(CYGPATH_W) 'xlsfonts.c'; else $(CYGPATH_W) '$(srcdir)/xlsfonts.c'; fi`
|
||||
uninstall-info-am:
|
||||
install-appmanDATA: $(appman_DATA)
|
||||
@$(NORMAL_INSTALL)
|
||||
@@ -671,10 +655,15 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
|
||||
uninstall-info-am
|
||||
|
||||
|
||||
ChangeLog:
|
||||
(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
|
||||
.PHONY: ChangeLog INSTALL
|
||||
|
||||
dist-hook: ChangeLog
|
||||
INSTALL:
|
||||
$(INSTALL_CMD)
|
||||
|
||||
ChangeLog:
|
||||
$(CHANGELOG_CMD)
|
||||
|
||||
dist-hook: ChangeLog INSTALL
|
||||
|
||||
.man.$(APP_MAN_SUFFIX):
|
||||
sed $(MAN_SUBSTS) < $< > $@
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
xlsfonts lists fonts available from an X server via the X11 core protocol.
|
||||
|
||||
All questions regarding this software should be directed at the
|
||||
Xorg mailing list:
|
||||
|
||||
http://lists.freedesktop.org/mailman/listinfo/xorg
|
||||
|
||||
Please submit bug reports to the Xorg bugzilla:
|
||||
|
||||
https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
|
||||
|
||||
The master development code repository can be found at:
|
||||
|
||||
git://anongit.freedesktop.org/git/xorg/app/xlsfonts
|
||||
|
||||
http://cgit.freedesktop.org/xorg/app/xlsfonts
|
||||
|
||||
For patch submission instructions, see:
|
||||
|
||||
http://www.x.org/wiki/Development/Documentation/SubmittingPatches
|
||||
|
||||
For more information on the git code manager, see:
|
||||
|
||||
http://wiki.x.org/wiki/GitPage
|
||||
|
||||
|
||||
881
app/xlsfonts/aclocal.m4
vendored
881
app/xlsfonts/aclocal.m4
vendored
File diff suppressed because it is too large
Load Diff
@@ -1,142 +0,0 @@
|
||||
#! /bin/sh
|
||||
# Wrapper for compilers which do not understand `-c -o'.
|
||||
|
||||
scriptversion=2005-05-14.22
|
||||
|
||||
# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
|
||||
# Written by Tom Tromey <tromey@cygnus.com>.
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2, or (at your option)
|
||||
# any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
# As a special exception to the GNU General Public License, if you
|
||||
# distribute this file as part of a program that contains a
|
||||
# configuration script generated by Autoconf, you may include it under
|
||||
# the same distribution terms that you use for the rest of that program.
|
||||
|
||||
# This file is maintained in Automake, please report
|
||||
# bugs to <bug-automake@gnu.org> or send patches to
|
||||
# <automake-patches@gnu.org>.
|
||||
|
||||
case $1 in
|
||||
'')
|
||||
echo "$0: No command. Try \`$0 --help' for more information." 1>&2
|
||||
exit 1;
|
||||
;;
|
||||
-h | --h*)
|
||||
cat <<\EOF
|
||||
Usage: compile [--help] [--version] PROGRAM [ARGS]
|
||||
|
||||
Wrapper for compilers which do not understand `-c -o'.
|
||||
Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
|
||||
arguments, and rename the output as expected.
|
||||
|
||||
If you are trying to build a whole package this is not the
|
||||
right script to run: please start by reading the file `INSTALL'.
|
||||
|
||||
Report bugs to <bug-automake@gnu.org>.
|
||||
EOF
|
||||
exit $?
|
||||
;;
|
||||
-v | --v*)
|
||||
echo "compile $scriptversion"
|
||||
exit $?
|
||||
;;
|
||||
esac
|
||||
|
||||
ofile=
|
||||
cfile=
|
||||
eat=
|
||||
|
||||
for arg
|
||||
do
|
||||
if test -n "$eat"; then
|
||||
eat=
|
||||
else
|
||||
case $1 in
|
||||
-o)
|
||||
# configure might choose to run compile as `compile cc -o foo foo.c'.
|
||||
# So we strip `-o arg' only if arg is an object.
|
||||
eat=1
|
||||
case $2 in
|
||||
*.o | *.obj)
|
||||
ofile=$2
|
||||
;;
|
||||
*)
|
||||
set x "$@" -o "$2"
|
||||
shift
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
*.c)
|
||||
cfile=$1
|
||||
set x "$@" "$1"
|
||||
shift
|
||||
;;
|
||||
*)
|
||||
set x "$@" "$1"
|
||||
shift
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
shift
|
||||
done
|
||||
|
||||
if test -z "$ofile" || test -z "$cfile"; then
|
||||
# If no `-o' option was seen then we might have been invoked from a
|
||||
# pattern rule where we don't need one. That is ok -- this is a
|
||||
# normal compilation that the losing compiler can handle. If no
|
||||
# `.c' file was seen then we are probably linking. That is also
|
||||
# ok.
|
||||
exec "$@"
|
||||
fi
|
||||
|
||||
# Name of file we expect compiler to create.
|
||||
cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
|
||||
|
||||
# Create the lock directory.
|
||||
# Note: use `[/.-]' here to ensure that we don't use the same name
|
||||
# that we are using for the .o file. Also, base the name on the expected
|
||||
# object file name, since that is what matters with a parallel build.
|
||||
lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
|
||||
while true; do
|
||||
if mkdir "$lockdir" >/dev/null 2>&1; then
|
||||
break
|
||||
fi
|
||||
sleep 1
|
||||
done
|
||||
# FIXME: race condition here if user kills between mkdir and trap.
|
||||
trap "rmdir '$lockdir'; exit 1" 1 2 15
|
||||
|
||||
# Run the compile.
|
||||
"$@"
|
||||
ret=$?
|
||||
|
||||
if test -f "$cofile"; then
|
||||
mv "$cofile" "$ofile"
|
||||
elif test -f "${cofile}bj"; then
|
||||
mv "${cofile}bj" "$ofile"
|
||||
fi
|
||||
|
||||
rmdir "$lockdir"
|
||||
exit $ret
|
||||
|
||||
# Local Variables:
|
||||
# mode: shell-script
|
||||
# sh-indentation: 2
|
||||
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
||||
# time-stamp-start: "scriptversion="
|
||||
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
||||
# time-stamp-end: "$"
|
||||
# End:
|
||||
@@ -1,5 +1,32 @@
|
||||
/* config.h.in. Generated from configure.ac by autoheader. */
|
||||
|
||||
/* Define to 1 if you have the <inttypes.h> header file. */
|
||||
#undef HAVE_INTTYPES_H
|
||||
|
||||
/* Define to 1 if you have the <memory.h> header file. */
|
||||
#undef HAVE_MEMORY_H
|
||||
|
||||
/* Define to 1 if you have the <stdint.h> header file. */
|
||||
#undef HAVE_STDINT_H
|
||||
|
||||
/* Define to 1 if you have the <stdlib.h> header file. */
|
||||
#undef HAVE_STDLIB_H
|
||||
|
||||
/* Define to 1 if you have the <strings.h> header file. */
|
||||
#undef HAVE_STRINGS_H
|
||||
|
||||
/* Define to 1 if you have the <string.h> header file. */
|
||||
#undef HAVE_STRING_H
|
||||
|
||||
/* Define to 1 if you have the <sys/stat.h> header file. */
|
||||
#undef HAVE_SYS_STAT_H
|
||||
|
||||
/* Define to 1 if you have the <sys/types.h> header file. */
|
||||
#undef HAVE_SYS_TYPES_H
|
||||
|
||||
/* Define to 1 if you have the <unistd.h> header file. */
|
||||
#undef HAVE_UNISTD_H
|
||||
|
||||
/* Name of package */
|
||||
#undef PACKAGE
|
||||
|
||||
@@ -27,5 +54,8 @@
|
||||
/* Patch version of this package */
|
||||
#undef PACKAGE_VERSION_PATCHLEVEL
|
||||
|
||||
/* Define to 1 if you have the ANSI C header files. */
|
||||
#undef STDC_HEADERS
|
||||
|
||||
/* Version number of package */
|
||||
#undef VERSION
|
||||
|
||||
7267
app/xlsfonts/configure
vendored
7267
app/xlsfonts/configure
vendored
File diff suppressed because it is too large
Load Diff
@@ -22,21 +22,26 @@ dnl
|
||||
dnl Process this file with autoconf to create configure.
|
||||
|
||||
AC_PREREQ([2.57])
|
||||
AC_INIT(xlsfonts,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xlsfonts)
|
||||
AM_INIT_AUTOMAKE([dist-bzip2])
|
||||
AC_INIT(xlsfonts,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xlsfonts)
|
||||
AM_INIT_AUTOMAKE([foreign dist-bzip2])
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
# Require xorg-macros: XORG_DEFAULT_OPTIONS
|
||||
m4_ifndef([XORG_MACROS_VERSION],
|
||||
[m4_fatal([must install xorg-macros 1.4 or later before running autoconf/autogen])])
|
||||
XORG_MACROS_VERSION(1.4)
|
||||
XORG_DEFAULT_OPTIONS
|
||||
|
||||
AM_CONFIG_HEADER(config.h)
|
||||
|
||||
AC_PROG_CC
|
||||
AC_PROG_INSTALL
|
||||
|
||||
|
||||
# Checks for pkg-config packages
|
||||
PKG_CHECK_MODULES(XLSFONTS, x11)
|
||||
AC_SUBST(XLSFONTS_CFLAGS)
|
||||
AC_SUBST(XLSFONTS_LIBS)
|
||||
|
||||
XORG_MANPAGE_SECTIONS
|
||||
XORG_RELEASE_VERSION
|
||||
|
||||
AC_OUTPUT([Makefile])
|
||||
|
||||
@@ -41,9 +41,6 @@ from The Open Group.
|
||||
* Written by Mark Lillibridge. Last updated 7/1/87
|
||||
*/
|
||||
|
||||
#ifdef BUILD_PRINTSUPPORT
|
||||
#include <X11/XprintUtil/xprintutil.h>
|
||||
#endif /* BUILD_PRINTSUPPORT */
|
||||
#include "dsimple.h"
|
||||
|
||||
/*
|
||||
@@ -61,18 +58,12 @@ from The Open Group.
|
||||
char *program_name = "unknown_program";
|
||||
Display *dpy = NULL;
|
||||
int screen = 0;
|
||||
Bool printer_output = False; /* Video or printer output ? */
|
||||
#ifdef BUILD_PRINTSUPPORT
|
||||
XPContext pcontext = None;
|
||||
#endif /* BUILD_PRINTSUPPORT */
|
||||
|
||||
static void _bitmap_error(int, char *);
|
||||
|
||||
/*
|
||||
* Malloc: like malloc but handles out of memory using Fatal_Error.
|
||||
*/
|
||||
char *Malloc(size)
|
||||
unsigned size;
|
||||
char *
|
||||
Malloc(unsigned size)
|
||||
{
|
||||
char *data;
|
||||
|
||||
@@ -86,9 +77,8 @@ char *Malloc(size)
|
||||
/*
|
||||
* Realloc: like Malloc except for realloc, handles NULL using Malloc.
|
||||
*/
|
||||
char *Realloc(ptr, size)
|
||||
char *ptr;
|
||||
int size;
|
||||
char *
|
||||
Realloc(char *ptr, int size)
|
||||
{
|
||||
char *new_ptr;
|
||||
|
||||
@@ -106,9 +96,8 @@ char *Realloc(ptr, size)
|
||||
* Get_Display_Name (argc, argv) Look for -display, -d, or host:dpy (obselete)
|
||||
* If found, remove it from command line. Don't go past a lone -.
|
||||
*/
|
||||
char *Get_Display_Name(pargc, argv)
|
||||
int *pargc; /* MODIFIED */
|
||||
char **argv; /* MODIFIED */
|
||||
static char *
|
||||
Get_Display_Name(int *pargc/* MODIFIED */, char **argv/* MODIFIED */)
|
||||
{
|
||||
int argc = *pargc;
|
||||
char **pargv = argv+1;
|
||||
@@ -138,49 +127,12 @@ char *Get_Display_Name(pargc, argv)
|
||||
}
|
||||
|
||||
|
||||
#ifdef BUILD_PRINTSUPPORT
|
||||
/*
|
||||
* Get_Printer_Name (argc, argv) Look for -printer, -p,
|
||||
* If found, remove it from command line. Don't go past a lone -.
|
||||
*/
|
||||
char *Get_Printer_Name(pargc, argv)
|
||||
int *pargc; /* MODIFIED */
|
||||
char **argv; /* MODIFIED */
|
||||
{
|
||||
int argc = *pargc;
|
||||
char **pargv = argv+1;
|
||||
char *printername = NULL;
|
||||
int i;
|
||||
|
||||
for (i = 1; i < argc; i++) {
|
||||
char *arg = argv[i];
|
||||
|
||||
if (!strcmp (arg, "-printer") || !strcmp (arg, "-p")) {
|
||||
if (++i >= argc) usage ();
|
||||
|
||||
printername = argv[i];
|
||||
*pargc -= 2;
|
||||
continue;
|
||||
}
|
||||
if (!strcmp(arg,"-")) {
|
||||
while (i<argc)
|
||||
*pargv++ = argv[i++];
|
||||
break;
|
||||
}
|
||||
*pargv++ = arg;
|
||||
}
|
||||
|
||||
*pargv = NULL;
|
||||
return (printername);
|
||||
}
|
||||
#endif /* BUILD_PRINTSUPPORT */
|
||||
|
||||
/*
|
||||
* Open_Display: Routine to open a display with correct error handling.
|
||||
* Does not require dpy or screen defined on entry.
|
||||
*/
|
||||
Display *Open_Display(display_name)
|
||||
char *display_name;
|
||||
static Display *
|
||||
Open_Display(char *display_name)
|
||||
{
|
||||
Display *d;
|
||||
|
||||
@@ -188,8 +140,7 @@ char *display_name;
|
||||
if (d == NULL) {
|
||||
fprintf (stderr, "%s: unable to open display '%s'\n",
|
||||
program_name, XDisplayName (display_name));
|
||||
usage ();
|
||||
/* doesn't return */
|
||||
exit(1);
|
||||
}
|
||||
|
||||
return(d);
|
||||
@@ -203,41 +154,13 @@ char *display_name;
|
||||
* for this display is then stored in screen.
|
||||
* Does not require dpy or screen defined.
|
||||
*/
|
||||
void Setup_Display_And_Screen(argc, argv)
|
||||
int *argc; /* MODIFIED */
|
||||
char **argv; /* MODIFIED */
|
||||
void
|
||||
Setup_Display_And_Screen(int *argc/* MODIFIED */, char **argv/* MODIFIED */)
|
||||
{
|
||||
char *displayname = NULL,
|
||||
*printername = NULL;
|
||||
|
||||
displayname = Get_Display_Name(argc, argv);
|
||||
#ifdef BUILD_PRINTSUPPORT
|
||||
printername = Get_Printer_Name(argc, argv);
|
||||
|
||||
if (displayname && printername) {
|
||||
fprintf (stderr, "%s: you cannot specify -printer (-p) and -display (-d) at the same time.\n",
|
||||
program_name);
|
||||
usage ();
|
||||
}
|
||||
char *displayname = Get_Display_Name(argc, argv);
|
||||
|
||||
if (printername) {
|
||||
printer_output = True;
|
||||
|
||||
if (XpuGetPrinter(printername, &dpy, &pcontext) != 1) {
|
||||
fprintf(stderr, "%s: Cannot open printer '%s'.\n", program_name, printername);
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
screen = XScreenNumberOfScreen(XpGetScreenOfContext(dpy, pcontext));
|
||||
}
|
||||
else
|
||||
#endif /* BUILD_PRINTSUPPORT */
|
||||
{
|
||||
printer_output = False;
|
||||
|
||||
dpy = Open_Display (displayname);
|
||||
screen = XDefaultScreen(dpy);
|
||||
}
|
||||
dpy = Open_Display (displayname);
|
||||
screen = XDefaultScreen(dpy);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -248,354 +171,8 @@ void Close_Display(void)
|
||||
if (dpy == NULL)
|
||||
return;
|
||||
|
||||
#ifdef BUILD_PRINTSUPPORT
|
||||
if (printer_output) {
|
||||
XpuClosePrinterDisplay(dpy, pcontext);
|
||||
dpy = NULL;
|
||||
pcontext = None;
|
||||
printer_output = False;
|
||||
}
|
||||
else
|
||||
#endif /* BUILD_PRINTSUPPORT */
|
||||
{
|
||||
XCloseDisplay(dpy);
|
||||
dpy = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Open_Font: This routine opens a font with error handling.
|
||||
*/
|
||||
XFontStruct *Open_Font(name)
|
||||
char *name;
|
||||
{
|
||||
XFontStruct *font;
|
||||
|
||||
if (!(font=XLoadQueryFont(dpy, name)))
|
||||
Fatal_Error("Unable to open font %s!", name);
|
||||
|
||||
return(font);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Beep: Routine to beep the display.
|
||||
*/
|
||||
void Beep()
|
||||
{
|
||||
XBell(dpy, 50);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* ReadBitmapFile: same as XReadBitmapFile except it returns the bitmap
|
||||
* directly and handles errors using Fatal_Error.
|
||||
*/
|
||||
static void _bitmap_error(status, filename)
|
||||
int status;
|
||||
char *filename;
|
||||
{
|
||||
if (status == BitmapOpenFailed)
|
||||
Fatal_Error("Can't open file %s!", filename);
|
||||
else if (status == BitmapFileInvalid)
|
||||
Fatal_Error("file %s: Bad bitmap format.", filename);
|
||||
else
|
||||
Fatal_Error("Out of memory!");
|
||||
}
|
||||
|
||||
Pixmap ReadBitmapFile(d, filename, width, height, x_hot, y_hot)
|
||||
Drawable d;
|
||||
char *filename;
|
||||
int *width, *height, *x_hot, *y_hot;
|
||||
{
|
||||
Pixmap bitmap;
|
||||
int status;
|
||||
|
||||
status = XReadBitmapFile(dpy, RootWindow(dpy, screen), filename,
|
||||
(unsigned int *)width, (unsigned int *)height,
|
||||
&bitmap, x_hot, y_hot);
|
||||
if (status != BitmapSuccess)
|
||||
_bitmap_error(status, filename);
|
||||
|
||||
return(bitmap);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* WriteBitmapFile: same as XWriteBitmapFile except it handles errors
|
||||
* using Fatal_Error.
|
||||
*/
|
||||
void WriteBitmapFile(filename, bitmap, width, height, x_hot, y_hot)
|
||||
char *filename;
|
||||
Pixmap bitmap;
|
||||
int width, height, x_hot, y_hot;
|
||||
{
|
||||
int status;
|
||||
|
||||
status= XWriteBitmapFile(dpy, filename, bitmap, width, height, x_hot,
|
||||
y_hot);
|
||||
if (status != BitmapSuccess)
|
||||
_bitmap_error(status, filename);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Select_Window_Args: a rountine to provide a common interface for
|
||||
* applications that need to allow the user to select one
|
||||
* window on the screen for special consideration.
|
||||
* This routine implements the following command line
|
||||
* arguments:
|
||||
*
|
||||
* -root Selects the root window.
|
||||
* -id <id> Selects window with id <id>. <id> may
|
||||
* be either in decimal or hex.
|
||||
* -name <name> Selects the window with name <name>.
|
||||
*
|
||||
* Call as Select_Window_Args(&argc, argv) in main before
|
||||
* parsing any of your program's command line arguments.
|
||||
* Select_Window_Args will remove its arguments so that
|
||||
* your program does not have to worry about them.
|
||||
* The window returned is the window selected or 0 if
|
||||
* none of the above arguments was present. If 0 is
|
||||
* returned, Select_Window should probably be called after
|
||||
* all command line arguments, and other setup is done.
|
||||
* For examples of usage, see xwininfo, xwd, or xprop.
|
||||
*/
|
||||
Window Select_Window_Args(rargc, argv)
|
||||
int *rargc;
|
||||
char **argv;
|
||||
#define ARGC (*rargc)
|
||||
{
|
||||
int nargc=1;
|
||||
int argc;
|
||||
char **nargv;
|
||||
Window w=0;
|
||||
|
||||
nargv = argv+1; argc = ARGC;
|
||||
#define OPTION argv[0]
|
||||
#define NXTOPTP ++argv, --argc>0
|
||||
#define NXTOPT if (++argv, --argc==0) usage()
|
||||
#define COPYOPT nargv++[0]=OPTION, nargc++
|
||||
|
||||
while (NXTOPTP) {
|
||||
if (!strcmp(OPTION, "-")) {
|
||||
COPYOPT;
|
||||
while (NXTOPTP)
|
||||
COPYOPT;
|
||||
break;
|
||||
}
|
||||
if (!strcmp(OPTION, "-root")) {
|
||||
w=RootWindow(dpy, screen);
|
||||
continue;
|
||||
}
|
||||
if (!strcmp(OPTION, "-name")) {
|
||||
NXTOPT;
|
||||
w = Window_With_Name(dpy, RootWindow(dpy, screen),
|
||||
OPTION);
|
||||
if (!w)
|
||||
Fatal_Error("No window with name %s exists!",OPTION);
|
||||
continue;
|
||||
}
|
||||
if (!strcmp(OPTION, "-id")) {
|
||||
NXTOPT;
|
||||
w=0;
|
||||
sscanf(OPTION, "0x%lx", &w);
|
||||
if (!w)
|
||||
sscanf(OPTION, "%lu", &w);
|
||||
if (!w)
|
||||
Fatal_Error("Invalid window id format: %s.", OPTION);
|
||||
continue;
|
||||
}
|
||||
COPYOPT;
|
||||
}
|
||||
ARGC = nargc;
|
||||
|
||||
return(w);
|
||||
}
|
||||
|
||||
/*
|
||||
* Other_stuff: A group of routines which do common X11 tasks.
|
||||
*
|
||||
* Written by Mark Lillibridge. Last updated 7/1/87
|
||||
*/
|
||||
|
||||
/*
|
||||
* Resolve_Color: This routine takes a color name and returns the pixel #
|
||||
* that when used in the window w will be of color name.
|
||||
* (WARNING: The colormap of w MAY be modified! )
|
||||
* If colors are run out of, only the first n colors will be
|
||||
* as correct as the hardware can make them where n depends
|
||||
* on the display. This routine does not require wind to
|
||||
* be defined.
|
||||
*/
|
||||
unsigned long Resolve_Color(w, name)
|
||||
Window w;
|
||||
char *name;
|
||||
{
|
||||
XColor c;
|
||||
Colormap colormap;
|
||||
XWindowAttributes wind_info;
|
||||
|
||||
/*
|
||||
* The following is a hack to insure machines without a rgb table
|
||||
* handle at least white & black right.
|
||||
*/
|
||||
if (!strcmp(name, "white"))
|
||||
name="#ffffffffffff";
|
||||
if (!strcmp(name, "black"))
|
||||
name="#000000000000";
|
||||
|
||||
XGetWindowAttributes(dpy, w, &wind_info);
|
||||
colormap = wind_info.colormap;
|
||||
|
||||
if (!XParseColor(dpy, colormap, name, &c))
|
||||
Fatal_Error("Bad color format '%s'.", name);
|
||||
|
||||
if (!XAllocColor(dpy, colormap, &c))
|
||||
Fatal_Error("XAllocColor failed!");
|
||||
|
||||
return(c.pixel);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Bitmap_To_Pixmap: Convert a bitmap to a 2 colored pixmap. The colors come
|
||||
* from the foreground and background colors of the gc.
|
||||
* Width and height are required solely for efficiency.
|
||||
* If needed, they can be obtained via. XGetGeometry.
|
||||
*/
|
||||
Pixmap Bitmap_To_Pixmap(dpy, d, gc, bitmap, width, height)
|
||||
Display *dpy;
|
||||
Drawable d;
|
||||
GC gc;
|
||||
Pixmap bitmap;
|
||||
int width, height;
|
||||
{
|
||||
Pixmap pix;
|
||||
int x;
|
||||
unsigned int i, depth;
|
||||
Drawable root;
|
||||
|
||||
if (!XGetGeometry(dpy, d, &root, &x, &x, &i, &i, &i, &depth))
|
||||
return(0);
|
||||
|
||||
pix = XCreatePixmap(dpy, d, width, height, (int)depth);
|
||||
|
||||
XCopyPlane(dpy, bitmap, pix, gc, 0, 0, width, height, 0, 0, 1);
|
||||
|
||||
return(pix);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* blip: a debugging routine. Prints Blip! on stderr with flushing.
|
||||
*/
|
||||
void blip()
|
||||
{
|
||||
fflush(stdout);
|
||||
fprintf(stderr, "blip!\n");
|
||||
fflush(stderr);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Routine to let user select a window using the mouse
|
||||
*/
|
||||
|
||||
Window Select_Window(dpy)
|
||||
Display *dpy;
|
||||
{
|
||||
int status;
|
||||
Cursor cursor;
|
||||
XEvent event;
|
||||
Window target_win = None, root = RootWindow(dpy,screen);
|
||||
int buttons = 0;
|
||||
|
||||
/* Make the target cursor */
|
||||
cursor = XCreateFontCursor(dpy, XC_crosshair);
|
||||
|
||||
/* Grab the pointer using target cursor, letting it room all over */
|
||||
status = XGrabPointer(dpy, root, False,
|
||||
ButtonPressMask|ButtonReleaseMask, GrabModeSync,
|
||||
GrabModeAsync, root, cursor, CurrentTime);
|
||||
if (status != GrabSuccess) Fatal_Error("Can't grab the mouse.");
|
||||
|
||||
/* Let the user select a window... */
|
||||
while ((target_win == None) || (buttons != 0)) {
|
||||
/* allow one more event */
|
||||
XAllowEvents(dpy, SyncPointer, CurrentTime);
|
||||
XWindowEvent(dpy, root, ButtonPressMask|ButtonReleaseMask, &event);
|
||||
switch (event.type) {
|
||||
case ButtonPress:
|
||||
if (target_win == None) {
|
||||
target_win = event.xbutton.subwindow; /* window selected */
|
||||
if (target_win == None) target_win = root;
|
||||
}
|
||||
buttons++;
|
||||
break;
|
||||
case ButtonRelease:
|
||||
if (buttons > 0) /* there may have been some down before we started */
|
||||
buttons--;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
XUngrabPointer(dpy, CurrentTime); /* Done with pointer */
|
||||
|
||||
return(target_win);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Window_With_Name: routine to locate a window with a given name on a display.
|
||||
* If no window with the given name is found, 0 is returned.
|
||||
* If more than one window has the given name, the first
|
||||
* one found will be returned. Only top and its subwindows
|
||||
* are looked at. Normally, top should be the RootWindow.
|
||||
*/
|
||||
Window Window_With_Name(dpy, top, name)
|
||||
Display *dpy;
|
||||
Window top;
|
||||
char *name;
|
||||
{
|
||||
Window *children, dummy;
|
||||
unsigned int nchildren;
|
||||
int i;
|
||||
Window w=0;
|
||||
char *window_name;
|
||||
|
||||
if (XFetchName(dpy, top, &window_name) && !strcmp(window_name, name))
|
||||
return(top);
|
||||
|
||||
if (!XQueryTree(dpy, top, &dummy, &dummy, &children, &nchildren))
|
||||
return(0);
|
||||
|
||||
for (i=0; i<nchildren; i++) {
|
||||
w = Window_With_Name(dpy, children[i], name);
|
||||
if (w)
|
||||
break;
|
||||
}
|
||||
if (children) XFree ((char *)children);
|
||||
return(w);
|
||||
}
|
||||
|
||||
/*
|
||||
* outl: a debugging routine. Flushes stdout then prints a message on stderr
|
||||
* and flushes stderr. Used to print messages when past certain points
|
||||
* in code so we can tell where we are. Outl may be invoked like
|
||||
* printf with up to 7 arguments.
|
||||
*/
|
||||
void
|
||||
outl(char *msg, ...)
|
||||
{
|
||||
va_list args;
|
||||
fflush(stdout);
|
||||
va_start(args, msg);
|
||||
vfprintf(stderr, msg, args);
|
||||
va_end(args);
|
||||
fprintf(stderr, "\n");
|
||||
fflush(stderr);
|
||||
XCloseDisplay(dpy);
|
||||
dpy = NULL;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -29,10 +29,10 @@ from The Open Group.
|
||||
/* $XFree86: xc/programs/xlsfonts/dsimple.h,v 1.8 2002/12/24 17:43:01 tsi Exp $ */
|
||||
|
||||
/*
|
||||
* Just_display.h: This file contains the definitions needed to use the
|
||||
* functions in just_display.c. It also declares the global
|
||||
* dsimple.h: This file contains the definitions needed to use the
|
||||
* functions in dsimple.c. It also declares the global
|
||||
* variables dpy, screen, and program_name which are needed to
|
||||
* use just_display.c.
|
||||
* use dsimple.c.
|
||||
*
|
||||
* Written by Mark Lillibridge. Last updated 7/1/87
|
||||
*
|
||||
@@ -52,51 +52,23 @@ from The Open Group.
|
||||
extern char *program_name; /* Name of this program */
|
||||
extern Display *dpy; /* The current display */
|
||||
extern int screen; /* The current screen */
|
||||
extern Bool printer_output; /* Video or printer output ? */
|
||||
#ifdef BUILD_PRINTSUPPORT
|
||||
extern XPContext pcontext; /* The current print context */
|
||||
#endif /* BUILD_PRINTSUPPORT */
|
||||
|
||||
#define INIT_NAME program_name=argv[0] /* use this in main to setup
|
||||
program_name */
|
||||
|
||||
/* Declaritions for functions in just_display.c */
|
||||
/* Declarations for functions in dsimple.c */
|
||||
|
||||
char *Malloc(unsigned);
|
||||
char *Realloc(char *, int);
|
||||
char *Get_Display_Name(int *, char **);
|
||||
#ifdef BUILD_PRINTSUPPORT
|
||||
char *Get_Printer_Name(int *, char **);
|
||||
#endif /* BUILD_PRINTSUPPORT */
|
||||
Display *Open_Display(char *);
|
||||
void Setup_Display_And_Screen(int *, char **);
|
||||
void Close_Display(void);
|
||||
XFontStruct *Open_Font(char *);
|
||||
void Beep(void);
|
||||
Pixmap ReadBitmapFile(Drawable, char *, int *, int *, int *, int *);
|
||||
void WriteBitmapFile(char *, Pixmap, int, int, int, int);
|
||||
Window Select_Window_Args(int *, char **);
|
||||
void usage(void);
|
||||
|
||||
#define X_USAGE "[host:display]" /* X arguments handled by
|
||||
Get_Display_Name */
|
||||
|
||||
/*
|
||||
* Other_stuff.h: Definitions of routines in other_stuff.
|
||||
*
|
||||
* Written by Mark Lillibridge. Last updated 7/1/87
|
||||
*
|
||||
* Send bugs, etc. to chariot@athena.mit.edu.
|
||||
*/
|
||||
|
||||
unsigned long Resolve_Color(Window, char *);
|
||||
Pixmap Bitmap_To_Pixmap(Display *, Drawable, GC, Pixmap, int, int);
|
||||
Window Select_Window(Display *);
|
||||
void blip(void);
|
||||
Window Window_With_Name(Display *, Window, char *);
|
||||
#ifdef __GNUC__
|
||||
void Fatal_Error(char *, ...) __attribute__((__noreturn__));
|
||||
#else
|
||||
void Fatal_Error(char *, ...);
|
||||
#endif
|
||||
void outl(char *, ...);
|
||||
|
||||
@@ -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,21 +95,12 @@ void usage(void)
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
int argcnt = 0, i;
|
||||
char *mode;
|
||||
|
||||
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 ();
|
||||
@@ -173,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;
|
||||
@@ -272,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)
|
||||
@@ -403,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++;
|
||||
}
|
||||
@@ -452,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;
|
||||
@@ -630,15 +416,11 @@ int IgnoreError(Display *disp, XErrorEvent *event)
|
||||
|
||||
static char *bounds_metrics_title =
|
||||
"width left right asc desc attr keysym\n";
|
||||
static char *char_metrics_fmt =
|
||||
"\t0x%02x%02x (%u)\t%4d %4d %4d %4d %4d 0x%04x %s\n";
|
||||
static char *bounds_metrics_fmt =
|
||||
"\t%3s\t\t%4d %4d %4d %4d %4d 0x%04x\n";
|
||||
|
||||
|
||||
#define PrintBounds(_what,_ptr) \
|
||||
{ register XCharStruct *p = (_ptr); \
|
||||
printf (bounds_metrics_fmt, (_what), p->width, p->lbearing, \
|
||||
printf ("\t%3s\t\t%4d %4d %4d %4d %4d 0x%04x\n", \
|
||||
(_what), p->width, p->lbearing, \
|
||||
p->rbearing, p->ascent, p->descent, p->attributes); }
|
||||
|
||||
|
||||
@@ -666,15 +448,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",
|
||||
@@ -810,7 +585,8 @@ print_character_metrics(register XFontStruct *info)
|
||||
n = saven;
|
||||
for (i = info->min_char_or_byte2; i <= info->max_char_or_byte2; i++) {
|
||||
char *s = XKeysymToString ((KeySym) n);
|
||||
printf (char_metrics_fmt, j, i, n, pc->width, pc->lbearing,
|
||||
printf ("\t0x%02x%02x (%u)\t%4d %4d %4d %4d %4d 0x%04x %s\n",
|
||||
j, i, n, pc->width, pc->lbearing,
|
||||
pc->rbearing, pc->ascent, pc->descent, pc->attributes,
|
||||
s ? s : ".");
|
||||
pc++;
|
||||
|
||||
@@ -6,9 +6,6 @@ xlsfonts \- server font list displayer for X
|
||||
.ad l
|
||||
\fBxlsfonts\fR
|
||||
[\fB\-display \fBhost:dpy\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\-fn \fBpattern\fR\fR]
|
||||
.br
|
||||
\fBxlsfonts\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]
|
||||
.SH DESCRIPTION
|
||||
xlsfonts lists the fonts that match the given pattern.
|
||||
The wildcard character "*" may be used to match any sequence of characters
|
||||
@@ -21,15 +18,9 @@ The "*" and "?" characters must be quoted to prevent them from being expanded by
|
||||
\fB\-display \fIhost:dpy\fB\fR
|
||||
This option specifies the X server to contact.
|
||||
.TP
|
||||
\fB\-printer \fIprintername\fB\fR
|
||||
This option specifies the Xprint printer to contact.
|
||||
.TP
|
||||
\fB\-d \fIhost:dpy\fB\fR
|
||||
Same as \fB\-display \fIhost:dpy\fB\fR.
|
||||
.TP
|
||||
\fB\-p \fIprintername\fB\fR
|
||||
Same as \fB\-printer \fIprintername\fB\fR.
|
||||
.TP
|
||||
\fB\-l\fR
|
||||
Lists some attributes of the font on one line in addition
|
||||
to its name.
|
||||
@@ -73,91 +64,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.
|
||||
|
||||
(printer mode only)
|
||||
.TP
|
||||
\fB\-B\fR
|
||||
Do not list printer builtin fonts.
|
||||
This is the same as \fB\-X xp\-list\-internal\-printer\-fonts\fR.
|
||||
|
||||
(printer mode only)
|
||||
.TP
|
||||
\fB\-g\fR
|
||||
List glyph fonts.
|
||||
This is the same as \fB\-x xp\-list\-glyph\-fonts\fR.
|
||||
|
||||
(printer mode only)
|
||||
.TP
|
||||
\fB\-G\fR
|
||||
Do not list glyph fonts.
|
||||
This is the same as \fB\-X xp\-list\-glyph\-fonts\fR.
|
||||
|
||||
(printer mode only)
|
||||
.TP
|
||||
\fB\-x \fImode\fB\fR
|
||||
Enable listfont mode \fImode\fR.
|
||||
|
||||
Supported modes are:
|
||||
.RS
|
||||
.TP
|
||||
xp-listinternal-printer-fonts
|
||||
If \fBxp\-listinternal\-printer\-fonts\fR was set
|
||||
(via option \fB\-b\fR or
|
||||
\fB\-x xp\-listinternal\-printer\-fonts\fR xlsfonts
|
||||
will include all of the fonts defined as internal printer fonts.
|
||||
.TP
|
||||
xp-list-glyph-fonts
|
||||
If \fBxp\-list\-glyph\-fonts\fR was set (via option \fB\-g\fR or
|
||||
\fB\-x xp\-list\-glyph\-fonts\fR) xlsfonts will
|
||||
include all of the fonts available to the server which have
|
||||
glyphs associated with them.
|
||||
.RE
|
||||
|
||||
|
||||
The default value is implicitly determined by the ddx driver to be the
|
||||
all of the listfonts modes specified in the \fBxp\-listfonts\-modes\-supported\fR
|
||||
printer attribute.
|
||||
|
||||
|
||||
The value of \fBxp\-listfonts\-modes\-supported\fR and
|
||||
\fBxp\-listfonts\-modes\fR (the defaults) can be looked-up via
|
||||
\fBxplsprinters\fR(__appmansuffix__).
|
||||
|
||||
|
||||
(printer mode only)
|
||||
.TP
|
||||
\fB\-X \fImode\fB\fR
|
||||
Disable listfont mode \fImode\fR.
|
||||
See option \fB\-x\fR for a list of valid
|
||||
\fImode\fR values.
|
||||
|
||||
(printer mode only)
|
||||
.TP
|
||||
\fB\-fn \fIpattern\fB\fR
|
||||
This option specifies the font name pattern to match.
|
||||
.SH "SEE ALSO"
|
||||
\fBX\fR(__miscmansuffix__), \fBXprint\fR(__miscmansuffix__), \fBXserver\fR(__appmansuffix__), \fBxset\fR(__appmansuffix__), \fBxfd\fR(__appmansuffix__), \fBxplsprinters\fR(__appmansuffix__), X Logical Font Description Conventions
|
||||
\fBX\fR(__miscmansuffix__), \fBXserver\fR(__appmansuffix__), \fBxset\fR(__appmansuffix__), \fBxfd\fR(__appmansuffix__), X Logical Font Description Conventions
|
||||
.SH ENVIRONMENT
|
||||
.TP
|
||||
\fBDISPLAY\fR
|
||||
\fBDISPLAY\fR must be set to get the default host and display to use.
|
||||
.TP
|
||||
\fBXPSERVERLIST\fR
|
||||
\fBXPSERVERLIST\fR must be set for the \fB\-printer\fR option
|
||||
identifying the available Xprint servers.
|
||||
See \fBXprint\fR(__miscmansuffix__)
|
||||
for more details.
|
||||
.SH BUGS
|
||||
Doing ``xlsfonts -l'' can tie up your server for a very long time.
|
||||
This is really a bug with single-threaded
|
||||
|
||||
@@ -24,7 +24,6 @@ manual volume numbers.
|
||||
</refnamediv>
|
||||
|
||||
<refsynopsisdiv>
|
||||
<!-- video mode -->
|
||||
<cmdsynopsis>
|
||||
<command>xlsfonts</command>
|
||||
|
||||
@@ -52,49 +51,6 @@ manual volume numbers.
|
||||
|
||||
<arg><option>-fn <replaceable>pattern</replaceable></option></arg>
|
||||
</cmdsynopsis>
|
||||
|
||||
<!-- printer mode -->
|
||||
<cmdsynopsis>
|
||||
<command>xlsfonts</command>
|
||||
|
||||
<arg choice="plain"><option>-printer <replaceable>printername</replaceable></option></arg>
|
||||
|
||||
<arg><option>-l</option></arg>
|
||||
|
||||
<arg><option>-ll</option></arg>
|
||||
|
||||
<arg><option>-lll</option></arg>
|
||||
|
||||
<arg><option>-m</option></arg>
|
||||
|
||||
<arg><option>-C</option></arg>
|
||||
|
||||
<arg><option>-1</option></arg>
|
||||
|
||||
<arg><option>-w <replaceable>width</replaceable></option></arg>
|
||||
|
||||
<arg><option>-n <replaceable>columns</replaceable></option></arg>
|
||||
|
||||
<arg><option>-u</option></arg>
|
||||
|
||||
<arg><option>-o</option></arg>
|
||||
|
||||
<arg><option>-r <replaceable>resolution</replaceable></option></arg>
|
||||
|
||||
<arg><option>-b</option></arg>
|
||||
|
||||
<arg><option>-B</option></arg>
|
||||
|
||||
<arg><option>-g</option></arg>
|
||||
|
||||
<arg><option>-G</option></arg>
|
||||
|
||||
<arg><option>-x <replaceable>mode</replaceable></option></arg>
|
||||
|
||||
<arg><option>-X <replaceable>mode</replaceable></option></arg>
|
||||
|
||||
<arg><option>-fn <replaceable>pattern</replaceable></option></arg>
|
||||
</cmdsynopsis>
|
||||
</refsynopsisdiv>
|
||||
|
||||
<refsect1>
|
||||
@@ -125,16 +81,6 @@ manual volume numbers.
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><option>-printer <replaceable>printername</replaceable></option>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
This option specifies the Xprint printer to contact.
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><option>-d <replaceable>host:dpy</replaceable></option>
|
||||
</term>
|
||||
@@ -145,16 +91,6 @@ manual volume numbers.
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><option>-p <replaceable>printername</replaceable></option>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
Same as <option>-printer <replaceable>printername</replaceable></option>.
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><option>-l</option>
|
||||
</term>
|
||||
@@ -268,147 +204,6 @@ manual volume numbers.
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><option>-r <replaceable>resolutionname</replaceable></option>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
Set print resolution name (usually values like <literal>300dpi</literal>
|
||||
or <literal>300x600</literal>, see output of <command>xplsprinters</command>).
|
||||
This may alter the output of <command>xlsfonts</command> if there are printer
|
||||
fonts which get enabled/disabled on per-resolution basis by the DDX.
|
||||
</para>
|
||||
<para>
|
||||
(printer mode only)
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><option>-b</option>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
List printer builtin fonts.
|
||||
This is the same as <option>-x xp-list-internal-printer-fonts</option>.
|
||||
</para>
|
||||
<para>
|
||||
(printer mode only)
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><option>-B</option>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
Do not list printer builtin fonts.
|
||||
This is the same as <option>-X xp-list-internal-printer-fonts</option>.
|
||||
</para>
|
||||
<para>
|
||||
(printer mode only)
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><option>-g</option>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
List glyph fonts.
|
||||
This is the same as <option>-x xp-list-glyph-fonts</option>.
|
||||
</para>
|
||||
<para>
|
||||
(printer mode only)
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><option>-G</option>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
Do not list glyph fonts.
|
||||
This is the same as <option>-X xp-list-glyph-fonts</option>.
|
||||
</para>
|
||||
<para>
|
||||
(printer mode only)
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><option>-x <replaceable>mode</replaceable></option>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
Enable listfont mode <replaceable>mode</replaceable>.
|
||||
</para>
|
||||
<para>
|
||||
Supported modes are:
|
||||
<variablelist>
|
||||
<varlistentry>
|
||||
<term>xp-listinternal-printer-fonts</term>
|
||||
<listitem>
|
||||
<para>
|
||||
If <literal>xp-listinternal-printer-fonts</literal> was set
|
||||
(via option <option>-b</option> or
|
||||
<option>-x xp-listinternal-printer-fonts</option> <command>xlsfonts</command>
|
||||
will include all of the fonts defined as internal printer fonts.
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term>xp-list-glyph-fonts</term>
|
||||
<listitem>
|
||||
<para>
|
||||
If <literal>xp-list-glyph-fonts</literal> was set (via option <option>-g</option> or
|
||||
<option>-x xp-list-glyph-fonts</option>) <command>xlsfonts</command> will
|
||||
include all of the fonts available to the server which have
|
||||
glyphs associated with them.
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
</variablelist>
|
||||
|
||||
<para>
|
||||
The default value is implicitly determined by the ddx driver to be the
|
||||
all of the listfonts modes specified in the <literal>xp-listfonts-modes-supported</literal>
|
||||
printer attribute.
|
||||
</para>
|
||||
|
||||
<para>
|
||||
The value of <literal>xp-listfonts-modes-supported</literal> and
|
||||
<literal>xp-listfonts-modes</literal> (the defaults) can be looked-up via
|
||||
<citerefentry><refentrytitle>xplsprinters</refentrytitle><manvolnum>__appmansuffix__</manvolnum></citerefentry>.
|
||||
</para>
|
||||
</para>
|
||||
|
||||
<para>
|
||||
(printer mode only)
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><option>-X <replaceable>mode</replaceable></option>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
Disable listfont mode <replaceable>mode</replaceable>.
|
||||
See option <option>-x</option> for a list of valid
|
||||
<replaceable>mode</replaceable> values.
|
||||
</para>
|
||||
<para>
|
||||
(printer mode only)
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><option>-fn <replaceable>pattern</replaceable></option>
|
||||
</term>
|
||||
@@ -426,11 +221,9 @@ manual volume numbers.
|
||||
<para>
|
||||
<simplelist type="inline">
|
||||
<member><citerefentry><refentrytitle>X</refentrytitle><manvolnum>__miscmansuffix__</manvolnum></citerefentry></member>
|
||||
<member><citerefentry><refentrytitle>Xprint</refentrytitle><manvolnum>__miscmansuffix__</manvolnum></citerefentry></member>
|
||||
<member><citerefentry><refentrytitle>Xserver</refentrytitle><manvolnum>__appmansuffix__</manvolnum></citerefentry></member>
|
||||
<member><citerefentry><refentrytitle>xset</refentrytitle><manvolnum>__appmansuffix__</manvolnum></citerefentry></member>
|
||||
<member><citerefentry><refentrytitle>xfd</refentrytitle><manvolnum>__appmansuffix__</manvolnum></citerefentry></member>
|
||||
<member><citerefentry><refentrytitle>xplsprinters</refentrytitle><manvolnum>__appmansuffix__</manvolnum></citerefentry></member>
|
||||
<member>X Logical Font Description Conventions</member>
|
||||
</simplelist>
|
||||
</para>
|
||||
@@ -449,17 +242,6 @@ manual volume numbers.
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><envar>XPSERVERLIST</envar>
|
||||
</term>
|
||||
<listitem>
|
||||
<para><envar>XPSERVERLIST</envar> must be set for the <option>-printer</option> option
|
||||
identifying the available Xprint servers.
|
||||
See <citerefentry><refentrytitle>Xprint</refentrytitle><manvolnum>__miscmansuffix__</manvolnum></citerefentry>
|
||||
for more details.
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
</variablelist>
|
||||
</refsect1>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user