Update to xfontsel 1.0.4

This commit is contained in:
matthieu 2012-04-07 15:44:34 +00:00
parent 2aaa135718
commit 10b8ba770d
20 changed files with 13166 additions and 1164 deletions

View File

@ -1,3 +1,304 @@
commit 67309809fee4ea1b7b4334d6245788ddea626dcf
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Mar 22 22:30:31 2012 -0700
xfontsel 1.0.4
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 5815b461672845cf6de179f04c778354139f7834
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Sep 28 22:05:41 2011 -0700
Add const attribute to fieldP fix a gcc -Wwrite-strings warning
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit d9200f965f056d3da49476dd9b8333ff47265f30
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Sep 28 22:00:50 2011 -0700
Strip trailing whitespace
Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}'
git diff -w & git diff -b show no diffs from this change
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 561085a83a777fec4b42cfa16a8ba80e971d86fb
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Sep 16 19:04:30 2011 -0700
Convert sprintf calls to snprintf
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 1d6970a838d4ed42a8c91a10cb5311f98ba959c3
Author: Jesse Adkins <jesserayadkins@gmail.com>
Date: Tue Oct 26 16:06:24 2010 -0700
Remove USE_TEXT_WIDGET (bug 8966)
It was included in the initial revision. The bug dates back to 2006, so I
think it's safe to say that this never worked.
Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 19bcefb4c89e02833cb7fcffeb7fd3f7224db1c4
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jan 19 10:06:56 2011 -0500
config: move man pages into their own directory
Use services provided by XORG_MANPAGE_SECTIONS.
Use standard Makefile for man pages.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit f68420e9698d9a3b3e18cbefb96a3ccf9d555c65
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Jan 13 17:15:36 2011 -0500
man: replace hard coded man page section with substitution strings
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 63f5e107b12fb8a78946e54e36e99f2ec64a5bac
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Jan 13 11:15:47 2011 -0500
man: remove trailing spaces and tabs
Using s/[ \t]*$//
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 1fe1686bbe8d3830a3e7531dda4318c81f6d7405
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jan 12 16:28:02 2011 -0500
config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
This silences an Autoconf warning
commit 284bc2ff3e5a852f44ca08cb4fcab5ee64a08e54
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jan 12 15:29:50 2011 -0500
config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
This silences an Automake warning.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 0799a10d39b4240bdc043a5fcdd25f571338be24
Author: Jesse Adkins <jesserayadkins@gmail.com>
Date: Tue Sep 28 13:29:49 2010 -0700
Purge cvs tags.
Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
commit 3aaccefa18e0eb37393642823b2e8454b1de20fd
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Sep 26 17:24:50 2010 -0700
xfontsel 1.0.3
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 646dcaa531897aedf76a53c7b0017c90c849eb18
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Sep 26 17:20:51 2010 -0700
config: Remove unnecessary calls from configure.ac
AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 6c77dc68321ca2149d95df90b97d741f8ff914a2
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 18:45:18 2010 -0400
config: update AC_PREREQ statement to 2.60
Unrelated to the previous patches, the new value simply reflects
the reality that the minimum level for autoconf to configure
all x.org modules is 2.60 dated June 2006.
ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit e50e3cab1eb5e50d8e0d4dfe52e2e39625bdff3c
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Jul 1 17:59:02 2010 -0700
Xmu functions are called directly, so include it in PKG_CHECK_MODULES
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit e3d6a121d1074422ea7296fdfe335eee3f42ad66
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Jun 30 23:25:03 2010 -0700
config: upgrade to util-macros 1.8 for additional man page support
Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
The value of MAN_SUBST is the same for all X.Org packages.
Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
The existing statement can now be removed from the configuration file.
Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED)
Enables silent rule and use platform appropriate version of sed.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 7b1853e8ae91e7aaecebd78eb4c6e498059e5200
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 9205c610f211837e9a63d08d1fbd8c687b7d0b8a
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Dec 19 20:48:48 2009 -0500
configure.ac: use backticks rather than $() for cmd subs
Use "$PKG_CONFIG" rather than hard coded "pkg-config"
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit f6398f9cc100f63bf694be9c6157e1b774a75c2b
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Nov 26 09:19:53 2009 -0500
Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
Now that the INSTALL file is generated.
Allows running make maintainer-clean.
commit c609c074f9d76e89cedabead3fab0600d294c3f9
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 7d890dfd9ef6eeac6c7619dfb3c7eeb7666f3834
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 b9aca05dc1bb882fabc03d11fa833cb975593e4e
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 38b984a4cae2bf18e8fbff07ccd98a587e0c16bd
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 a9c2e152c8a112f5783430b27de777da7daf6aa7
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Oct 1 14:54:24 2009 -0700
Add README with pointers to mailing lists, bugzilla, & git
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 4d15dbb1ac524a017e9812fb7f21f032ccbc2ae1
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Wed Jan 21 16:04:57 2009 -0200
Ansification and compile warning fixes.
This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, corrects
make distcheck and all gcc 4.3 and sparse warnings.
commit edda127130da731e9d314456d89f083a7eeca276
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Sun Mar 16 20:22:55 2008 -0300
Compile warning fixes.
Ansify functions with K&R prototypes.
Adjust some definitions to match required prototypes.
Declare as static some functions to avoid warnings about missing prototypes.
commit bb0968eff74cb55cf2de125f828a76f679c4a017
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Aug 19 00:58:18 2008 +0200
xaw8 is gone, use xaw7
commit 9e6d440567ae5b853875f0ecb8a780733c15fb38
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 16 14:17:52 2008 +0200
$(builddir) is the current directory
Apparently automake doesn't always export the builddir variable.
This fixes my previous commit.
commit 42b8ab848739ee6bf9003dea67c376236600964b
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Apr 20 19:16:26 2008 +0200
Fix build with builddir != srcdir
commit 99e02e7a17ab8efe09b9a5411466bf273c01c692
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Apr 20 19:13:59 2008 +0200
Use AM_CFLAGS instead of xfontsel_CFLAGS and remove AM_PROG_CC_C_O
commit 7177700678091d64956d789aa93e265539d9ea5c
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Mar 27 20:27:16 2008 -0700
Added missing AM_PROG_CC_C_O
commit 4c38de0cbf47ae3dcc67ae8e81924831cb050a34
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Mar 27 20:07:45 2008 -0700
Build fix for file systems that are not case sensitive
commit 2f878b2bc5c2e35a0ba28f8fc2e22785af3f537e
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Dec 6 15:51:07 2007 -0500
Add missing PHONY line for automatic ChangeLog generation
commit b4d05bfdd02bb993fe27d79977be0d117f6869f5
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Feb 1 10:47:34 2007 -0800

View File

@ -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.

View File

@ -19,9 +19,10 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
SUBDIRS = man
bin_PROGRAMS = xfontsel
xfontsel_CFLAGS = $(XFONTSEL_CFLAGS)
AM_CFLAGS = $(XFONTSEL_CFLAGS) $(CWARNFLAGS)
xfontsel_LDADD = $(XFONTSEL_LIBS)
xfontsel_SOURCES = \
@ -30,63 +31,22 @@ xfontsel_SOURCES = \
ULabelP.h \
xfontsel.c
appman_PRE = \
xfontsel.man
# App default files (*.ad)
# App default files
DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
appdefaultdir = @appdefaultdir@
dist_appdefault_DATA = \
app-defaults/XFontSel
APPDEFAULTFILES = \
XFontSel
MAINTAINERCLEANFILES = ChangeLog INSTALL
SUFFIXES = .ad
.PHONY: ChangeLog INSTALL
.ad:
cp $< $@
appdefault_DATA = $(APPDEFAULTFILES)
EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad) ChangeLog autogen.sh
CLEANFILES = $(APPDEFAULTFILES)
appmandir = $(APP_MAN_DIR)
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
EXTRA_DIST += $(appman_PRE)
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
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
MAINTAINERCLEANFILES=ChangeLog
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

View File

@ -45,9 +45,9 @@ pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = .
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
install_sh_PROGRAM = ${SHELL} $(install_sh) -c
install_sh_SCRIPT = ${SHELL} $(install_sh) -c
INSTALL_HEADER = $(INSTALL_DATA)
transform = $(program_transform_name)
NORMAL_INSTALL = :
@ -59,10 +59,11 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = xfontsel$(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
DIST_COMMON = README $(am__configure_deps) $(dist_appdefault_DATA) \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS COPYING \
ChangeLog INSTALL NEWS config.guess config.sub depcomp \
install-sh missing
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@ -73,12 +74,10 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
mkinstalldirs = $(SHELL) $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appdefaultdir)" \
"$(DESTDIR)$(appmandir)"
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appdefaultdir)"
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am_xfontsel_OBJECTS = xfontsel-ULabel.$(OBJEXT) \
xfontsel-xfontsel.$(OBJEXT)
am_xfontsel_OBJECTS = ULabel.$(OBJEXT) xfontsel.$(OBJEXT)
xfontsel_OBJECTS = $(am_xfontsel_OBJECTS)
am__DEPENDENCIES_1 =
xfontsel_DEPENDENCIES = $(am__DEPENDENCIES_1)
@ -91,17 +90,23 @@ CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(xfontsel_SOURCES)
DIST_SOURCES = $(xfontsel_SOURCES)
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
install-exec-recursive install-info-recursive \
install-recursive installcheck-recursive installdirs-recursive \
pdf-recursive ps-recursive uninstall-info-recursive \
uninstall-recursive
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
appdefaultDATA_INSTALL = $(INSTALL_DATA)
appmanDATA_INSTALL = $(INSTALL_DATA)
DATA = $(appdefault_DATA) $(appman_DATA)
dist_appdefaultDATA_INSTALL = $(INSTALL_DATA)
DATA = $(dist_appdefault_DATA)
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@ -119,6 +124,7 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPDEFS_CFLAGS = @APPDEFS_CFLAGS@
APPDEFS_LIBS = @APPDEFS_LIBS@
APP_MAN_DIR = @APP_MAN_DIR@
@ -127,10 +133,14 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_CFLAGS = @BASE_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@ -139,9 +149,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@
@ -156,19 +169,7 @@ 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'
MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
OBJEXT = @OBJEXT@
@ -180,9 +181,10 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
SED = sed
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRICT_CFLAGS = @STRICT_CFLAGS@
STRIP = @STRIP@
VERSION = @VERSION@
XFONTSEL_CFLAGS = @XFONTSEL_CFLAGS@
@ -196,8 +198,6 @@ am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
# App default files (*.ad)
appdefaultdir = @appdefaultdir@
bindir = @bindir@
build = @build@
@ -234,7 +234,8 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
xfontsel_CFLAGS = $(XFONTSEL_CFLAGS)
SUBDIRS = man
AM_CFLAGS = $(XFONTSEL_CFLAGS) $(CWARNFLAGS)
xfontsel_LDADD = $(XFONTSEL_LIBS)
xfontsel_SOURCES = \
ULabel.c \
@ -242,44 +243,33 @@ xfontsel_SOURCES = \
ULabelP.h \
xfontsel.c
appman_PRE = \
xfontsel.man
APPDEFAULTFILES = \
XFontSel
# App default files
DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
dist_appdefault_DATA = \
app-defaults/XFontSel
SUFFIXES = .ad .$(APP_MAN_SUFFIX) .man
appdefault_DATA = $(APPDEFAULTFILES)
EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad) ChangeLog autogen.sh \
$(appman_PRE)
CLEANFILES = $(APPDEFAULTFILES) $(appman_DATA)
appmandir = $(APP_MAN_DIR)
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
# Strings to replace in man pages
XORGRELSTRING = @PACKAGE_STRING@
XORGMANNAME = X Version 11
MAINTAINERCLEANFILES = ChangeLog
MAINTAINERCLEANFILES = ChangeLog INSTALL
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
$(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES:
.SUFFIXES: .ad .$(APP_MAN_SUFFIX) .man .c .o .obj
.SUFFIXES: .c .o .obj
am--refresh:
@:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@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 \
@ -348,8 +338,8 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfontsel-ULabel.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfontsel-xfontsel.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ULabel.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfontsel.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@ -364,68 +354,94 @@ 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) '$<'`
xfontsel-ULabel.o: ULabel.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfontsel_CFLAGS) $(CFLAGS) -MT xfontsel-ULabel.o -MD -MP -MF "$(DEPDIR)/xfontsel-ULabel.Tpo" -c -o xfontsel-ULabel.o `test -f 'ULabel.c' || echo '$(srcdir)/'`ULabel.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfontsel-ULabel.Tpo" "$(DEPDIR)/xfontsel-ULabel.Po"; else rm -f "$(DEPDIR)/xfontsel-ULabel.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ULabel.c' object='xfontsel-ULabel.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) $(xfontsel_CFLAGS) $(CFLAGS) -c -o xfontsel-ULabel.o `test -f 'ULabel.c' || echo '$(srcdir)/'`ULabel.c
xfontsel-ULabel.obj: ULabel.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfontsel_CFLAGS) $(CFLAGS) -MT xfontsel-ULabel.obj -MD -MP -MF "$(DEPDIR)/xfontsel-ULabel.Tpo" -c -o xfontsel-ULabel.obj `if test -f 'ULabel.c'; then $(CYGPATH_W) 'ULabel.c'; else $(CYGPATH_W) '$(srcdir)/ULabel.c'; fi`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfontsel-ULabel.Tpo" "$(DEPDIR)/xfontsel-ULabel.Po"; else rm -f "$(DEPDIR)/xfontsel-ULabel.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ULabel.c' object='xfontsel-ULabel.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) $(xfontsel_CFLAGS) $(CFLAGS) -c -o xfontsel-ULabel.obj `if test -f 'ULabel.c'; then $(CYGPATH_W) 'ULabel.c'; else $(CYGPATH_W) '$(srcdir)/ULabel.c'; fi`
xfontsel-xfontsel.o: xfontsel.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfontsel_CFLAGS) $(CFLAGS) -MT xfontsel-xfontsel.o -MD -MP -MF "$(DEPDIR)/xfontsel-xfontsel.Tpo" -c -o xfontsel-xfontsel.o `test -f 'xfontsel.c' || echo '$(srcdir)/'`xfontsel.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfontsel-xfontsel.Tpo" "$(DEPDIR)/xfontsel-xfontsel.Po"; else rm -f "$(DEPDIR)/xfontsel-xfontsel.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfontsel.c' object='xfontsel-xfontsel.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) $(xfontsel_CFLAGS) $(CFLAGS) -c -o xfontsel-xfontsel.o `test -f 'xfontsel.c' || echo '$(srcdir)/'`xfontsel.c
xfontsel-xfontsel.obj: xfontsel.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfontsel_CFLAGS) $(CFLAGS) -MT xfontsel-xfontsel.obj -MD -MP -MF "$(DEPDIR)/xfontsel-xfontsel.Tpo" -c -o xfontsel-xfontsel.obj `if test -f 'xfontsel.c'; then $(CYGPATH_W) 'xfontsel.c'; else $(CYGPATH_W) '$(srcdir)/xfontsel.c'; fi`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfontsel-xfontsel.Tpo" "$(DEPDIR)/xfontsel-xfontsel.Po"; else rm -f "$(DEPDIR)/xfontsel-xfontsel.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfontsel.c' object='xfontsel-xfontsel.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) $(xfontsel_CFLAGS) $(CFLAGS) -c -o xfontsel-xfontsel.obj `if test -f 'xfontsel.c'; then $(CYGPATH_W) 'xfontsel.c'; else $(CYGPATH_W) '$(srcdir)/xfontsel.c'; fi`
uninstall-info-am:
install-appdefaultDATA: $(appdefault_DATA)
install-dist_appdefaultDATA: $(dist_appdefault_DATA)
@$(NORMAL_INSTALL)
test -z "$(appdefaultdir)" || $(mkdir_p) "$(DESTDIR)$(appdefaultdir)"
@list='$(appdefault_DATA)'; for p in $$list; do \
@list='$(dist_appdefault_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
echo " $(appdefaultDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(appdefaultdir)/$$f'"; \
$(appdefaultDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(appdefaultdir)/$$f"; \
echo " $(dist_appdefaultDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(appdefaultdir)/$$f'"; \
$(dist_appdefaultDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(appdefaultdir)/$$f"; \
done
uninstall-appdefaultDATA:
uninstall-dist_appdefaultDATA:
@$(NORMAL_UNINSTALL)
@list='$(appdefault_DATA)'; for p in $$list; do \
@list='$(dist_appdefault_DATA)'; for p in $$list; do \
f=$(am__strip_dir) \
echo " rm -f '$(DESTDIR)$(appdefaultdir)/$$f'"; \
rm -f "$(DESTDIR)$(appdefaultdir)/$$f"; \
done
install-appmanDATA: $(appman_DATA)
@$(NORMAL_INSTALL)
test -z "$(appmandir)" || $(mkdir_p) "$(DESTDIR)$(appmandir)"
@list='$(appman_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
echo " $(appmanDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(appmandir)/$$f'"; \
$(appmanDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(appmandir)/$$f"; \
done
uninstall-appmanDATA:
@$(NORMAL_UNINSTALL)
@list='$(appman_DATA)'; for p in $$list; do \
f=$(am__strip_dir) \
echo " rm -f '$(DESTDIR)$(appmandir)/$$f'"; \
rm -f "$(DESTDIR)$(appmandir)/$$f"; \
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
# To change the values of `make' variables: instead of editing Makefiles,
# (1) if the variable is set in `config.status', edit `config.status'
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
*k*) failcom='fail=yes';; \
esac; \
done; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
echo "Making $$target in $$subdir"; \
if test "$$subdir" = "."; then \
dot_seen=yes; \
local_target="$$target-am"; \
else \
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
*k*) failcom='fail=yes';; \
esac; \
done; \
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
*) list='$(SUBDIRS)' ;; \
esac; \
rev=''; for subdir in $$list; do \
if test "$$subdir" = "."; then :; else \
rev="$$subdir $$rev"; \
fi; \
done; \
rev="$$rev ."; \
target=`echo $@ | sed s/-recursive//`; \
for subdir in $$rev; do \
echo "Making $$target in $$subdir"; \
if test "$$subdir" = "."; then \
local_target="$$target-am"; \
else \
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
ctags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@ -438,10 +454,23 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
mkid -fID $$unique
tags: TAGS
TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
empty_fix=.; \
else \
include_option=--include; \
empty_fix=; \
fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test ! -f $$subdir/TAGS || \
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
@ -454,7 +483,7 @@ TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$$tags $$unique; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
@ -479,6 +508,7 @@ distclean-tags:
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
$(mkdir_p) $(distdir)/app-defaults
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
@ -505,6 +535,21 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
done
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
|| $(mkdir_p) "$(distdir)/$$subdir" \
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
(cd $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
distdir) \
|| exit 1; \
fi; \
done
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$(top_distdir)" distdir="$(distdir)" \
dist-hook
@ -606,21 +651,22 @@ distcleancheck: distclean
$(distcleancheck_listfiles) ; \
exit 1; } >&2
check-am: all-am
check: check-am
check: check-recursive
all-am: Makefile $(PROGRAMS) $(DATA) config.h
installdirs:
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appdefaultdir)" "$(DESTDIR)$(appmandir)"; do \
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appdefaultdir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
uninstall: uninstall-am
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
uninstall: uninstall-recursive
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
installcheck: installcheck-am
installcheck: installcheck-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
@ -629,7 +675,6 @@ install-strip:
mostlyclean-generic:
clean-generic:
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@ -638,85 +683,89 @@ maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
clean: clean-am
clean: clean-recursive
clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
distclean: distclean-am
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-hdr distclean-tags
dvi: dvi-am
dvi: dvi-recursive
dvi-am:
html: html-am
html: html-recursive
info: info-am
info: info-recursive
info-am:
install-data-am: install-appdefaultDATA install-appmanDATA
install-data-am: install-dist_appdefaultDATA
install-exec-am: install-binPROGRAMS
install-info: install-info-am
install-info: install-info-recursive
install-man:
installcheck-am:
maintainer-clean: maintainer-clean-am
maintainer-clean: maintainer-clean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf $(top_srcdir)/autom4te.cache
-rm -rf ./$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean: mostlyclean-recursive
mostlyclean-am: mostlyclean-compile mostlyclean-generic
pdf: pdf-am
pdf: pdf-recursive
pdf-am:
ps: ps-am
ps: ps-recursive
ps-am:
uninstall-am: uninstall-appdefaultDATA uninstall-appmanDATA \
uninstall-binPROGRAMS uninstall-info-am
uninstall-am: uninstall-binPROGRAMS uninstall-dist_appdefaultDATA \
uninstall-info-am
.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \
distclean distclean-compile distclean-generic distclean-hdr \
distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am html html-am info info-am install install-am \
install-appdefaultDATA install-appmanDATA install-binPROGRAMS \
install-data install-data-am install-exec install-exec-am \
install-info install-info-am install-man install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
uninstall-am uninstall-appdefaultDATA uninstall-appmanDATA \
uninstall-binPROGRAMS uninstall-info-am
uninstall-info: uninstall-info-recursive
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
check-am clean clean-binPROGRAMS clean-generic clean-recursive \
ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
distclean-compile distclean-generic distclean-hdr \
distclean-recursive distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
install install-am install-binPROGRAMS install-data \
install-data-am install-dist_appdefaultDATA install-exec \
install-exec-am install-info install-info-am install-man \
install-strip installcheck installcheck-am installdirs \
installdirs-am maintainer-clean maintainer-clean-generic \
maintainer-clean-recursive mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-recursive pdf pdf-am ps ps-am \
tags tags-recursive uninstall uninstall-am \
uninstall-binPROGRAMS uninstall-dist_appdefaultDATA \
uninstall-info-am
.ad:
cp $< $@
.PHONY: ChangeLog INSTALL
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
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
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

View File

@ -0,0 +1,27 @@
xfontsel application provides a simple way to display the X11 core
protocol fonts known to your X server, examine samples of each, and
retrieve the X Logical Font Description ("XLFD") full name for a font.
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/xfontsel
http://cgit.freedesktop.org/xorg/app/xfontsel
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

View File

@ -1,5 +1,3 @@
/* $XConsortium: Label.c,v 1.97 94/04/17 20:12:12 kaleb Exp $ */
/***********************************************************
Copyright (c) 1987, 1988, 1994 X Consortium
@ -47,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
/* $XFree86: xc/programs/xfontsel/ULabel.c,v 1.3tsi Exp $ */
/*
* ULabel.c - UCSLabel widget
@ -109,13 +106,16 @@ static XtResource resources[] = {
};
#undef offset
static void Initialize();
static void Resize();
static void Redisplay();
static Boolean SetValues();
static void ClassInitialize();
static void Destroy();
static XtGeometryResult QueryGeometry();
static void Initialize(Widget request, Widget new,
ArgList args, Cardinal *num_args);
static void Resize(Widget w);
static void Redisplay(Widget gw, XEvent *event, Region region);
static Boolean SetValues(Widget current, Widget request, Widget new,
ArgList args, Cardinal *num_args);
static void ClassInitialize(void);
static void Destroy(Widget w);
static XtGeometryResult QueryGeometry(Widget w, XtWidgetGeometry *intended,
XtWidgetGeometry *preferred);
UCSLabelClassRec ucsLabelClassRec = {
{
@ -169,7 +169,7 @@ WidgetClass ucsLabelWidgetClass = (WidgetClass)&ucsLabelClassRec;
*
****************************************************************/
static void ClassInitialize()
static void ClassInitialize(void)
{
XawInitializeWidgetSet();
XtAddConverter( XtRString, XtRJustify, XmuCvtStringToJustify,
@ -187,10 +187,7 @@ static int buf2blen = 0;
#define TXT16 char
static int _XawLabelWidth16(fs, str, n)
XFontStruct *fs;
char *str;
int n;
static int _XawLabelWidth16(XFontStruct *fs, char *str, int n)
{
int i;
XChar2b *ptr;
@ -206,13 +203,8 @@ static int _XawLabelWidth16(fs, str, n)
return XTextWidth16(fs, buf2b, n);
}
static void _XawLabelDraw16(dpy, d, gc, x, y, str, n)
Display *dpy;
Drawable d;
GC gc;
int x, y;
char *str;
int n;
static void _XawLabelDraw16(Display *dpy, Drawable d, GC gc,
int x, int y, char *str, int n)
{
int i;
XChar2b *ptr;
@ -233,13 +225,8 @@ static void _XawLabelDraw16(dpy, d, gc, x, y, str, n)
#endif /* WORD64 */
static void _XawLabelDrawUCS(dpy, d, gc, x, y, str, n)
Display *dpy;
Drawable d;
GC gc;
int x, y;
char *str;
int n;
static void _XawLabelDrawUCS(Display *dpy, Drawable d, GC gc,
int x, int y, char *str, int n)
{
char *ep;
unsigned short codepoint;
@ -320,8 +307,7 @@ static int _XawLabelWidthUCS(
* Calculate width and height of displayed text in pixels
*/
static void SetTextWidthAndHeight(lw)
UCSLabelWidget lw;
static void SetTextWidthAndHeight(UCSLabelWidget lw)
{
XFontStruct *fs = lw->label.font;
@ -431,8 +417,7 @@ static void SetTextWidthAndHeight(lw)
}
}
static void GetnormalGC(lw)
UCSLabelWidget lw;
static void GetnormalGC(UCSLabelWidget lw)
{
XGCValues values;
@ -454,8 +439,7 @@ static void GetnormalGC(lw)
&values);
}
static void GetgrayGC(lw)
UCSLabelWidget lw;
static void GetgrayGC(UCSLabelWidget lw)
{
XGCValues values;
@ -485,8 +469,7 @@ static void GetgrayGC(lw)
&values);
}
static void compute_bitmap_offsets (lw)
UCSLabelWidget lw;
static void compute_bitmap_offsets(UCSLabelWidget lw)
{
/*
* bitmap will be eventually be displayed at
@ -502,8 +485,7 @@ static void compute_bitmap_offsets (lw)
}
static void set_bitmap_info (lw)
UCSLabelWidget lw;
static void set_bitmap_info(UCSLabelWidget lw)
{
Window root;
int x, y;
@ -521,10 +503,8 @@ static void set_bitmap_info (lw)
/* ARGSUSED */
static void Initialize(request, new, args, num_args)
Widget request, new;
ArgList args;
Cardinal *num_args;
static void
Initialize(Widget request, Widget new, ArgList args, Cardinal *num_args)
{
UCSLabelWidget lw = (UCSLabelWidget) new;
@ -560,10 +540,7 @@ static void Initialize(request, new, args, num_args)
*/
/* ARGSUSED */
static void Redisplay(gw, event, region)
Widget gw;
XEvent *event;
Region region;
static void Redisplay(Widget gw, XEvent *event, Region region)
{
UCSLabelWidget w = (UCSLabelWidget) gw;
GC gc;
@ -676,10 +653,8 @@ static void Redisplay(gw, event, region)
#endif /* notdef */
}
static void _Reposition(lw, width, height, dx, dy)
UCSLabelWidget lw;
Dimension width, height;
Position *dx, *dy;
static void _Reposition(UCSLabelWidget lw, Dimension width, Dimension height,
Position *dx, Position *dy)
{
Position newPos;
Position leftedge = lw->label.internal_width + LEFT_OFFSET(lw);
@ -710,8 +685,7 @@ static void _Reposition(lw, width, height, dx, dy)
return;
}
static void Resize(w)
Widget w;
static void Resize(Widget w)
{
UCSLabelWidget lw = (UCSLabelWidget)w;
Position dx, dy;
@ -729,10 +703,9 @@ static void Resize(w)
#define HEIGHT 2
#define NUM_CHECKS 3
static Boolean SetValues(current, request, new, args, num_args)
Widget current, request, new;
ArgList args;
Cardinal *num_args;
static Boolean
SetValues(Widget current, Widget request, Widget new,
ArgList args, Cardinal *num_args)
{
UCSLabelWidget curlw = (UCSLabelWidget) current;
UCSLabelWidget reqlw = (UCSLabelWidget) request;
@ -827,8 +800,7 @@ static Boolean SetValues(current, request, new, args, num_args)
XtIsSensitive(current) != XtIsSensitive(new);
}
static void Destroy(w)
Widget w;
static void Destroy(Widget w)
{
UCSLabelWidget lw = (UCSLabelWidget)w;
@ -840,9 +812,8 @@ static void Destroy(w)
}
static XtGeometryResult QueryGeometry(w, intended, preferred)
Widget w;
XtWidgetGeometry *intended, *preferred;
static XtGeometryResult
QueryGeometry(Widget w, XtWidgetGeometry *intended, XtWidgetGeometry *preferred)
{
UCSLabelWidget lw = (UCSLabelWidget)w;

View File

@ -1,5 +1,3 @@
/* $XConsortium: Label.h,v 1.34 94/04/17 20:12:13 rws Exp $ */
/***********************************************************
Copyright (c) 1987, 1988, 1994 X Consortium
@ -47,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
/* $XFree86: contrib/programs/xfontsel/ULabel.h,v 1.1 1999/04/29 09:12:39 dawes Exp $ */
#ifndef _XawUCSLabel_h
#define _XawUCSLabel_h

View File

@ -1,8 +1,3 @@
/*
* $XConsortium: LabelP.h,v 1.29 94/04/17 20:12:14 kaleb Exp $
*/
/***********************************************************
Copyright (c) 1987, 1988, 1994 X Consortium
@ -50,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
/* $XFree86: contrib/programs/xfontsel/ULabelP.h,v 1.1 1999/04/29 09:12:39 dawes Exp $ */
/*
* ULabelP.h - Private definitions for UCSLabel widget

File diff suppressed because it is too large Load Diff

View File

@ -1,13 +0,0 @@
#! /bin/sh
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
ORIGDIR=`pwd`
cd $srcdir
autoreconf -v --install || exit 1
cd $ORIGDIR || exit $?
$srcdir/configure --enable-maintainer-mode "$@"

View File

@ -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:

View File

@ -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

11407
app/xfontsel/configure vendored

File diff suppressed because it is too large Load Diff

View File

@ -21,23 +21,32 @@ dnl PERFORMANCE OF THIS SOFTWARE.
dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
AC_INIT(xfontsel,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xfontsel)
AM_INIT_AUTOMAKE([dist-bzip2])
AC_PREREQ([2.60])
AC_INIT([xfontsel], [1.0.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xfontsel])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
AC_PROG_CC
AC_PROG_INSTALL
AC_CONFIG_HEADERS([config.h])
PKG_CHECK_MODULES(XFONTSEL, xaw7 xmu xt x11)
PKG_CHECK_MODULES(APPDEFS, xt)
appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
xt_appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt`
AC_ARG_WITH(appdefaultdir,
AS_HELP_STRING([--with-appdefaultdir=<pathname>],
[specify directory for app-defaults files (default is autodetected)]),
[appdefaultdir="$withval"], [appdefaultdir="${xt_appdefaultdir}"])
AC_SUBST(appdefaultdir)
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
AC_OUTPUT([Makefile])
AC_CONFIG_FILES([
Makefile
man/Makefile])
AC_OUTPUT

View File

@ -0,0 +1,12 @@
appmandir = $(APP_MAN_DIR)
appman_PRE = xfontsel.man
appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX))
EXTRA_DIST = $(appman_PRE)
CLEANFILES = $(appman_DATA)
SUFFIXES = .$(APP_MAN_SUFFIX) .man
# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(APP_MAN_SUFFIX):
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@

View File

@ -0,0 +1,361 @@
# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
install_sh_PROGRAM = ${SHELL} $(install_sh) -c
install_sh_SCRIPT = ${SHELL} $(install_sh) -c
INSTALL_HEADER = $(INSTALL_DATA)
transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = man
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
SOURCES =
DIST_SOURCES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(appmandir)"
appmanDATA_INSTALL = $(INSTALL_DATA)
DATA = $(appman_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPDEFS_CFLAGS = @APPDEFS_CFLAGS@
APPDEFS_LIBS = @APPDEFS_LIBS@
APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_CFLAGS = @BASE_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
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@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRICT_CFLAGS = @STRICT_CFLAGS@
STRIP = @STRIP@
VERSION = @VERSION@
XFONTSEL_CFLAGS = @XFONTSEL_CFLAGS@
XFONTSEL_LIBS = @XFONTSEL_LIBS@
XORG_MAN_PAGE = @XORG_MAN_PAGE@
ac_ct_CC = @ac_ct_CC@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
appdefaultdir = @appdefaultdir@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
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@
appmandir = $(APP_MAN_DIR)
appman_PRE = xfontsel.man
appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX))
EXTRA_DIST = $(appman_PRE)
CLEANFILES = $(appman_DATA)
SUFFIXES = .$(APP_MAN_SUFFIX) .man
all: all-am
.SUFFIXES:
.SUFFIXES: .$(APP_MAN_SUFFIX) .man
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
&& exit 0; \
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --foreign man/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
uninstall-info-am:
install-appmanDATA: $(appman_DATA)
@$(NORMAL_INSTALL)
test -z "$(appmandir)" || $(mkdir_p) "$(DESTDIR)$(appmandir)"
@list='$(appman_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
echo " $(appmanDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(appmandir)/$$f'"; \
$(appmanDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(appmandir)/$$f"; \
done
uninstall-appmanDATA:
@$(NORMAL_UNINSTALL)
@list='$(appman_DATA)'; for p in $$list; do \
f=$(am__strip_dir) \
echo " rm -f '$(DESTDIR)$(appmandir)/$$f'"; \
rm -f "$(DESTDIR)$(appmandir)/$$f"; \
done
tags: TAGS
TAGS:
ctags: CTAGS
CTAGS:
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
case $$file in \
$(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
$(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
esac; \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
$(mkdir_p) "$(distdir)$$dir"; \
else \
dir=''; \
fi; \
if test -d $$d/$$file; then \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
test -f $(distdir)/$$file \
|| cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(appmandir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
uninstall: uninstall-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
clean-generic:
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
html: html-am
info: info-am
info-am:
install-data-am: install-appmanDATA
install-exec-am:
install-info: install-info-am
install-man:
installcheck-am:
maintainer-clean: maintainer-clean-am
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
pdf: pdf-am
pdf-am:
ps: ps-am
ps-am:
uninstall-am: uninstall-appmanDATA uninstall-info-am
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am html html-am info info-am \
install install-am install-appmanDATA install-data \
install-data-am install-exec install-exec-am install-info \
install-info-am install-man install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am uninstall uninstall-am uninstall-appmanDATA \
uninstall-info-am
# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(APP_MAN_SUFFIX):
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

View File

@ -1,4 +1,3 @@
.\" $XConsortium: xfontsel.man,v 1.14 94/06/10 14:39:10 gildea Exp $
.\" Copyright (c) 1994 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
@ -25,7 +24,6 @@
.\" other dealings in this Software without prior written authorization
.\" from the X Consortium.
.\"
.\" $XFree86: xc/programs/xfontsel/xfontsel.man,v 1.3 2001/01/27 18:21:12 dawes Exp $
.de EX \"Begin example
.ne 5
.if n .sp 1
@ -194,7 +192,7 @@ a reasonable thing to specify in a resource file.
$XFILESEARCHPATH/XFontSel
.PP
.SH SEE ALSO
xrdb(1), xfd(1)
xrdb(__appmansuffix__), xfd(__appmansuffix__)
.PP
.SH BUGS
.PP

View File

@ -1,4 +1,3 @@
/* $XConsortium: xfontsel.c,v 1.35 94/04/17 20:43:41 rws Exp $ */
/*
Copyright (c) 1985-1989 X Consortium
@ -31,7 +30,6 @@ Author: Ralph R. Swick, DEC/MIT Project Athena
one weekend in November, 1989
Modified: Mark Leisher <mleisher@crl.nmsu.edu> to deal with UCS sample text.
*/
/* $XFree86: xc/programs/xfontsel/xfontsel.c,v 1.7tsi Exp $ */
#include <stdio.h>
#include <stdlib.h>
@ -66,32 +64,32 @@ Modified: Mark Leisher <mleisher@crl.nmsu.edu> to deal with UCS sample text.
#define NZ NULL,ZERO
#define BACKGROUND 10
void GetFontNames();
Boolean Matches();
Boolean DoWorkPiece();
void Quit();
void OwnSelection();
void SelectField();
void ParseFontNames();
void SortFields();
void FixScalables();
void MakeFieldMenu();
void SelectValue();
void AnyValue();
void EnableOtherValues();
void EnableMenu();
void SetCurrentFont();
void QuitAction();
void GetFontNames(XtPointer closure);
Boolean Matches(String pattern, String fontName, Boolean fields[], int *maxfields);
Boolean DoWorkPiece(XtPointer closure);
void Quit(Widget w, XtPointer closure, XtPointer callData);
void OwnSelection(Widget w, XtPointer closure, XtPointer callData);
void SelectField(Widget w, XtPointer closure, XtPointer callData);
void ParseFontNames(XtPointer closure);
void SortFields(XtPointer closure);
void FixScalables(XtPointer closure);
void MakeFieldMenu(XtPointer closure);
void SelectValue(Widget w, XtPointer closure, XtPointer callData);
void AnyValue(Widget w, XtPointer closure, XtPointer callData);
void EnableOtherValues(Widget w, XtPointer closure, XtPointer callData);
void EnableMenu(XtPointer closure);
void SetCurrentFont(XtPointer closure);
void QuitAction(Widget w, XEvent *event, String *params, Cardinal *num_params);
XtActionsRec xfontsel_actions[] = {
static XtActionsRec xfontsel_actions[] = {
{"Quit", QuitAction}
};
Atom wm_delete_window;
static Atom wm_delete_window;
Boolean IsXLFDFontName();
Boolean IsXLFDFontName(String fontName);
typedef void (*XtProc)();
typedef void (*XtProc)(XtPointer closure);
static struct _appRes {
int app_defaults_version;
@ -150,8 +148,7 @@ static XrmOptionDescRec options[] = {
{"-scaled", "scaledFonts", XrmoptionNoArg, "True"},
};
static void Syntax(call)
char *call;
static void Syntax(char *call)
{
fprintf (stderr, "usage: %s [-options ...] -fn font\n\n", call);
fprintf (stderr, "where options include:\n");
@ -235,34 +232,32 @@ static void SetCurrentFontCount(void);
static void SetNoFonts(void);
static void SetParsingFontCount(int count);
XtAppContext appCtx;
int numFonts;
int numBadFonts;
FontValues *fonts;
int *scaledFonts;
int numScaledFonts;
FieldValueList *fieldValues[FIELD_COUNT];
FontValues currentFont;
int matchingFontCount;
static XtAppContext appCtx;
static int numFonts;
static int numBadFonts;
static FontValues *fonts;
static int *scaledFonts;
static int numScaledFonts;
static FieldValueList *fieldValues[FIELD_COUNT];
static FontValues currentFont;
static int matchingFontCount;
static Boolean anyDisabled = False;
Widget ownButton;
Widget fieldBox;
Widget countLabel;
Widget currentFontName;
String currentFontNameString;
int currentFontNameSize;
Widget sampleText;
int textEncoding = -1;
static Widget ownButton;
static Widget fieldBox;
static Widget countLabel;
static Widget currentFontName;
static String currentFontNameString;
static int currentFontNameSize;
static Widget sampleText;
static int textEncoding = -1;
static XFontStruct *sampleFont = NULL;
Boolean *fontInSet;
static Boolean *fontInSet;
static Choice *choiceList = NULL;
int enabledMenuIndex;
static int enabledMenuIndex;
static Boolean patternFieldSpecified[FIELD_COUNT]; /* = 0 */
int
main(argc, argv)
int argc;
char **argv;
main(int argc, char **argv)
{
Widget topLevel, pane;
@ -319,7 +314,7 @@ see 'xfontsel' manual page."
for (f = 0; f < FIELD_COUNT; f++) {
char name[10];
FieldMenuRec *makeRec = XtNew(FieldMenuRec);
sprintf( name, "field%d", f );
snprintf( name, sizeof(name), "field%d", f );
XtCreateManagedWidget("dash",labelWidgetClass,fieldBox,NZ);
field = XtCreateManagedWidget(name, menuButtonWidgetClass,
fieldBox, NZ);
@ -328,7 +323,7 @@ see 'xfontsel' manual page."
makeRec->field = f;
makeRec->button = field;
ScheduleWork(MakeFieldMenu, (XtPointer)makeRec, 2);
ScheduleWork(XtFree, (XtPointer)makeRec, 2);
ScheduleWork((XtProc)XtFree, (XtPointer)makeRec, 2);
}
}
@ -347,16 +342,8 @@ see 'xfontsel' manual page."
viewPort =
XtCreateManagedWidget("viewPort",viewportWidgetClass,pane,NZ);
{
#ifdef USE_TEXT_WIDGET
Widget text =
XtCreateManagedWidget("sampleText",asciiTextWidgetClass,viewPort,NZ);
Arg args[1];
XtSetArg( args[0], XtNtextSink, &sampleText );
XtGetValues( text, args, ONE );
#else
sampleText =
XtCreateManagedWidget("sampleText",ucsLabelWidgetClass,viewPort,NZ);
#endif
}
}
@ -397,10 +384,7 @@ static WorkPiece workQueue = NULL;
* Xt knows we have (background) work to do.
*/
static void ScheduleWork( proc, closure, priority )
XtProc proc;
XtPointer closure;
int priority;
static void ScheduleWork(XtProc proc, XtPointer closure, int priority)
{
WorkPiece piece = XtNew(WorkPieceRec);
@ -427,8 +411,7 @@ static void ScheduleWork( proc, closure, priority )
}
/* ARGSUSED */
Boolean DoWorkPiece(closure)
XtPointer closure; /* unused */
Boolean DoWorkPiece(XtPointer closure)
{
WorkPiece piece = workQueue;
@ -450,7 +433,7 @@ Boolean DoWorkPiece(closure)
* Foreground == (priority < BACKGROUND)
*/
void FinishWork()
static void FinishWork(void)
{
while (workQueue && workQueue->priority < BACKGROUND)
DoWorkPiece(NULL);
@ -467,8 +450,7 @@ struct ParseRec {
};
void GetFontNames( closure )
XtPointer closure;
void GetFontNames(XtPointer closure)
{
Display *dpy = (Display*)closure;
ParseRec *parseRec = XtNew(ParseRec);
@ -502,7 +484,7 @@ void GetFontNames( closure )
ParseRec *prevRec = parseRec;
parseRec->end = parseRec->start + PARSE_QUANTUM;
ScheduleWork(ParseFontNames, (XtPointer)parseRec, work_priority);
ScheduleWork(XtFree, (XtPointer)parseRec, work_priority);
ScheduleWork((XtProc)XtFree, (XtPointer)parseRec, work_priority);
parseRec = XtNew(ParseRec);
*parseRec = *prevRec;
parseRec->start += PARSE_QUANTUM;
@ -514,7 +496,7 @@ void GetFontNames( closure )
parseRec->end = numFonts;
ScheduleWork(ParseFontNames,(XtPointer)parseRec,work_priority);
ScheduleWork((XtProc)XFreeFontNames,(XtPointer)fontNames,work_priority);
ScheduleWork(XtFree, (XtPointer)parseRec, work_priority);
ScheduleWork((XtProc)XtFree, (XtPointer)parseRec, work_priority);
if (AppRes.scaled_fonts)
ScheduleWork(FixScalables,(XtPointer)0,work_priority);
ScheduleWork(SortFields,(XtPointer)0,work_priority);
@ -543,8 +525,7 @@ void GetFontNames( closure )
}
void ParseFontNames( closure )
XtPointer closure;
void ParseFontNames(XtPointer closure)
{
ParseRec *parseRec = (ParseRec*)closure;
char **fontNames = parseRec->fontNames;
@ -565,7 +546,7 @@ void ParseFontNames( closure )
}
for (f = 0, p = *fontNames++; f < FIELD_COUNT; f++) {
char *fieldP;
const char *fieldP;
if (*p) ++p;
if (*p == DELIM || *p == '\0') {
@ -629,8 +610,7 @@ void ParseFontNames( closure )
* since we need to do this for resolution fields which can be nonzero in
* the scalable fonts.
*/
void AddScalables(f)
int f;
static void AddScalables(int f)
{
int i;
int max = fieldValues[f]->count;
@ -683,9 +663,7 @@ void AddScalables(f)
* for field f. Weed out duplicates. The set of matching fonts is just
* the set of scalable fonts.
*/
void NewScalables(f, slist)
int f;
char *slist;
static void NewScalables(int f, char *slist)
{
char endc = 1;
char *str;
@ -732,8 +710,7 @@ void NewScalables(f, slist)
* in resources.
*/
/*ARGSUSED*/
void FixScalables( closure )
XtPointer closure;
void FixScalables(XtPointer closure)
{
int i;
FieldValue *fval = fieldValues[6]->value;
@ -797,7 +774,7 @@ static int strcmpn(const char *s1, const char *s2)
/* Order is *, (nil), rest */
int AlphabeticSort(_Xconst void *fval1, _Xconst void *fval2)
static int AlphabeticSort(_Xconst void *fval1, _Xconst void *fval2)
{
# define fval1 ((_Xconst FieldValue *)fval1)
# define fval2 ((_Xconst FieldValue *)fval2)
@ -819,7 +796,7 @@ int AlphabeticSort(_Xconst void *fval1, _Xconst void *fval2)
/* Order is *, (nil), rest */
int NumericSort(_Xconst void *fval1, _Xconst void *fval2)
static int NumericSort(_Xconst void *fval1, _Xconst void *fval2)
{
# define fval1 ((_Xconst FieldValue *)fval1)
# define fval2 ((_Xconst FieldValue *)fval2)
@ -846,8 +823,7 @@ int NumericSort(_Xconst void *fval1, _Xconst void *fval2)
* sort.
*/
/*ARGSUSED*/
void SortFields( closure )
XtPointer closure;
void SortFields(XtPointer closure)
{
int i, j, count;
FieldValue *vals;
@ -883,8 +859,7 @@ void SortFields( closure )
}
Boolean IsXLFDFontName(fontName)
String fontName;
Boolean IsXLFDFontName(String fontName)
{
int f;
for (f = 0; *fontName;) if (*fontName++ == DELIM) f++;
@ -892,8 +867,7 @@ Boolean IsXLFDFontName(fontName)
}
void MakeFieldMenu(closure)
XtPointer closure;
void MakeFieldMenu(XtPointer closure)
{
FieldMenuRec *makeRec = (FieldMenuRec*)closure;
Widget menu;
@ -939,19 +913,13 @@ static void SetNoFonts(void)
XtSetSensitive(fieldBox, False);
XtSetSensitive(ownButton, False);
if (AppRes.app_defaults_version >= MIN_APP_DEFAULTS_VERSION) {
#ifdef USE_TEXT_WIDGET
XtUnmapWidget(XtParent(sampleText));
#else
XtUnmapWidget(sampleText);
#endif
}
}
Boolean Matches(pattern, fontName, fields, maxField)
register String pattern, fontName;
Boolean fields[/*FIELD_COUNT*/];
int *maxField;
Boolean Matches(register String pattern, register String fontName,
Boolean fields[/*FIELD_COUNT*/], int *maxField)
{
register int field = (*fontName == DELIM) ? -1 : 0;
register Boolean marked_this_field = False;
@ -999,9 +967,7 @@ Boolean Matches(pattern, fontName, fields, maxField)
/* ARGSUSED */
void SelectValue(w, closure, callData)
Widget w;
XtPointer closure, callData;
void SelectValue(Widget w, XtPointer closure, XtPointer callData)
{
FieldValue *val = (FieldValue*)closure;
#ifdef LOG_CHOICES
@ -1031,9 +997,7 @@ void SelectValue(w, closure, callData)
/* ARGSUSED */
void AnyValue(w, closure, callData)
Widget w;
XtPointer closure, callData;
void AnyValue(Widget w, XtPointer closure, XtPointer callData)
{
int field = (long)closure;
currentFont.value_index[field] = -1;
@ -1050,7 +1014,7 @@ static void SetCurrentFontCount(void)
if (matchingFontCount == 1)
strcpy( label, "1 name matches" );
else if (matchingFontCount)
sprintf( label, "%d names match", matchingFontCount );
snprintf( label, sizeof(label), "%d names match", matchingFontCount );
else
strcpy( label, "no names match" );
XtSetArg( args[0], XtNlabel, label );
@ -1065,16 +1029,14 @@ static void SetParsingFontCount(int count)
if (count == 1)
strcpy( label, "1 name to parse" );
else
sprintf( label, "%d names to parse", count );
snprintf( label, sizeof(label), "%d names to parse", count );
XtSetArg( args[0], XtNlabel, label );
XtSetValues( countLabel, args, ONE );
FlushXqueue(XtDisplay(countLabel));
}
/* ARGSUSED */
static Boolean IsISO10646(dpy, font)
Display *dpy;
XFontStruct *font;
static Boolean IsISO10646(Display *dpy, XFontStruct *font)
{
Boolean ok;
int i;
@ -1099,8 +1061,7 @@ static Boolean IsISO10646(dpy, font)
}
/* ARGSUSED */
void SetCurrentFont(closure)
XtPointer closure; /* unused */
void SetCurrentFont(XtPointer closure)
{
int f;
Boolean *b;
@ -1156,11 +1117,7 @@ void SetCurrentFont(closure)
SetCurrentFontCount();
{
#ifdef USE_TEXT_WIDGET
Widget mapWidget = XtParent(sampleText);
#else
Widget mapWidget = sampleText;
#endif
Display *dpy = XtDisplay(mapWidget);
XFontStruct *font = XLoadQueryFont(dpy, currentFontNameString);
String sample_text;
@ -1200,9 +1157,7 @@ void SetCurrentFont(closure)
}
static void MarkInvalidFonts( set, val )
Boolean *set;
FieldValue *val;
static void MarkInvalidFonts(Boolean *set, FieldValue *val)
{
int fi = 0, vi;
int *fp = val->font;
@ -1220,8 +1175,7 @@ static void MarkInvalidFonts( set, val )
}
static void EnableRemainingItems(current_field_action)
ValidateAction current_field_action;
static void EnableRemainingItems(ValidateAction current_field_action)
{
if (matchingFontCount == 0 || matchingFontCount == numFonts) {
if (anyDisabled) {
@ -1275,9 +1229,7 @@ static void EnableAllItems(int field)
/* ARGSUSED */
void SelectField(w, closure, callData)
Widget w;
XtPointer closure, callData;
void SelectField(Widget w, XtPointer closure, XtPointer callData)
{
int field = (long)closure;
FieldValue *values = fieldValues[field]->value;
@ -1297,8 +1249,7 @@ void SelectField(w, closure, callData)
* will almost always produce an illegal font name, and it isn't worth
* trying to compute which choices might be legal to the font scaler.
*/
void DisableScaled(f, f1, f2)
int f, f1, f2;
static void DisableScaled(int f, int f1, int f2)
{
int i, j;
FieldValue *v;
@ -1321,9 +1272,7 @@ void DisableScaled(f, f1, f2)
}
/* ARGSUSED */
void EnableOtherValues(w, closure, callData)
Widget w;
XtPointer closure, callData;
void EnableOtherValues(Widget w, XtPointer closure, XtPointer callData)
{
int field = (long)closure;
Boolean *font_in_set = (Boolean*)XtMalloc(numFonts*sizeof(Boolean));
@ -1386,8 +1335,7 @@ void EnableOtherValues(w, closure, callData)
}
void EnableMenu(closure)
XtPointer closure;
void EnableMenu(XtPointer closure)
{
int field = (long)closure;
FieldValue *val = fieldValues[field]->value;
@ -1434,8 +1382,7 @@ void EnableMenu(closure)
}
static void FlushXqueue(dpy)
Display *dpy;
static void FlushXqueue(Display *dpy)
{
XSync(dpy, False);
while (XtAppPending(appCtx)) XtAppProcessEvent(appCtx, XtIMAll);
@ -1443,9 +1390,7 @@ static void FlushXqueue(dpy)
/* ARGSUSED */
void Quit(w, closure, callData)
Widget w;
XtPointer closure, callData;
void Quit(Widget w, XtPointer closure, XtPointer callData)
{
XtCloseDisplay(XtDisplay(w));
if (AppRes.print_on_quit) printf( "%s", currentFontNameString );
@ -1453,12 +1398,9 @@ void Quit(w, closure, callData)
}
Boolean ConvertSelection(w, selection, target, type, value, length, format)
Widget w;
Atom *selection, *target, *type;
XtPointer *value;
unsigned long *length;
int *format;
static Boolean
ConvertSelection(Widget w, Atom *selection, Atom *target, Atom *type,
XtPointer *value, unsigned long *length, int *format)
{
/* XmuConvertStandardSelection will use the second parameter only when
* converting to the target TIMESTAMP. However, it will never be
@ -1485,9 +1427,7 @@ static AtomPtr _XA_PRIMARY_FONT = NULL;
#define XA_PRIMARY_FONT XmuInternAtom(XtDisplay(w),_XA_PRIMARY_FONT)
/* ARGSUSED */
void LoseSelection(w, selection)
Widget w;
Atom *selection;
static void LoseSelection(Widget w, Atom *selection)
{
Arg args[1];
XtSetArg( args[0], XtNstate, False );
@ -1499,18 +1439,14 @@ void LoseSelection(w, selection)
/* ARGSUSED */
void DoneSelection(w, selection, target)
Widget w;
Atom *selection, *target;
static void DoneSelection(Widget w, Atom *selection, Atom *target)
{
/* do nothing */
}
/* ARGSUSED */
void OwnSelection(w, closure, callData)
Widget w;
XtPointer closure, callData;
void OwnSelection(Widget w, XtPointer closure, XtPointer callData)
{
Time time = XtLastTimestampProcessed(XtDisplay(w));
Boolean primary = (Boolean) (long) closure;
@ -1537,8 +1473,9 @@ void OwnSelection(w, closure, callData)
}
}
/*ARGSUSED*/
void
QuitAction ()
QuitAction(Widget w, XEvent *event, String *params, Cardinal *num_params)
{
exit (0);
}