qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to xedit 1.2.0

Browse Source
This commit is contained in:
matthieu 2010-10-31 19:19:11 +00:00
parent d1934945ed
commit f1c430b349
23 changed files with 2543 additions and 3721 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

249
app/xedit/ChangeLog
View File

@ -1,3 +1,250 @@
commit 3fc23c464e814cad0fcf318dfa06afb90006917c
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Oct 30 15:29:20 2010 -0700
xedit 1.2.0
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 503b075a868e8f88eb9816a1ce859e75e7341ca9
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Oct 30 15:27: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 f3a39e6188f7ff4baec52d4bd2efc4f029b696c9
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Oct 30 15:26:40 2010 -0700
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>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit ee574a68128653e184389f66cfc5ca686f258455
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Jul 1 17:51:53 2010 -0700
Xmu functions are called directly, so include it in PKG_CHECK_MODULES
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 1da695772d64d4919a91c085d96ce1bd528d048e
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 b67fdbae96217bda5eecbff3706ff12a25ed2934
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Mar 25 20:04:31 2010 -0400
xprint: remove conditionally defined related C code
Reviewed-by: Jeremy Huddleston <jeremyhu@freedestop.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 47b6e661024970b8f3b53d9f7930b9ec77ccdbdc
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Mar 25 19:55:11 2010 -0400
xprint: remove xprint related C code
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 4f452ccf18993f3a68c6f30719fc6ed4e7fe9b13
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Mar 25 19:37:54 2010 -0400
xprint: remove Xedit-xprint resource file
Remove configuration regarding xprint support
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 40b17bb87cb89a1b851e1d39e03431ecbc9c155e
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Mar 25 19:30:50 2010 -0400
config: remove dependency on xaw8
Remove configure option --enable-xprint
Remove AM conditional USE_XPRINT
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 553e84525830c551d423d837f7b317df10d69e3f
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 7adc430f7e76a04cd0f2abfa6ea46a3035d8e2ab
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 8a56edb05d0881354ec0f5c849495e7604cf5ca7
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 b495f585017d7d441bc2a7b117d400f2ee082a9c
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Oct 27 15:07:24 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 7014a702382d55464aefdbd61405a1c49b30cf26
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Oct 26 22:08:38 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 64a4c3d43b8521c51d9ef77ce6987b274937818d
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 b5980a1f03ebbc97267682fa912f145728867364
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Mon Jan 26 20:14:44 2009 -0200
Set text properties after loading all command line files.
This is more of a workaround for a problem where the first file
will end up using the "text properties" of the last file with a
syntax highlight definition.
A more proper correction could be to actually display the last
file loaded (and removed the duplicated code in xedit.c:main()).
commit bb19bb3d1dd5bb9c0070f867324f740894c76887
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Mon Jan 12 20:33:01 2009 -0200
Correct problems in make distcheck.
commit e7d66545e71cdd223761ce14416cbebccbd6dd75
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Tue Dec 2 02:25:41 2008 -0200
Use new XORG_CWARNFLAGS and XORG_CHANGELOG macros.
Also correct a possible uninitialized variable.
commit 99faa7b727a5441b0dfeed72f43571a85ff0a079
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Tue Dec 2 02:05:42 2008 -0200
Properly read symbol name in tags interface.
If the symbol is not in a full text "Piece", XawTextSourceRead() will
return an XawTextBlock that points to an incomplete buffer, and a new
call must be made to read the remaining data.
commit 2c5007e4aa838b0faf1020d90661adfe0a9b6275
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Tue Dec 2 01:27:52 2008 -0200
Don't put EOF in the unget buffer.
commit e79879904eea8495b28d7895ce126269a9ef300f
Author: A Costa <agcosta@gis.net>
Date: Thu Apr 28 01:47:05 2005 -0400
Man page typo fixes
Debian bug#306707 <http://bugs.debian.org/306707>
commit ab754905b2878ba76e309963138bf47c2ae8df2a
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Wed Nov 12 01:25:22 2008 -0200
Add missing check for symbolic links.
It was properly checking when using <tab-completion>+<enter>, but not
when using <tab-completion>+<click-on-filename>, what would allow loading
the same file with different names (but save would be done to the
real file, and not overwrite the link).
commit cfc78a1c2452362a5e7c88ed239c9d7ef0240a4d
Author: Peter Breitenlohner <peb@mppmu.mpg.de>
Date: Tue Nov 11 10:52:18 2008 +0100
reorganize app default files
commit 9d4a9520409fdb50987be6f4ca2c8afd5b53c994
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Mon Nov 10 01:47:46 2008 -0200
Don't highlight quotes in nested syntax tables for "auto" mode.
To properly do it, it should also match the pattern for the macro name,
to know if it is a plain text one or not, otherwise, it will get confused
with usage of the characters (') and (`).
commit 0ab2815743d89b1cd283abaf4d2cb77fed4a2df4
Author: Peter Breitenlohner <peb@mppmu.mpg.de>
Date: Sun Nov 9 14:24:10 2008 +0100
avoid race condition for parallel jobs
commit 01ba3d66731e679d07f7083306a712bbfed16b38
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Fri Nov 7 16:41:36 2008 -0200
Xedit version 1.1.2.
Also update to use ``git log'' instead of ``git-log'', to match
newer versions of git.
commit 0d133999449ce7c5db19d46680430ab16e81e4fd
Author: Peter Breitenlohner <peb@mppmu.mpg.de>
Date: Thu Nov 6 21:19:56 2008 +0100
@ -20,7 +267,7 @@ Date: Wed Oct 8 19:21:28 2008 -0300
and a zero sized one created.
commit d96491aad5542f052b722b94d86f0ce7661ae98b
Merge: cc7cb04... f1efec7...
Merge: cc7cb04 f1efec7
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Fri Sep 26 17:47:32 2008 -0300

291
app/xedit/INSTALL
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.

94
app/xedit/Makefile.am
View File

@ -27,7 +27,7 @@ noinst_PROGRAMS = lisp/lsp lisp/re/tests
# libmp.a
#
libmp_a_CFLAGS =
libmp_a_CFLAGS = $(CWARNFLAGS)
libmp_a_SOURCES = \
lisp/mp/mp.c \
lisp/mp/mp.h \
@ -38,7 +38,7 @@ libmp_a_SOURCES = \
# liblisp.a
#
liblisp_a_CFLAGS = -I$(top_srcdir)/lisp/re -I$(top_srcdir)/lisp/mp -DLISP -DLISPDIR=\"$(LISPDIR)\" $(PKGDEPS_CFLAGS)
liblisp_a_CFLAGS = $(CWARNFLAGS) -I$(top_srcdir)/lisp/re -I$(top_srcdir)/lisp/mp -DLISP -DLISPDIR=\"$(LISPDIR)\" $(PKGDEPS_CFLAGS)
liblisp_a_SOURCES = \
lisp/bytecode.c \
lisp/bytecode.h \
@ -91,7 +91,7 @@ endif
# libre.a
#
libre_a_CFLAGS =
libre_a_CFLAGS = $(CWARNFLAGS)
libre_a_SOURCES = \
lisp/re/re.c \
lisp/re/rec.c \
@ -103,7 +103,7 @@ libre_a_SOURCES = \
# xedit
#
xedit_DEPENDENCIES = liblisp.a libmp.a libre.a
xedit_CFLAGS = $(PKGDEPS_CFLAGS) -I$(top_srcdir)/lisp/re -D_BSD_SOURCE -DXEDIT
xedit_CFLAGS = $(CWARNFLAGS) $(PKGDEPS_CFLAGS) -I$(top_srcdir)/lisp/re -D_BSD_SOURCE -DXEDIT
xedit_LDADD = -L. -lre -llisp -lmp $(PKGDEPS_LIBS) -lm
xedit_SOURCES = \
@ -127,20 +127,9 @@ if NEED_STRCASECMP
xedit_SOURCES += strcasecmp.c
endif
if USE_XPRINT
xedit_CFLAGS += -DINCLUDE_XPRINT_SUPPORT
xedit_SOURCES += \
print.c \
printdialog.c \
printdialog.h \
printdialogprivates.h \
print.h
endif
# lisp/lsp
lisp_lsp_DEPENDENCIES = liblisp.a libre.a libmp.a
lisp_lsp_CFLAGS = -I$(top_srcdir)/lisp/re -I$(top_srcdir)/lisp/mp -DLISP -DLISPDIR=\"@LISPDIR@\" -D_BSD_SOURCE
lisp_lsp_CFLAGS = $(CWARNFLAGS) -I$(top_srcdir)/lisp/re -I$(top_srcdir)/lisp/mp -DLISP -DLISPDIR=\"@LISPDIR@\" -D_BSD_SOURCE
lisp_lsp_LDADD = -L. -llisp -lre -lmp -lm
lisp_lsp_SOURCES = \
hash.c \
@ -156,37 +145,19 @@ endif
# re/tests
lisp_re_tests_DEPENDENCIES = libre.a
lisp_re_tests_CFLAGS = -I$(top_srcdir)/lisp/re -D_BSD_SOURCE
lisp_re_tests_CFLAGS = $(CWARNFLAGS) -I$(top_srcdir)/lisp/re -D_BSD_SOURCE
lisp_re_tests_LDADD = -L. -lre
lisp_re_tests_SOURCES = lisp/re/tests.c
# App default files (*.ad)
# App default files
APPDEFAULTFILES = \
app-defaults/Xedit-color \
app-defaults/Xedit
if USE_XPRINT
app-defaults/Xedit.ad:
test -d app-defaults || mkdir -p app-defaults
cp $(top_srcdir)/app-defaults/Xedit-xprint.ad app-defaults/Xedit.ad
else
app-defaults/Xedit.ad:
test -d app-defaults || mkdir -p app-defaults
cp $(top_srcdir)/app-defaults/Xedit-noxprint.ad app-defaults/Xedit.ad
endif
SUFFIXES = .ad
.ad:
test -d app-defaults || mkdir -p app-defaults
cp $< $@
DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
appdefaultdir = @appdefaultdir@
appdefault_DATA = $(APPDEFAULTFILES)
CLEANFILES = $(APPDEFAULTFILES) app-defaults/Xedit.ad
appdefault_DATA = \
app-defaults/Xedit-color \
app-defaults/Xedit
lispdir = $(LISPDIR)
dist_lisp_DATA = ${srcdir}/lisp/modules/lisp.lsp \
@ -216,9 +187,8 @@ dist_progmodes_DATA = \
appman_PRE = xedit.man
EXTRA_DIST = \
app-defaults/Xedit-color.ad \
app-defaults/Xedit-xprint.ad \
app-defaults/Xedit-noxprint.ad \
app-defaults/Xedit-color \
app-defaults/Xedit \
app-defaults/Xedit-sample \
lisp/README \
lisp/TODO \
@ -246,38 +216,22 @@ appmandir = $(APP_MAN_DIR)
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
EXTRA_DIST += $(appman_PRE)
CLEANFILES += $(appman_DATA)
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
SUFFIXES = .$(APP_MAN_SUFFIX) .man
# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
EXTRA_DIST += ChangeLog
MAINTAINERCLEANFILES = ChangeLog
.PHONY: ChangeLog
.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

159
app/xedit/Makefile.in
View File

@ -64,16 +64,8 @@ noinst_PROGRAMS = lisp/lsp$(EXEEXT) lisp/re/tests$(EXEEXT)
@NEED_UNSETENV_TRUE@am__append_1 = lisp/env.c
@NEED_REALPATH_TRUE@am__append_2 = realpath.c
@NEED_STRCASECMP_TRUE@am__append_3 = strcasecmp.c
@USE_XPRINT_TRUE@am__append_4 = -DINCLUDE_XPRINT_SUPPORT
@USE_XPRINT_TRUE@am__append_5 = \
@USE_XPRINT_TRUE@ print.c \
@USE_XPRINT_TRUE@ printdialog.c \
@USE_XPRINT_TRUE@ printdialog.h \
@USE_XPRINT_TRUE@ printdialogprivates.h \
@USE_XPRINT_TRUE@ print.h
@NEED_REALPATH_TRUE@am__append_6 = realpath.c
@NEED_STRCASECMP_TRUE@am__append_7 = strcasecmp.c
@NEED_REALPATH_TRUE@am__append_4 = realpath.c
@NEED_STRCASECMP_TRUE@am__append_5 = strcasecmp.c
DIST_COMMON = README $(am__configure_deps) $(dist_lisp_DATA) \
$(dist_progmodes_DATA) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
@ -144,18 +136,14 @@ am_lisp_re_tests_OBJECTS = lisp_re_tests-tests.$(OBJEXT)
lisp_re_tests_OBJECTS = $(am_lisp_re_tests_OBJECTS)
am__xedit_SOURCES_DIST = commands.c hash.c hook.c ispell.c lisp.c \
options.c tags.c util.c util.h xedit.c xedit.h realpath.c \
strcasecmp.c print.c printdialog.c printdialog.h \
printdialogprivates.h print.h
strcasecmp.c
@NEED_REALPATH_TRUE@am__objects_4 = xedit-realpath.$(OBJEXT)
@NEED_STRCASECMP_TRUE@am__objects_5 = xedit-strcasecmp.$(OBJEXT)
@USE_XPRINT_TRUE@am__objects_6 = xedit-print.$(OBJEXT) \
@USE_XPRINT_TRUE@ xedit-printdialog.$(OBJEXT)
am_xedit_OBJECTS = xedit-commands.$(OBJEXT) xedit-hash.$(OBJEXT) \
xedit-hook.$(OBJEXT) xedit-ispell.$(OBJEXT) \
xedit-lisp.$(OBJEXT) xedit-options.$(OBJEXT) \
xedit-tags.$(OBJEXT) xedit-util.$(OBJEXT) \
xedit-xedit.$(OBJEXT) $(am__objects_4) $(am__objects_5) \
$(am__objects_6)
xedit-xedit.$(OBJEXT) $(am__objects_4) $(am__objects_5)
xedit_OBJECTS = $(am_xedit_OBJECTS)
am__DEPENDENCIES_1 =
DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
@ -201,6 +189,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@
@ -212,7 +201,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@
@ -221,9 +213,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@
@ -239,6 +234,7 @@ 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@
NEED_REALPATH_FALSE = @NEED_REALPATH_FALSE@
@ -259,12 +255,12 @@ PKGDEPS_CFLAGS = @PKGDEPS_CFLAGS@
PKGDEPS_LIBS = @PKGDEPS_LIBS@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
USE_XPRINT_FALSE = @USE_XPRINT_FALSE@
USE_XPRINT_TRUE = @USE_XPRINT_TRUE@
VERSION = @VERSION@
XORG_MAN_PAGE = @XORG_MAN_PAGE@
ac_ct_CC = @ac_ct_CC@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@ -314,7 +310,7 @@ noinst_LIBRARIES = liblisp.a libre.a libmp.a
#
# libmp.a
#
libmp_a_CFLAGS =
libmp_a_CFLAGS = $(CWARNFLAGS)
libmp_a_SOURCES = \
lisp/mp/mp.c \
lisp/mp/mp.h \
@ -325,7 +321,7 @@ libmp_a_SOURCES = \
#
# liblisp.a
#
liblisp_a_CFLAGS = -I$(top_srcdir)/lisp/re -I$(top_srcdir)/lisp/mp -DLISP -DLISPDIR=\"$(LISPDIR)\" $(PKGDEPS_CFLAGS)
liblisp_a_CFLAGS = $(CWARNFLAGS) -I$(top_srcdir)/lisp/re -I$(top_srcdir)/lisp/mp -DLISP -DLISPDIR=\"$(LISPDIR)\" $(PKGDEPS_CFLAGS)
liblisp_a_SOURCES = lisp/bytecode.c lisp/bytecode.h lisp/core.c \
lisp/core.h lisp/debugger.c lisp/debugger.h lisp/format.c \
lisp/format.h lisp/hash.c lisp/hash.h lisp/helper.c \
@ -341,7 +337,7 @@ liblisp_a_SOURCES = lisp/bytecode.c lisp/bytecode.h lisp/core.c \
#
# libre.a
#
libre_a_CFLAGS =
libre_a_CFLAGS = $(CWARNFLAGS)
libre_a_SOURCES = \
lisp/re/re.c \
lisp/re/rec.c \
@ -354,33 +350,30 @@ libre_a_SOURCES = \
# xedit
#
xedit_DEPENDENCIES = liblisp.a libmp.a libre.a
xedit_CFLAGS = $(PKGDEPS_CFLAGS) -I$(top_srcdir)/lisp/re -D_BSD_SOURCE \
-DXEDIT $(am__append_4)
xedit_CFLAGS = $(CWARNFLAGS) $(PKGDEPS_CFLAGS) -I$(top_srcdir)/lisp/re -D_BSD_SOURCE -DXEDIT
xedit_LDADD = -L. -lre -llisp -lmp $(PKGDEPS_LIBS) -lm
xedit_SOURCES = commands.c hash.c hook.c ispell.c lisp.c options.c \
tags.c util.c util.h xedit.c xedit.h $(am__append_2) \
$(am__append_3) $(am__append_5)
$(am__append_3)
# lisp/lsp
lisp_lsp_DEPENDENCIES = liblisp.a libre.a libmp.a
lisp_lsp_CFLAGS = -I$(top_srcdir)/lisp/re -I$(top_srcdir)/lisp/mp -DLISP -DLISPDIR=\"@LISPDIR@\" -D_BSD_SOURCE
lisp_lsp_CFLAGS = $(CWARNFLAGS) -I$(top_srcdir)/lisp/re -I$(top_srcdir)/lisp/mp -DLISP -DLISPDIR=\"@LISPDIR@\" -D_BSD_SOURCE
lisp_lsp_LDADD = -L. -llisp -lre -lmp -lm
lisp_lsp_SOURCES = hash.c lisp/lsp.c $(am__append_6) $(am__append_7)
lisp_lsp_SOURCES = hash.c lisp/lsp.c $(am__append_4) $(am__append_5)
# re/tests
lisp_re_tests_DEPENDENCIES = libre.a
lisp_re_tests_CFLAGS = -I$(top_srcdir)/lisp/re -D_BSD_SOURCE
lisp_re_tests_CFLAGS = $(CWARNFLAGS) -I$(top_srcdir)/lisp/re -D_BSD_SOURCE
lisp_re_tests_LDADD = -L. -lre
lisp_re_tests_SOURCES = lisp/re/tests.c
# App default files (*.ad)
APPDEFAULTFILES = \
# App default files
DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
appdefault_DATA = \
app-defaults/Xedit-color \
app-defaults/Xedit
SUFFIXES = .ad .$(APP_MAN_SUFFIX) .man
appdefault_DATA = $(APPDEFAULTFILES)
CLEANFILES = $(APPDEFAULTFILES) app-defaults/Xedit.ad $(appman_DATA)
lispdir = $(LISPDIR)
dist_lisp_DATA = ${srcdir}/lisp/modules/lisp.lsp \
${srcdir}/lisp/modules/xedit.lsp \
@ -407,56 +400,39 @@ dist_progmodes_DATA = \
${srcdir}/lisp/modules/progmodes/xrdb.lsp
appman_PRE = xedit.man
EXTRA_DIST = app-defaults/Xedit-color.ad app-defaults/Xedit-xprint.ad \
app-defaults/Xedit-noxprint.ad app-defaults/Xedit-sample \
lisp/README lisp/TODO lisp/compile.c lisp/env.c lisp/mathimp.c \
lisp/modules/psql.c lisp/modules/x11.c lisp/modules/xaw.c \
lisp/modules/xt.c lisp/re/README lisp/re/tests.txt \
lisp/test/hello.lsp lisp/test/list.lsp lisp/test/math.lsp \
lisp/test/psql-1.lsp lisp/test/psql-2.lsp lisp/test/psql-3.lsp \
lisp/test/regex.lsp lisp/test/stream.lsp lisp/test/widgets.lsp \
$(appman_PRE) ChangeLog
EXTRA_DIST = app-defaults/Xedit-color app-defaults/Xedit \
app-defaults/Xedit-sample lisp/README lisp/TODO lisp/compile.c \
lisp/env.c lisp/mathimp.c lisp/modules/psql.c \
lisp/modules/x11.c lisp/modules/xaw.c lisp/modules/xt.c \
lisp/re/README lisp/re/tests.txt lisp/test/hello.lsp \
lisp/test/list.lsp lisp/test/math.lsp lisp/test/psql-1.lsp \
lisp/test/psql-2.lsp lisp/test/psql-3.lsp lisp/test/regex.lsp \
lisp/test/stream.lsp lisp/test/widgets.lsp $(appman_PRE)
appmandir = $(APP_MAN_DIR)
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
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'
MAINTAINERCLEANFILES = ChangeLog
MAINTAINERCLEANFILES = ChangeLog INSTALL
CLEANFILES = $(appman_DATA)
SUFFIXES = .$(APP_MAN_SUFFIX) .man
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
.SUFFIXES:
.SUFFIXES: .ad .$(APP_MAN_SUFFIX) .man .c .o .obj
.SUFFIXES: .$(APP_MAN_SUFFIX) .man .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 \
@ -593,8 +569,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xedit-ispell.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xedit-lisp.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xedit-options.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xedit-print.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xedit-printdialog.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xedit-realpath.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xedit-strcasecmp.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xedit-tags.Po@am__quote@
@ -1216,34 +1190,6 @@ xedit-strcasecmp.obj: strcasecmp.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='strcasecmp.c' object='xedit-strcasecmp.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) $(xedit_CFLAGS) $(CFLAGS) -c -o xedit-strcasecmp.obj `if test -f 'strcasecmp.c'; then $(CYGPATH_W) 'strcasecmp.c'; else $(CYGPATH_W) '$(srcdir)/strcasecmp.c'; fi`
xedit-print.o: print.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xedit_CFLAGS) $(CFLAGS) -MT xedit-print.o -MD -MP -MF "$(DEPDIR)/xedit-print.Tpo" -c -o xedit-print.o `test -f 'print.c' || echo '$(srcdir)/'`print.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xedit-print.Tpo" "$(DEPDIR)/xedit-print.Po"; else rm -f "$(DEPDIR)/xedit-print.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='print.c' object='xedit-print.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) $(xedit_CFLAGS) $(CFLAGS) -c -o xedit-print.o `test -f 'print.c' || echo '$(srcdir)/'`print.c
xedit-print.obj: print.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xedit_CFLAGS) $(CFLAGS) -MT xedit-print.obj -MD -MP -MF "$(DEPDIR)/xedit-print.Tpo" -c -o xedit-print.obj `if test -f 'print.c'; then $(CYGPATH_W) 'print.c'; else $(CYGPATH_W) '$(srcdir)/print.c'; fi`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xedit-print.Tpo" "$(DEPDIR)/xedit-print.Po"; else rm -f "$(DEPDIR)/xedit-print.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='print.c' object='xedit-print.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) $(xedit_CFLAGS) $(CFLAGS) -c -o xedit-print.obj `if test -f 'print.c'; then $(CYGPATH_W) 'print.c'; else $(CYGPATH_W) '$(srcdir)/print.c'; fi`
xedit-printdialog.o: printdialog.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xedit_CFLAGS) $(CFLAGS) -MT xedit-printdialog.o -MD -MP -MF "$(DEPDIR)/xedit-printdialog.Tpo" -c -o xedit-printdialog.o `test -f 'printdialog.c' || echo '$(srcdir)/'`printdialog.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xedit-printdialog.Tpo" "$(DEPDIR)/xedit-printdialog.Po"; else rm -f "$(DEPDIR)/xedit-printdialog.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='printdialog.c' object='xedit-printdialog.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) $(xedit_CFLAGS) $(CFLAGS) -c -o xedit-printdialog.o `test -f 'printdialog.c' || echo '$(srcdir)/'`printdialog.c
xedit-printdialog.obj: printdialog.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xedit_CFLAGS) $(CFLAGS) -MT xedit-printdialog.obj -MD -MP -MF "$(DEPDIR)/xedit-printdialog.Tpo" -c -o xedit-printdialog.obj `if test -f 'printdialog.c'; then $(CYGPATH_W) 'printdialog.c'; else $(CYGPATH_W) '$(srcdir)/printdialog.c'; fi`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xedit-printdialog.Tpo" "$(DEPDIR)/xedit-printdialog.Po"; else rm -f "$(DEPDIR)/xedit-printdialog.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='printdialog.c' object='xedit-printdialog.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) $(xedit_CFLAGS) $(CFLAGS) -c -o xedit-printdialog.obj `if test -f 'printdialog.c'; then $(CYGPATH_W) 'printdialog.c'; else $(CYGPATH_W) '$(srcdir)/printdialog.c'; fi`
uninstall-info-am:
install-appdefaultDATA: $(appdefault_DATA)
@$(NORMAL_INSTALL)
@ -1602,26 +1548,19 @@ uninstall-am: uninstall-appdefaultDATA uninstall-appmanDATA \
uninstall-dist_progmodesDATA uninstall-info-am
@USE_XPRINT_TRUE@app-defaults/Xedit.ad:
@USE_XPRINT_TRUE@ test -d app-defaults || mkdir -p app-defaults
@USE_XPRINT_TRUE@ cp $(top_srcdir)/app-defaults/Xedit-xprint.ad app-defaults/Xedit.ad
@USE_XPRINT_FALSE@app-defaults/Xedit.ad:
@USE_XPRINT_FALSE@ test -d app-defaults || mkdir -p app-defaults
@USE_XPRINT_FALSE@ cp $(top_srcdir)/app-defaults/Xedit-noxprint.ad app-defaults/Xedit.ad
.ad:
test -d app-defaults || mkdir -p app-defaults
cp $< $@
# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
.PHONY: ChangeLog
.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
# 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:

322
app/xedit/aclocal.m4 vendored
View File

@ -1025,7 +1025,7 @@ AC_SUBST([am__untar])
dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure.
dnl
dnl Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved.
dnl Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
dnl
dnl Permission is hereby granted, free of charge, to any person obtaining a
dnl copy of this software and associated documentation files (the "Software"),
@ -1062,7 +1062,7 @@ dnl DEALINGS IN THE SOFTWARE.
# See the "minimum version" comment for each macro you use to see what
# version you require.
m4_defun([XORG_MACROS_VERSION],[
m4_define([vers_have], [1.7.0])
m4_define([vers_have], [1.11.0])
m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
m4_if(m4_cmp(maj_have, maj_needed), 0,,
@ -1130,9 +1130,12 @@ AC_SUBST(RAWCPPFLAGS)
# on this OS - replaces *ManSuffix settings in old Imake *.cf per-os files.
# Not sure if there's any better way than just hardcoding by OS name.
# Override default settings by setting environment variables
# Added MAN_SUBSTS in version 1.8
# Added AC_PROG_SED in version 1.8
AC_DEFUN([XORG_MANPAGE_SECTIONS],[
AC_REQUIRE([AC_CANONICAL_HOST])
AC_REQUIRE([AC_PROG_SED])
if test x$APP_MAN_SUFFIX = x ; then
APP_MAN_SUFFIX=1
@ -1201,31 +1204,58 @@ AC_SUBST([FILE_MAN_DIR])
AC_SUBST([MISC_MAN_DIR])
AC_SUBST([DRIVER_MAN_DIR])
AC_SUBST([ADMIN_MAN_DIR])
XORG_MAN_PAGE="X Version 11"
AC_SUBST([XORG_MAN_PAGE])
MAN_SUBSTS="\
-e 's|__vendorversion__|\"\$(PACKAGE_STRING)\" \"\$(XORG_MAN_PAGE)\"|' \
-e 's|__xorgversion__|\"\$(PACKAGE_STRING)\" \"\$(XORG_MAN_PAGE)\"|' \
-e 's|__xservername__|Xorg|g' \
-e 's|__xconfigfile__|xorg.conf|g' \
-e 's|__projectroot__|\$(prefix)|g' \
-e 's|__apploaddir__|\$(appdefaultdir)|g' \
-e 's|__appmansuffix__|\$(APP_MAN_SUFFIX)|g' \
-e 's|__drivermansuffix__|\$(DRIVER_MAN_SUFFIX)|g' \
-e 's|__adminmansuffix__|\$(ADMIN_MAN_SUFFIX)|g' \
-e 's|__libmansuffix__|\$(LIB_MAN_SUFFIX)|g' \
-e 's|__miscmansuffix__|\$(MISC_MAN_SUFFIX)|g' \
-e 's|__filemansuffix__|\$(FILE_MAN_SUFFIX)|g'"
AC_SUBST([MAN_SUBSTS])
]) # XORG_MANPAGE_SECTIONS
# XORG_CHECK_SGML_DOCTOOLS
# XORG_CHECK_SGML_DOCTOOLS([MIN-VERSION])
# ------------------------
# Minimum version: 1.7.0
#
# Defines the variable XORG_SGML_PATH containing the location of X11/defs.ent
# provided by xorg-sgml-doctools, if installed.
AC_DEFUN([XORG_CHECK_SGML_DOCTOOLS],[
AC_MSG_CHECKING([for X.Org SGML entities])
AC_MSG_CHECKING([for X.Org SGML entities m4_ifval([$1],[>= $1])])
XORG_SGML_PATH=
PKG_CHECK_EXISTS([xorg-sgml-doctools],
PKG_CHECK_EXISTS([xorg-sgml-doctools m4_ifval([$1],[>= $1])],
[XORG_SGML_PATH=`$PKG_CONFIG --variable=sgmlrootdir xorg-sgml-doctools`],
[if test x"$cross_compiling" != x"yes" ; then
AC_CHECK_FILE([$prefix/share/sgml/X11/defs.ent],
[XORG_SGML_PATH=$prefix/share/sgml])
fi])
[m4_ifval([$1],[:],
[if test x"$cross_compiling" != x"yes" ; then
AC_CHECK_FILE([$prefix/share/sgml/X11/defs.ent],
[XORG_SGML_PATH=$prefix/share/sgml])
fi])
])
# Define variables STYLESHEET_SRCDIR and XSL_STYLESHEET containing
# the path and the name of the doc stylesheet
if test "x$XORG_SGML_PATH" != "x" ; then
AC_MSG_RESULT([$XORG_SGML_PATH])
STYLESHEET_SRCDIR=$XORG_SGML_PATH/X11
XSL_STYLESHEET=$STYLESHEET_SRCDIR/xorg.xsl
else
AC_MSG_RESULT([no])
fi
AC_SUBST(XORG_SGML_PATH)
AC_SUBST(STYLESHEET_SRCDIR)
AC_SUBST(XSL_STYLESHEET)
AM_CONDITIONAL([HAVE_STYLESHEETS], [test "x$XSL_STYLESHEET" != "x"])
]) # XORG_CHECK_SGML_DOCTOOLS
# XORG_CHECK_LINUXDOC
@ -1238,9 +1268,9 @@ AC_SUBST(XORG_SGML_PATH)
# with the AM_CONDITIONAL "BUILD_LINUXDOC"
AC_DEFUN([XORG_CHECK_LINUXDOC],[
AC_REQUIRE([XORG_CHECK_SGML_DOCTOOLS])
AC_REQUIRE([XORG_WITH_PS2PDF])
AC_PATH_PROG(LINUXDOC, linuxdoc)
AC_PATH_PROG(PS2PDF, ps2pdf)
AC_MSG_CHECKING([whether to build documentation])
@ -1256,7 +1286,7 @@ AC_MSG_RESULT([$BUILDDOC])
AC_MSG_CHECKING([whether to build pdf documentation])
if test x$PS2PDF != x && test x$BUILD_PDFDOC != xno; then
if test x$have_ps2pdf != xno && test x$BUILD_PDFDOC != xno; then
BUILDPDFDOC=yes
else
BUILDPDFDOC=no
@ -1266,7 +1296,7 @@ AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes])
AC_MSG_RESULT([$BUILDPDFDOC])
MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH GROFF_NO_SGR=y $LINUXDOC -B txt"
MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH GROFF_NO_SGR=y $LINUXDOC -B txt -f"
MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B latex --papersize=letter --output=ps"
MAKE_PDF="$PS2PDF"
MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B html --split=0"
@ -1341,15 +1371,17 @@ AC_SUBST(MAKE_PDF)
AC_SUBST(MAKE_HTML)
]) # XORG_CHECK_DOCBOOK
# XORG_WITH_XMLTO([MIN-VERSION])
# XORG_WITH_XMLTO([MIN-VERSION], [DEFAULT])
# ----------------
# Minimum version: 1.5.0
# Minimum version for optional DEFAULT argument: 1.11.0
#
# Documentation tools are not always available on all platforms and sometimes
# not at the appropriate level. This macro enables a module to test for the
# presence of the tool and obtain it's path in separate variables. Coupled with
# the --with-xmlto option, it allows maximum flexibilty in making decisions
# as whether or not to use the xmlto package.
# as whether or not to use the xmlto package. When DEFAULT is not specified,
# --with-xmlto assumes 'auto'.
#
# Interface to module:
# HAVE_XMLTO: used in makefiles to conditionally generate documentation
@ -1358,14 +1390,20 @@ AC_SUBST(MAKE_HTML)
# --with-xmlto: 'yes' user instructs the module to use xmlto
# 'no' user instructs the module not to use xmlto
#
# Added in version 1.10.0
# HAVE_XMLTO_TEXT: used in makefiles to conditionally generate text documentation
# xmlto for text output requires either lynx, links, or w3m browsers
#
# If the user sets the value of XMLTO, AC_PATH_PROG skips testing the path.
#
AC_DEFUN([XORG_WITH_XMLTO],[
AC_ARG_VAR([XMLTO], [Path to xmlto command])
m4_define([_defopt], m4_default([$2], [auto]))
AC_ARG_WITH(xmlto,
AS_HELP_STRING([--with-xmlto],
[Use xmlto to regenerate documentation (default: yes, if installed)]),
[use_xmlto=$withval], [use_xmlto=auto])
[Use xmlto to regenerate documentation (default: ]_defopt[)]),
[use_xmlto=$withval], [use_xmlto=]_defopt)
m4_undefine([_defopt])
if test "x$use_xmlto" = x"auto"; then
AC_PATH_PROG([XMLTO], [xmlto])
@ -1389,6 +1427,8 @@ elif test "x$use_xmlto" = x"no" ; then
else
AC_MSG_ERROR([--with-xmlto expects 'yes' or 'no'])
fi
# Test for a minimum version of xmlto, if provided.
m4_ifval([$1],
[if test "$have_xmlto" = yes; then
# scrape the xmlto version
@ -1403,18 +1443,31 @@ m4_ifval([$1],
AC_MSG_ERROR([xmlto version $xmlto_version found, but $1 needed])
fi])
fi])
# Test for the ability of xmlto to generate a text target
have_xmlto_text=no
cat > conftest.xml << "EOF"
EOF
AS_IF([test "$have_xmlto" = yes],
[AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1],
[have_xmlto_text=yes],
[AC_MSG_WARN([xmlto cannot generate text format, this format skipped])])])
rm -f conftest.xml
AM_CONDITIONAL([HAVE_XMLTO_TEXT], [test $have_xmlto_text = yes])
AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes])
]) # XORG_WITH_XMLTO
# XORG_WITH_ASCIIDOC([MIN-VERSION])
# XORG_WITH_ASCIIDOC([MIN-VERSION], [DEFAULT])
# ----------------
# Minimum version: 1.5.0
# Minimum version for optional DEFAULT argument: 1.11.0
#
# Documentation tools are not always available on all platforms and sometimes
# not at the appropriate level. This macro enables a module to test for the
# presence of the tool and obtain it's path in separate variables. Coupled with
# the --with-asciidoc option, it allows maximum flexibilty in making decisions
# as whether or not to use the asciidoc package.
# as whether or not to use the asciidoc package. When DEFAULT is not specified,
# --with-asciidoc assumes 'auto'.
#
# Interface to module:
# HAVE_ASCIIDOC: used in makefiles to conditionally generate documentation
@ -1427,10 +1480,12 @@ AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes])
#
AC_DEFUN([XORG_WITH_ASCIIDOC],[
AC_ARG_VAR([ASCIIDOC], [Path to asciidoc command])
m4_define([_defopt], m4_default([$2], [auto]))
AC_ARG_WITH(asciidoc,
AS_HELP_STRING([--with-asciidoc],
[Use asciidoc to regenerate documentation (default: yes, if installed)]),
[use_asciidoc=$withval], [use_asciidoc=auto])
[Use asciidoc to regenerate documentation (default: ]_defopt[)]),
[use_asciidoc=$withval], [use_asciidoc=]_defopt)
m4_undefine([_defopt])
if test "x$use_asciidoc" = x"auto"; then
AC_PATH_PROG([ASCIIDOC], [asciidoc])
@ -1471,15 +1526,17 @@ fi])
AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes])
]) # XORG_WITH_ASCIIDOC
# XORG_WITH_DOXYGEN([MIN-VERSION])
# XORG_WITH_DOXYGEN([MIN-VERSION], [DEFAULT])
# --------------------------------
# Minimum version: 1.5.0
# Minimum version for optional DEFAULT argument: 1.11.0
#
# Documentation tools are not always available on all platforms and sometimes
# not at the appropriate level. This macro enables a module to test for the
# presence of the tool and obtain it's path in separate variables. Coupled with
# the --with-doxygen option, it allows maximum flexibilty in making decisions
# as whether or not to use the doxygen package.
# as whether or not to use the doxygen package. When DEFAULT is not specified,
# --with-doxygen assumes 'auto'.
#
# Interface to module:
# HAVE_DOXYGEN: used in makefiles to conditionally generate documentation
@ -1492,10 +1549,12 @@ AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes])
#
AC_DEFUN([XORG_WITH_DOXYGEN],[
AC_ARG_VAR([DOXYGEN], [Path to doxygen command])
m4_define([_defopt], m4_default([$2], [auto]))
AC_ARG_WITH(doxygen,
AS_HELP_STRING([--with-doxygen],
[Use doxygen to regenerate documentation (default: yes, if installed)]),
[use_doxygen=$withval], [use_doxygen=auto])
[Use doxygen to regenerate documentation (default: ]_defopt[)]),
[use_doxygen=$withval], [use_doxygen=]_defopt)
m4_undefine([_defopt])
if test "x$use_doxygen" = x"auto"; then
AC_PATH_PROG([DOXYGEN], [doxygen])
@ -1536,15 +1595,17 @@ fi])
AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes])
]) # XORG_WITH_DOXYGEN
# XORG_WITH_GROFF
# XORG_WITH_GROFF([DEFAULT])
# ----------------
# Minimum version: 1.6.0
# Minimum version for optional DEFAULT argument: 1.11.0
#
# Documentation tools are not always available on all platforms and sometimes
# not at the appropriate level. This macro enables a module to test for the
# presence of the tool and obtain it's path in separate variables. Coupled with
# the --with-groff option, it allows maximum flexibilty in making decisions
# as whether or not to use the groff package.
# as whether or not to use the groff package. When DEFAULT is not specified,
# --with-groff assumes 'auto'.
#
# Interface to module:
# HAVE_GROFF: used in makefiles to conditionally generate documentation
@ -1555,6 +1616,12 @@ AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes])
# --with-groff: 'yes' user instructs the module to use groff
# 'no' user instructs the module not to use groff
#
# Added in version 1.9.0:
# HAVE_GROFF_HTML: groff has dependencies to output HTML format:
# pnmcut pnmcrop pnmtopng pnmtops from the netpbm package.
# psselect from the psutils package.
# the ghostcript package. Refer to the grohtml man pages
#
# If the user sets the value of GROFF, AC_PATH_PROG skips testing the path.
#
# OS and distros often splits groff in a basic and full package, the former
@ -1567,10 +1634,12 @@ AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes])
#
AC_DEFUN([XORG_WITH_GROFF],[
AC_ARG_VAR([GROFF], [Path to groff command])
m4_define([_defopt], m4_default([$1], [auto]))
AC_ARG_WITH(groff,
AS_HELP_STRING([--with-groff],
[Use groff to regenerate documentation (default: yes, if installed)]),
[use_groff=$withval], [use_groff=auto])
[Use groff to regenerate documentation (default: ]_defopt[)]),
[use_groff=$withval], [use_groff=]_defopt)
m4_undefine([_defopt])
if test "x$use_groff" = x"auto"; then
AC_PATH_PROG([GROFF], [groff])
@ -1594,6 +1663,7 @@ elif test "x$use_groff" = x"no" ; then
else
AC_MSG_ERROR([--with-groff expects 'yes' or 'no'])
fi
# We have groff, test for the presence of the macro packages
if test "x$have_groff" = x"yes"; then
AC_MSG_CHECKING([for ${GROFF} -ms macros])
@ -1611,20 +1681,38 @@ if test "x$have_groff" = x"yes"; then
fi
AC_MSG_RESULT([$groff_mm_works])
fi
# We have groff, test for HTML dependencies, one command per package
if test "x$have_groff" = x"yes"; then
AC_PATH_PROGS(GS_PATH, [gs gswin32c])
AC_PATH_PROG(PNMTOPNG_PATH, [pnmtopng])
AC_PATH_PROG(PSSELECT_PATH, [psselect])
if test "x$GS_PATH" != "x" -a "x$PNMTOPNG_PATH" != "x" -a "x$PSSELECT_PATH" != "x"; then
have_groff_html=yes
else
have_groff_html=no
AC_MSG_WARN([grohtml dependencies not found - HTML Documentation skipped. Refer to grohtml man pages])
fi
fi
# Set Automake conditionals for Makefiles
AM_CONDITIONAL([HAVE_GROFF], [test "$have_groff" = yes])
AM_CONDITIONAL([HAVE_GROFF_MS], [test "$groff_ms_works" = yes])
AM_CONDITIONAL([HAVE_GROFF_MM], [test "$groff_mm_works" = yes])
AM_CONDITIONAL([HAVE_GROFF_HTML], [test "$have_groff_html" = yes])
]) # XORG_WITH_GROFF
# XORG_WITH_FOP
# XORG_WITH_FOP([DEFAULT])
# ----------------
# Minimum version: 1.6.0
# Minimum version for optional DEFAULT argument: 1.11.0
#
# Documentation tools are not always available on all platforms and sometimes
# not at the appropriate level. This macro enables a module to test for the
# presence of the tool and obtain it's path in separate variables. Coupled with
# the --with-fop option, it allows maximum flexibilty in making decisions
# as whether or not to use the fop package.
# as whether or not to use the fop package. When DEFAULT is not specified,
# --with-fop assumes 'auto'.
#
# Interface to module:
# HAVE_FOP: used in makefiles to conditionally generate documentation
@ -1637,10 +1725,12 @@ AM_CONDITIONAL([HAVE_GROFF_MM], [test "$groff_mm_works" = yes])
#
AC_DEFUN([XORG_WITH_FOP],[
AC_ARG_VAR([FOP], [Path to fop command])
m4_define([_defopt], m4_default([$1], [auto]))
AC_ARG_WITH(fop,
AS_HELP_STRING([--with-fop],
[Use fop to regenerate documentation (default: yes, if installed)]),
[use_fop=$withval], [use_fop=auto])
[Use fop to regenerate documentation (default: ]_defopt[)]),
[use_fop=$withval], [use_fop=]_defopt)
m4_undefine([_defopt])
if test "x$use_fop" = x"auto"; then
AC_PATH_PROG([FOP], [fop])
@ -1667,15 +1757,17 @@ fi
AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = yes])
]) # XORG_WITH_FOP
# XORG_WITH_PS2PDF
# XORG_WITH_PS2PDF([DEFAULT])
# ----------------
# Minimum version: 1.6.0
# Minimum version for optional DEFAULT argument: 1.11.0
#
# Documentation tools are not always available on all platforms and sometimes
# not at the appropriate level. This macro enables a module to test for the
# presence of the tool and obtain it's path in separate variables. Coupled with
# the --with-ps2pdf option, it allows maximum flexibilty in making decisions
# as whether or not to use the ps2pdf package.
# as whether or not to use the ps2pdf package. When DEFAULT is not specified,
# --with-ps2pdf assumes 'auto'.
#
# Interface to module:
# HAVE_PS2PDF: used in makefiles to conditionally generate documentation
@ -1688,10 +1780,12 @@ AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = yes])
#
AC_DEFUN([XORG_WITH_PS2PDF],[
AC_ARG_VAR([PS2PDF], [Path to ps2pdf command])
m4_define([_defopt], m4_default([$1], [auto]))
AC_ARG_WITH(ps2pdf,
AS_HELP_STRING([--with-ps2pdf],
[Use ps2pdf to regenerate documentation (default: yes, if installed)]),
[use_ps2pdf=$withval], [use_ps2pdf=auto])
[Use ps2pdf to regenerate documentation (default: ]_defopt[)]),
[use_ps2pdf=$withval], [use_ps2pdf=]_defopt)
m4_undefine([_defopt])
if test "x$use_ps2pdf" = x"auto"; then
AC_PATH_PROG([PS2PDF], [ps2pdf])
@ -1742,14 +1836,12 @@ AM_CONDITIONAL([HAVE_PS2PDF], [test "$have_ps2pdf" = yes])
# parm1: specify the default value, yes or no.
#
AC_DEFUN([XORG_ENABLE_DOCS],[
default=$1
if test "x$default" = x ; then
default="yes"
fi
m4_define([default], m4_default([$1], [yes]))
AC_ARG_ENABLE(docs,
AS_HELP_STRING([--enable-docs],
[Enable building the documentation (default: yes)]),
[build_docs=$enableval], [build_docs=$default])
[Enable building the documentation (default: ]default[)]),
[build_docs=$enableval], [build_docs=]default)
m4_undefine([default])
AM_CONDITIONAL(ENABLE_DOCS, [test x$build_docs = xyes])
AC_MSG_CHECKING([whether to build documentation])
AC_MSG_RESULT([$build_docs])
@ -1777,14 +1869,12 @@ AC_MSG_RESULT([$build_docs])
# parm1: specify the default value, yes or no.
#
AC_DEFUN([XORG_ENABLE_DEVEL_DOCS],[
devel_default=$1
if test "x$devel_default" = x ; then
devel_default="yes"
fi
m4_define([devel_default], m4_default([$1], [yes]))
AC_ARG_ENABLE(devel-docs,
AS_HELP_STRING([--enable-devel-docs],
[Enable building the developer documentation (default: yes)]),
[build_devel_docs=$enableval], [build_devel_docs=$devel_default])
[Enable building the developer documentation (default: ]devel_default[)]),
[build_devel_docs=$enableval], [build_devel_docs=]devel_default)
m4_undefine([devel_default])
AM_CONDITIONAL(ENABLE_DEVEL_DOCS, [test x$build_devel_docs = xyes])
AC_MSG_CHECKING([whether to build developer documentation])
AC_MSG_RESULT([$build_devel_docs])
@ -1812,14 +1902,12 @@ AC_MSG_RESULT([$build_devel_docs])
# parm1: specify the default value, yes or no.
#
AC_DEFUN([XORG_ENABLE_SPECS],[
spec_default=$1
if test "x$spec_default" = x ; then
spec_default="yes"
fi
m4_define([spec_default], m4_default([$1], [yes]))
AC_ARG_ENABLE(specs,
AS_HELP_STRING([--enable-specs],
[Enable building the specs (default: yes)]),
[build_specs=$enableval], [build_specs=$spec_default])
[Enable building the specs (default: ]spec_default[)]),
[build_specs=$enableval], [build_specs=]spec_default)
m4_undefine([spec_default])
AM_CONDITIONAL(ENABLE_SPECS, [test x$build_specs = xyes])
AC_MSG_CHECKING([whether to build functional specifications])
AC_MSG_RESULT([$build_specs])
@ -1878,38 +1966,69 @@ AC_SUBST([XTMALLOC_ZERO_CFLAGS])
# ----------------
# Minimum version: 1.1.0
#
# Sets up flags for source checkers such as lint and sparse if --with-lint
# is specified. (Use --with-lint=sparse for sparse.)
# Sets $LINT to name of source checker passed with --with-lint (default: lint)
# Sets $LINT_FLAGS to flags to pass to source checker
# Sets LINT automake conditional if enabled (default: disabled)
# This macro enables the use of a tool that flags some suspicious and
# non-portable constructs (likely to be bugs) in C language source code.
# It will attempt to locate the tool and use appropriate options.
# There are various lint type tools on different platforms.
#
# Interface to module:
# LINT: returns the path to the tool found on the platform
# or the value set to LINT on the configure cmd line
# also an Automake conditional
# LINT_FLAGS: an Automake variable with appropriate flags
#
# --with-lint: 'yes' user instructs the module to use lint
# 'no' user instructs the module not to use lint (default)
#
# If the user sets the value of LINT, AC_PATH_PROG skips testing the path.
# If the user sets the value of LINT_FLAGS, they are used verbatim.
#
AC_DEFUN([XORG_WITH_LINT],[
# Allow checking code with lint, sparse, etc.
AC_ARG_VAR([LINT], [Path to a lint-style command])
AC_ARG_VAR([LINT_FLAGS], [Flags for the lint-style command])
AC_ARG_WITH(lint, [AS_HELP_STRING([--with-lint],
[Use a lint-style source code checker (default: disabled)])],
[use_lint=$withval], [use_lint=no])
if test "x$use_lint" = "xyes" ; then
LINT="lint"
# Obtain platform specific info like program name and options
# The lint program on FreeBSD and NetBSD is different from the one on Solaris
case $host_os in
*linux* | *openbsd* | kfreebsd*-gnu | darwin* | cygwin*)
lint_name=splint
lint_options="-badflag"
;;
*freebsd* | *netbsd*)
lint_name=lint
lint_options="-u -b"
;;
*solaris*)
lint_name=lint
lint_options="-u -b -h -erroff=E_INDISTING_FROM_TRUNC2"
;;
esac
# Test for the presence of the program (either guessed by the code or spelled out by the user)
if test "x$use_lint" = x"yes" ; then
AC_PATH_PROG([LINT], [$lint_name])
if test "x$LINT" = "x"; then
AC_MSG_ERROR([--with-lint=yes specified but lint-style tool not found in PATH])
fi
elif test "x$use_lint" = x"no" ; then
if test "x$LINT" != "x"; then
AC_MSG_WARN([ignoring LINT environment variable since --with-lint=no was specified])
fi
else
LINT="$use_lint"
fi
if test "x$LINT_FLAGS" = "x" -a "x$LINT" != "xno" ; then
case $LINT in
lint|*/lint)
case $host_os in
solaris*)
LINT_FLAGS="-u -b -h -erroff=E_INDISTING_FROM_TRUNC2"
;;
esac
;;
esac
AC_MSG_ERROR([--with-lint expects 'yes' or 'no'. Use LINT variable to specify path.])
fi
AC_SUBST(LINT)
AC_SUBST(LINT_FLAGS)
AM_CONDITIONAL(LINT, [test x$LINT != xno])
# User supplied flags override default flags
if test "x$LINT_FLAGS" != "x"; then
lint_options=$LINT_FLAGS
fi
AC_SUBST([LINT_FLAGS],[$lint_options])
AM_CONDITIONAL(LINT, [test "x$LINT" != x])
]) # XORG_WITH_LINT
@ -1919,28 +2038,29 @@ AM_CONDITIONAL(LINT, [test x$LINT != xno])
#
# Sets up flags for building lint libraries for checking programs that call
# functions in the library.
# Disabled by default, enable with --enable-lint-library
# Sets:
# @LINTLIB@ - name of lint library file to make
# MAKE_LINT_LIB - automake conditional
#
# Interface to module:
# LINTLIB - Automake variable with the name of lint library file to make
# MAKE_LINT_LIB - Automake conditional
#
# --enable-lint-library: - 'yes' user instructs the module to created a lint library
# - 'no' user instructs the module not to create a lint library (default)
AC_DEFUN([XORG_LINT_LIBRARY],[
AC_REQUIRE([XORG_WITH_LINT])
# Build lint "library" for more indepth checks of programs calling this library
AC_ARG_ENABLE(lint-library, [AS_HELP_STRING([--enable-lint-library],
[Create lint library (default: disabled)])],
[make_lint_lib=$enableval], [make_lint_lib=no])
if test "x$make_lint_lib" != "xno" ; then
if test "x$LINT" = "xno" ; then
AC_MSG_ERROR([Cannot make lint library without --with-lint])
fi
if test "x$make_lint_lib" = "xyes" ; then
LINTLIB=llib-l$1.ln
else
LINTLIB=$make_lint_lib
fi
if test "x$make_lint_lib" = x"yes" ; then
LINTLIB=llib-l$1.ln
if test "x$LINT" = "x"; then
AC_MSG_ERROR([Cannot make lint library without --with-lint])
fi
elif test "x$make_lint_lib" != x"no" ; then
AC_MSG_ERROR([--enable-lint-library expects 'yes' or 'no'.])
fi
AC_SUBST(LINTLIB)
AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno])
@ -1953,7 +2073,7 @@ AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno])
# Defines CWARNFLAGS to enable C compiler warnings.
#
AC_DEFUN([XORG_CWARNFLAGS], [
AC_REQUIRE([AC_PROG_CC])
AC_REQUIRE([AC_PROG_CC_C99])
if test "x$GCC" = xyes ; then
CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
-Wmissing-declarations -Wnested-externs -fno-strict-aliasing \
@ -1978,7 +2098,7 @@ AC_SUBST(CWARNFLAGS)
#
# Add configure option to enable strict compilation
AC_DEFUN([XORG_STRICT_OPTION], [
AC_REQUIRE([AC_PROG_CC])
# If the module's configure.ac calls AC_PROG_CC later on, CC gets set to C89
AC_REQUIRE([AC_PROG_CC_C99])
AC_REQUIRE([XORG_CWARNFLAGS])
@ -2008,6 +2128,7 @@ AC_SUBST([CWARNFLAGS])
# Defines default options for X.Org modules.
#
AC_DEFUN([XORG_DEFAULT_OPTIONS], [
AC_REQUIRE([AC_PROG_INSTALL])
XORG_CWARNFLAGS
XORG_STRICT_OPTION
XORG_RELEASE_VERSION
@ -2061,22 +2182,9 @@ dnl
# XORG_RELEASE_VERSION
# --------------------
# Adds --with/without-release-string and changes the PACKAGE and
# PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If
# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. Also
# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use.
# Defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use.
AC_DEFUN([XORG_RELEASE_VERSION],[
AC_ARG_WITH(release-version,
AS_HELP_STRING([--with-release-version=STRING],
[Use release version string in package name]),
[RELEASE_VERSION="$withval"],
[RELEASE_VERSION=""])
if test "x$RELEASE_VERSION" != "x"; then
PACKAGE="$PACKAGE-$RELEASE_VERSION"
PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
AC_MSG_NOTICE([Building with package name set to $PACKAGE])
fi
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
[`echo $PACKAGE_VERSION | cut -d . -f 1`],
[Major version of this package])

0
app/xedit/app-defaults/Xedit-noxprint.ad → app/xedit/app-defaults/Xedit
View File

0
app/xedit/app-defaults/Xedit-color.ad → app/xedit/app-defaults/Xedit-color
View File

565
app/xedit/app-defaults/Xedit-xprint.ad
View File

@ -1,565 +0,0 @@
! $XFree86: xc/programs/xedit/Xedit.ad,v 1.23 2002/09/22 07:09:05 paulo Exp $
*geometry: 590x440
*input: TRUE
*enableBackups: True
*backupNameSuffix: ~
*changedBitmap: xlogo11
*international: True
*hints:\
Use Control-S and Control-R to Search.\n\
Use Control-Shift-_ to Undo. Control-G to switch between Undo and Redo.\n\
Use Control-A to jump to the beginning of the line.\n\
Use Control-E to jump to the end of the line.\n\
Use Control-T to transpose characters.\n\
Use Control-K to cut to the end of the line. Control-Y to paste.\n\
Use Control-Q to escape control characters.\n\
Use Control-U[,<number>] to multiply actions. Control-G to cancel.\n\
Use Control-Z to scroll one line up. Meta-Z to scroll one line down.\n\
Use Meta-Q to format a paragraph.\n\
Use Right-Button to extend selections.\n\
Use Meta-I to insert a file.\n\
Use Control-W to delete a selection, and/or jump to the selection mark.\n\
Use Control-X,Control-F to find a file. Tab for filename completion.\n\
Use Control-X,Control-S to save.\n\
Use Control-X,Control-C to exit.\n\
Use Control-C to paste the selection at CUT_BUFFER0.\n\
Use Control Left-Button to popup the File Menu.\n\
Use Control Middle-Button to popup the Edit Menu.\n\
Use Control Right-Button to popup the Option Menu.\n\
Use Control-X,Tab to Indent.\n\
Use Control-X,0 to delete current splitted window.\n\
Use Control-X,1 to delete other splitted window.\n\
Use Control-X,2 to split the window vertically.\n\
Use Control-X,3 to split the window horizontally.\n\
Use Control-X,b to switch to another file.\n\
Use Control-X,d to list directory. Control-G to Cancel.\n\
Use Control-X,k to close file being edited.\n\
Use Control-X,o to switch to another splitted window.\n\
Use Control-X,u to undo. Control-G to switch between Undo and Redo.\n\
Use Insert to toggle Overwrite mode.\n\
Use Control-G to interrupt the lisp subprocess
*formWindow*defaultDistance: 2
*formWindow.?.borderWidth: 0
*formWindow.min: 18
*formWindow.max: 18
*formWindow.showGrip: False
*positionWindow.fromHoriz: labelWindow
*positionWindow.horizDistance: 0
*positionWindow.left: chainRight
*positionWindow.right: chainRight
*positionWindow.width: 90
*positionWindow.label: error
*positionWindow.justify: left
*labelWindow*justify: center
*labelWindow*label: no file yet
*labelWindow.left: chainLeft
*labelWindow.right: chainRight
*quit.label: Quit
*quit.tip: Close xedit window
*save.label: Save
*save.tip: Save current file
*load.label: Load
*load.tip: Load a new file
*print.label: Print
*print.tip: Print current file
*buttons*orientation: horizontal
*buttons*showGrip: False
*buttons.min: 18
*messageWindow.height: 70
*messageWindow.min: 18
*Paned*Text*allowResize: True
*messageWindow.autoFill: False
*messageWindow.scrollVertical: Never
*editWindow.autoFill: False
*editWindow.scrollVertical: Always
*editWindow.showGrip: True
xedit.textSource*enableUndo: True
*bc_label*label: Use Control-S and Control-R to Search.
*bc_label*showGrip: False
*bc_label.min: 18
*dirlabel.showGrip: False
*dirlabel.min: 18
*dirlabel.max: 18
*dirwindow.defaultColumns: 0
*dirwindow.verticalList: True
*viewport.forceBars: True
*viewport.allowVert: 1
*insertFile*text.width: 141
*insertFile*text.?.pieceSize: 256
*search*searchText.width: 157
*search*replaceText.width: 157
*search*case.horizDistance: 25
*search*Text.?.pieceSize: 256
*SimpleMenu.BackingStore: NotUseful
*SimpleMenu.menuLabel.vertSpace: 80
*SimpleMenu.SmeBSB.HorizontalMargins: 16
*SimpleMenu.justify: center
*SimpleMenu.menuLabel.height: 250
*SimpleMenu*cursor: left_ptr
*fileMenu.label: File Menu
*optionsMenu.label: Option Menu
*optionsMenu.ispell.label: ispell...
*editMenu.label: Edit Menu
*editMenu.wrapMenuItem.label: Wrapping
*editMenu.wrapMenuItem.leftBitmap: menu12
*wrapMenu.never.label: Never
*wrapMenu.line.label: Line
*wrapMenu.word.label: Word
*editMenu.autoFill.label: Auto Fill
*editMenu.justifyMenuItem.label: Justification
*editMenu.justifyMenuItem.leftBitmap: menu12
*justifyMenu.left.label: Left
*justifyMenu.right.label: Right
*justifyMenu.center.label: Center
*justifyMenu.full.label: Full
*editMenu.breakColumns.label: Break Columns...
*editMenu.scrollMenuItem.label: Scrollbars
*editMenu.scrollMenuItem.leftBitmap: menu12
*scrollMenu.vertical.label: Vertical
*scrollMenu.horizontal.label: Horizontal
*editMenu.modeMenuItem.leftBitmap: menu12
*editMenu.modeMenuItem.label: Edit Mode
*editModes.none.label: Plain/None
*TransientShell*Text.translations: #override \
c<Key>S: no-op(r)\n\
c<Key>R: no-op(r)\n\
m<Key>I: no-op(r)
*search.translations: #override \
<Create>:get-values(my, $w, width, $h, height)\
set-values(1, minWidth, $w, minHeight, $h, maxHeight, $h, allowShellResize, False)
*insertFile.title: Insert File
*insertFile.translations: #override \
<Create>:get-values(my, $w, width, $h, height)\
set-values(1, minWidth, $w, minHeight, $h, maxHeight, $h, allowShellResize, False)
*baseTranslations: #override \
<Ctrl>X,<Ctrl>C:quit()\n\
<Ctrl>X,<Ctrl>S:save-file()\n\
<Ctrl>X,<Ctrl>P:print-file()\n\
<Ctrl>X,<Ctrl>F:find-file()\n\
<Key>Escape: line-edit()
*messageWindow.Translations: #override \
<Ctrl>X,<Ctrl>C:quit()\n\
<Ctrl>X,<Ctrl>S:save-file()\n\
<Ctrl>X,<Ctrl>P:print-file()\n\
<Ctrl>X,<Ctrl>F:find-file()\n\
<Enter>: no-op()\n\
<Leave>: no-op()\n\
<Btn1Down>: set-keyboard-focus() select-start()
*searchText.Translations: #override \
<Enter>: no-op()\n\
<Leave>: no-op()\n\
<Btn1Down>: set-keyboard-focus() select-start()
*replaceText.Translations: #override \
<Enter>: no-op()\n\
<Leave>: no-op()\n\
<Btn1Down>: set-keyboard-focus() select-start()
*editWindow.translations: #override \
<Ctrl>X,<Ctrl>E:lisp-eval()\n\
<Ctrl>X,<Key>Tab:indent()\n\
<Ctrl>X,:<Key>0:delete-window(current)\n\
<Ctrl>X,:<Key>1:delete-window(other)\n\
<Ctrl>X,:<Key>2:split-window(vertical)\n\
<Ctrl>X,:<Key>3:split-window(horizontal)\n\
<Ctrl>X,!l @Num_Lock<Key>b:switch-source()\n\
<Ctrl>X,!l <Key>b:switch-source()\n\
<Ctrl>X,!@Num_Lock<Key>b:switch-source()\n\
<Ctrl>X,!<Key>b:switch-source()\n\
<Ctrl>X,!l @Num_Lock<Key>d:dir-window()\n\
<Ctrl>X,!l <Key>d:dir-window()\n\
<Ctrl>X,!@Num_Lock<Key>d:dir-window()\n\
<Ctrl>X,!<Key>d:dir-window()\n\
<Ctrl>X,!l @Num_Lock<Key>k:kill-file()\n\
<Ctrl>X,!l <Key>k:kill-file()\n\
<Ctrl>X,!@Num_Lock<Key>k:kill-file()\n\
<Ctrl>X,!<Key>k:kill-file()\n\
<Ctrl>X,!l @Num_Lock<Key>o:other-window()\n\
<Ctrl>X,!l <Key>o:other-window()\n\
<Ctrl>X,!@Num_Lock<Key>o:other-window()\n\
<Ctrl>X,!<Key>o:other-window()\n\
<Ctrl>X,!l @Num_Lock<Key>u:undo()\n\
<Ctrl>X,!l <Key>u:undo()\n\
<Ctrl>X,!@Num_Lock<Key>u:undo()\n\
<Ctrl>X,!<Key>u:undo()\n\
<Ctrl>G: xedit-keyboard-reset()\n\
<Ctrl>J: xedit-print-lisp-eval()\n\
<Key>Tab: insert-char()\n\
!l @Num_Lock<Key>b:insert-char()\n\
!l <Key>b: insert-char()\n\
!@Num_Lock<Key>b:insert-char()\n\
!<Key>b: insert-char()\n\
!l @Num_Lock<Key>d:insert-char()\n\
!l <Key>d: insert-char()\n\
!@Num_Lock<Key>d:insert-char()\n\
!<Key>d: insert-char()\n\
!l <Key>k: insert-char()\n\
!l @Num_Lock<Key>k:insert-char()\n\
!@Num_Lock<Key>k:insert-char()\n\
!<Key>k: insert-char()\n\
!l @Num_Lock<Key>o:insert-char()\n\
!l <Key>o: insert-char()\n\
!@Num_Lock<Key>o:insert-char()\n\
!<Key>o: insert-char()\n\
!l @Num_Lock<Key>u:insert-char()\n\
!l <Key>u: insert-char()\n\
!@Num_Lock<Key>u:insert-char()\n\
!<Key>u: insert-char()\n\
~s <Key>Insert: toggle-overwrite()\n\
c l @Num_Lock<Btn1Down>:xedit-focus() popup-menu(fileMenu)\n\
c @Num_Lock<Btn1Down>:xedit-focus() popup-menu(fileMenu)\n\
c l<Btn1Down>: xedit-focus() popup-menu(fileMenu)\n\
c<Btn1Down>: xedit-focus() popup-menu(fileMenu)\n\
c l @Num_Lock<Btn2Down>:xedit-focus() popup-menu(editMenu)\n\
c @Num_Lock<Btn2Down>:xedit-focus() popup-menu(editMenu)\n\
c l<Btn2Down>: xedit-focus() popup-menu(editMenu)\n\
c<Btn2Down>: xedit-focus() popup-menu(editMenu)\n\
c l @Num_Lock<Btn3Down>:xedit-focus() popup-menu(optionsMenu)\n\
c @Num_Lock<Btn3Down>:xedit-focus() popup-menu(optionsMenu)\n\
c l<Btn3Down>:xedit-focus() popup-menu(optionsMenu)\n\
c<Btn3Down>: xedit-focus() popup-menu(optionsMenu)\n\
<Btn1Down>: xedit-focus() select-start()\n\
<Btn4Down>: scroll-one-line-down()\n\
<Btn5Down>: scroll-one-line-up()
*filename.?.pieceSize: 256
*filename.translations: #override \
c<Key>S: no-op(r)\n\
c<Key>R: no-op(r)\n\
m<Key>I: no-op(r)\n\
c<Key>G: cancel-find-file()\n\
<Key>Return: load-file()\n\
<Key>Tab: file-completion(h)\n\
<Key>Escape: cancel-find-file()\n\
<Enter>: no-op()\n\
<Leave>: no-op()\n\
<Btn1Down>: set-keyboard-focus() select-start()
*ispell.translations: #override \
<Message>WM_PROTOCOLS: ispell(end)
! Sample dictionary, word chars and text mode resources setup
!*ispell.dictionary: br
!*ispell.dictionaries: br american americanmed+ english
!*ispell*br.wordChars: áéíóúçÁÉÍÓÚÇàÀâêôÂÊÔüÜãõÃÕ-
*ispell.ispellCommand: /usr/bin/aspell -B -m
*ispell.lookCommand: /bin/egrep
!*ispell*text.skipLines: .#
*ispell.geometry: 0x0
*ispell.minWidth: 320
*ispell.minHeight: 245
*ispell*Label.borderWidth: 0
*ispell*Label.internalHeight: 4
*ispell*Label.justify: right
*ispell*Label.width: 112
*ispell*Label.left: chainLeft
*ispell*Label.right: chainLeft
*ispell*Label.top: chainTop
*ispell*Label.bottom: chainTop
*ispell*mispelled.label: Misspelled word:
*ispell*mispelled.top: chainTop
*ispell*mispelled.bottom: chainTop
*ispell*mispelled.internalWidth: 0
*ispell*repeated.label: Repeated words:
*ispell*repeated.internalWidth: 0
*ispell*replacement.label: Replace with:
*ispell*word.fromHoriz: mispelled
*ispell*word.justify: left
*ispell*word.borderWidth: 1
*ispell*word.internalWidth: 4
*ispell*word.internalHeight: 3
*ispell*word.width: 194
*ispell*word.left: chainLeft
*ispell*word.right: chainRight
*ispell*word.top: chainTop
*ispell*word.bottom: chainTop
*ispell*word.label:
*ispell*word.tip: Press here to select this text
*ispell*word.highlightThickness: 0
*ispell*text.fromHoriz: replacement
*ispell*replacement.fromVert: mispelled
*ispell*replacement.internalWidth: 0
*ispell*form.text.fromVert: word
*ispell*form.text.width: 194
*ispell*form.text.top: chainTop
*ispell*form.text.bottom: chainTop
*ispell*form.text.left: chainLeft
*ispell*form.text.right: chainRight
*ispell*form.text.leftMargin: 4
*ispell*form.text.?.pieceSize: 256
*ispell*suggestions.label: Suggestions:
*ispell*suggestions.fromVert: replacement
*ispell*suggestions.internalWidth: 0
*ispell*viewport.fromHoriz: suggestions
*ispell*viewport.fromVert: text
*ispell*viewport.width: 194
*ispell*viewport.height: 143
*ispell*viewport.top: chainTop
*ispell*viewport.bottom: chainBottom
*ispell*viewport.left: chainLeft
*ispell*viewport.right: chainRight
*ispell*viewport.forceBars: 1
*ispell*viewport.allowVert: 1
*ispell*list.defaultColumns: 1
*ispell*list.longest: 16384
*ispell*commands.vertDistance: 5
*ispell*commands.fromVert: suggestions
*ispell*commands.top: chainBottom
*ispell*commands.bottom: chainBottom
*ispell*commands.right: chainLeft
*ispell*commands.left: chainLeft
*ispell*check.label: Check
*ispell*check.width: 54
*ispell*check.tip: Ask ispell about the word in the text field
*ispell*look.label: Look
*ispell*look.fromHoriz: check
*ispell*look.horizDistance: 0
*ispell*look.width: 46
*ispell*look.tip: Runs the look command
*ispell*undo.fromVert: check
*ispell*undo.label: Undo
*ispell*undo.width: 102
*ispell*undo.tip: Undo last action
*ispell*replace.fromVert: undo
*ispell*replace.label: Replace
*ispell*replace.tip: Replace occurence of the word
*ispell*replaceAll.fromVert: undo
*ispell*replaceAll.fromHoriz: replace
*ispell*replaceAll.label: All
*ispell*replaceAll.tip: Replace all occurences of the word
*ispell*ignore.fromVert: replace
*ispell*ignore.label: Ignore
*ispell*ignore.tip: Ignore this word
*ispell*ignoreAll.fromVert: replaceAll
*ispell*ignoreAll.fromHoriz: ignore
*ispell*ignoreAll.label: All
*ispell*ignoreAll.tip: Ignore all ocurrences of the word
*ispell*add.fromVert: ignore
*ispell*add.label: Add
*ispell*add.width: 50
*ispell*add.tip: Add word to your private dictionary
*ispell*addUncap.fromVert: ignoreAll
*ispell*addUncap.fromHoriz: add
*ispell*addUncap.label: Uncap
*ispell*addUncap.horizDistance: 0
*ispell*addUncap.width: 50
*ispell*addUncap.tip: Add word uncapitalized, to your private dictionary
*ispell*suspend.fromVert: add
*ispell*suspend.label: Suspend
*ispell*suspend.width: 57
*ispell*suspend.tip: Suspend ispell execution
*ispell*cancel.fromHoriz: suspend
*ispell*cancel.fromVert: addUncap
*ispell*cancel.label: Close
*ispell*cancel.width: 43
*ispell*cancel.horizDistance: 0
*ispell*cancel.tip: Terminates ispell process
*ispell*replace.width: 65
*ispell*ignore.width: 65
*ispell*replaceAll.width: 35
*ispell*replaceAll.horizDistance: 0
*ispell*ignoreAll.width: 35
*ispell*ignoreAll.horizDistance: 0
*ispell*terse.fromVert: cancel
*ispell*terse.Label: Terse Mode
*ispell*terse.width: 104
*ispell*terse.borderWidth: 0
*ispell*terse.tip: Switch terse mode
*ispell*status.fromVert: viewport
*ispell*status.fromHoriz: suggestions
*ispell*status.top: chainBottom
*ispell*status.bottom: chainBottom
*ispell*status.left: chainLeft
*ispell*status.right: chainRight
*ispell*status.width: 194
*ispell*status.borderWidth: 1
*ispell*status.justify: left
*ispell*status.internalHeight: 2
*ispell*status.vertDistance: 2
*ispell*options.fromVert: status
*ispell*options.fromHoriz: commands
*ispell*options.bottom: chainBottom
*ispell*options.top: chainBottom
*ispell*options.left: chainLeft
*ispell*options.right: chainRight
*ispell*options.dict.width: 121
*ispell*options.horizDistance: 2
*ispell*options.vertDistance: 2
*ispell*options.defaultDistance: 2
*ispell*dict.highlightThickness: 0
*ispell*dict.justify: left
*ispell*dict.resizable: False
*ispell*dict.leftBitmap: menu12
*ispell*dict.label: Dictionary
*ispell*dict.tip: Change dictionary
*ispell*options.format.width: 65
*ispell*format.highlightThickness: 0
*ispell*format.justify: left
*ispell*format.resizable: False
*ispell*format.leftBitmap: menu12
*ispell*format.fromHoriz: dict
*ispell*format.horizDistance: 0
*ispell*format.tip: Select text type
*columns.minWidth: 140
*columns.minHeight: 76
*columns.maxWidth: 140
*columns.maxHeight: 76
*columns.form*defaultDistance: 4
*columns*left: chainLeft
*columns*right: chainLeft
*columns*top: chainTop
*columns*bottom: chainTop
*columns*Label.width: 96
*columns*Label.borderWidth: 0
*columns*Label.internalHeight: 4
*columns*Label.internalWidth: 2
*columns*Label.justify: right
*columns*Text.width: 30
*columns*Command.width: 58
*columns*leftLabel.label: Left Column:
*columns*left.fromHoriz: leftLabel
*columns*rightLabel.label: Right Column:
*columns*rightLabel.fromVert: leftLabel
*columns*right.fromHoriz: rightLabel
*columns*right.fromVert: left
*columns*ok.fromVert: rightLabel
*columns*cancel.fromHoriz: ok
*columns*cancel.fromVert: rightLabel
*columns*cancel.horizDistance: 12
*columns*Text.?.pieceSize: 8
*columns*Text.translations: #override \
c<Key>S: no-op(r)\n\
c<Key>R: no-op(r)\n\
m<Key>I: no-op(r)\n\
<Key>Return: set-columns(ok)\n\
<Key>Tab: change-field()\n\
c<Key>G: set-columns(cancel)\n\
<Key>Escape: set-columns(cancel)\n\
<Enter>: no-op()\n\
<Leave>: no-op()\n\
<Btn1Down>: set-keyboard-focus() select-start()
*columns.translations: #override \
<Message>WM_PROTOCOLS: set-columns(cancel)
! Use "white" as background for printing
*printshell*background: white
! Print dialog
*printdialogshell*geometry: 600x120
*printdialogshell*title: Print
*printdialogshell*main*ok.fromVert: innerform
*printdialogshell*main*ok.label: Print
*printdialogshell*main*ok.tip: Print
*printdialogshell*main*setup.fromHoriz: ok
*printdialogshell*main*setup.fromVert: innerform
*printdialogshell*main*setup.label: Setup...
*printdialogshell*main*setup.tip: Configure print job options (page size, orientation, etc.)
*printdialogshell*main*cancel.fromHoriz: setup
*printdialogshell*main*cancel.fromVert: innerform
*printdialogshell*main*cancel.label: Cancel
*printdialogshell*main*cancel.tip: Cancel printing
*printdialogshell*main*desclabel.label: Printer Description:
*printdialogshell*main*desclabel.tip: Short description of printer
*printdialogshell*main*desc.fromHoriz: desclabel
*printdialogshell*main*desc.tip: Short description of printer
*printdialogshell*main*info.fromHoriz: desc
*printdialogshell*main*info.label: Printer info...
*printdialogshell*main*info.tip: Display additional information about this printer
*printdialogshell*main*namelabel.fromVert: desclabel
*printdialogshell*main*namelabel.label: Printer Name:
*printdialogshell*main*namelabel.tip: Name of selected printer
*printdialogshell*main*name.fromHoriz: namelabel
*printdialogshell*main*name.fromVert: desclabel
*printdialogshell*main*name.tip: Name of selected printer
*printdialogshell*main*selectprinter.fromHoriz: name
*printdialogshell*main*selectprinter.fromVert: desclabel
*printdialogshell*main*selectprinter.label: Select Printer...
*printdialogshell*main*selectprinter.label: Select Printer...
*printdialogshell*main*selectprinter.tip: Select a different printer
*printdialogshell*main*filenamelabel.fromVert: namelabel
*printdialogshell*main*filenamelabel.label: File Name:
*printdialogshell*main*filenamelabel.tip: File where the output should be stored
*printdialogshell*main*filename.fromHoriz: filenamelabel
*printdialogshell*main*filename.fromVert: namelabel
*printdialogshell*main*filename.tip: File where the output should be stored
*printdialogshell*main*selectfile.fromHoriz: filename
*printdialogshell*main*selectfile.fromVert: namelabel
*printdialogshell*main*selectfile.label: Select File...
*printdialogshell*main*selectfile.tip: Select file where the output should be stored
*printdialogshell*main*printtoprinter.fromVert: filenamelabel
*printdialogshell*main*printtoprinter.label: Print to Printer
*printdialogshell*main*printtoprinter.tip: Send print job to printer
*printdialogshell*main*printtofile.fromVert: filenamelabel
*printdialogshell*main*printtofile.fromHoriz: printtoprinter
*printdialogshell*main*printtofile.label: Print to File
*printdialogshell*main*printtofile.tip: Save print job in a file
! Print job options dialog
*printdialogshell*setup*geometry: 600x400
*printdialogshell*setup*title: Print: Print job options
*printdialogshell*setup*ok.fromVert: list
*printdialogshell*setup*ok.label: OK
*printdialogshell*setup*ok.tip: Commit changes
*printdialogshell*setup*cancel.fromHoriz: ok
*printdialogshell*setup*cancel.fromVert: list
*printdialogshell*setup*cancel.label: Cancel
*printdialogshell*setup*cancel.tip: Cancel and reset to defaults
*printdialogshell*setup*paperlist.tip: Select paper size
*printdialogshell*setup*resolutionlist.fromHoriz: paperlist
*printdialogshell*setup*resolutionlist.tip: Select page resolution
*printdialogshell*setup*orientationlist.fromHoriz: resolutionlist
*printdialogshell*setup*orientationlist.tip: Select page orientation
*printdialogshell*setup*plexlist.fromHoriz: orientationlist
*printdialogshell*setup*plexlist.tip: Select page plex mode (simplex, duplex, etc.)
*printdialogshell*setup*colorspacelist.fromHoriz: plexlist
*printdialogshell*setup*colorspacelist.tip: Select color space (color, grayscale, CYMK, etc.)
*printdialogshell*setup*jobcopieslabel.fromVert: paperlist
*printdialogshell*setup*jobcopieslabel.tip: Set number of job copies
*printdialogshell*setup*jobcopieslabel.label: Job Copies:
*printdialogshell*setup*jobcopies.fromHoriz: jobcopieslabel
*printdialogshell*setup*jobcopies.fromVert: paperlist
*printdialogshell*setup*jobcopies.tip: Set number of job copies
! Printer selection
*printdialogshell*printerselection*geometry: 400x150
*printdialogshell*printerselection*title: Print: Select printer
*printdialogshell*printerselection*ok.fromVert: list
*printdialogshell*printerselection*ok.label: OK
*printdialogshell*printerselection*ok.tip: Switch printer
*printdialogshell*printerselection*cancel.fromHoriz: ok
*printdialogshell*printerselection*cancel.fromVert: list
*printdialogshell*printerselection*cancel.label: Cancel
*printdialogshell*printerselection*cancel.tip: Cancel printer selection
*printdialogshell*printerselection*list.tip: Select printer name from list
! Select job file
*printdialogshell*selectfile*geometry: 400x80
*printdialogshell*selectfile*title: Print: Select job file
*printdialogshell*selectfile*dialog.label: Select Filename:
! EOF.

118
app/xedit/commands.c
View File

@ -29,10 +29,6 @@
#include <X11/Xfuncs.h>
#include <X11/Xos.h>
#include "xedit.h"
#ifdef INCLUDE_XPRINT_SUPPORT
#include "printdialog.h"
#include "print.h"
#endif /* INCLUDE_XPRINT_SUPPORT */
#ifdef CRAY
#include <unistd.h>
#endif
@ -54,12 +50,6 @@
#define Assertion(expr, msg) { if (!(expr)) { Error msg } }
#define Log(x) { if (True) printf x; }
#ifdef INCLUDE_XPRINT_SUPPORT
static Widget printdialog_shell = NULL;
static Widget printdialog = NULL;
static char printJobNameBuffer[PATH_MAX+256];
#endif /* INCLUDE_XPRINT_SUPPORT */
void ResetSourceChanged(xedit_flist_item*);
static void ResetDC(Widget, XtPointer, XtPointer);
@ -523,110 +513,6 @@ ReallyDoLoad(char *name, char *filename)
return (True);
}
#ifdef INCLUDE_XPRINT_SUPPORT
static void
printshellDestroyXtProc(Widget w, XtPointer client_data, XtPointer callData)
{
XawPrintDialogClosePrinterConnection(printdialog, False);
}
static void
printOKXtProc(Widget w, XtPointer client_data, XtPointer callData)
{
XawPrintDialogCallbackStruct *pdcs = (XawPrintDialogCallbackStruct *)callData;
Cardinal n;
Arg args[2];
Widget textsource;
Log(("printOKXtProc: OK.\n"));
/* Get TextSource object */
n = 0;
XtSetArg(args[n], XtNtextSource, &textsource); n++;
XtGetValues(textwindow, args, n);
Assertion(textsource != NULL, (("printOKXtProc: textsource == NULL.\n")));
/* ||printJobNameBuffer| must live as long the print job prints
* because it is used for the job title AND the page headers... */
sprintf(printJobNameBuffer, "Xedit print job");
DoPrintTextSource("Xedit",
textsource, topwindow,
pdcs->pdpy, pdcs->pcontext, pdcs->colorspace,
printshellDestroyXtProc,
printJobNameBuffer,
pdcs->printToFile?pdcs->printToFileName:NULL);
XtPopdown(printdialog_shell);
}
static void
printCancelXtProc(Widget w, XtPointer client_data, XtPointer callData)
{
Log(("printCancelXtProc: cancel.\n"));
XtPopdown(printdialog_shell);
Log(("destroying print dialog shell...\n"));
XtDestroyWidget(printdialog_shell);
printdialog_shell = NULL;
printdialog = NULL;
Log(("... done\n"));
}
/*ARGSUSED*/
void
PrintFile(Widget w, XEvent *event, String *params, Cardinal *num_params)
{
DoPrint(w, NULL, NULL);
}
/*ARGSUSED*/
void
DoPrint(Widget w, XtPointer client_data, XtPointer call_data)
{
Dimension width, height;
Position x, y;
Widget parent = topwindow;
Log(("print!\n"));
if (!printdialog) {
int n;
Arg args[20];
n = 0;
XtSetArg(args[n], XtNallowShellResize, True); n++;
printdialog_shell = XtCreatePopupShell("printdialogshell",
transientShellWidgetClass,
topwindow, args, n);
n = 0;
printdialog = XtCreateManagedWidget("printdialog", printDialogWidgetClass,
printdialog_shell, args, n);
XtAddCallback(printdialog, XawNOkCallback, printOKXtProc, NULL);
XtAddCallback(printdialog, XawNCancelCallback, printCancelXtProc, NULL);
XtRealizeWidget(printdialog_shell);
}
/* Center dialog */
XtVaGetValues(printdialog_shell,
XtNwidth, &width,
XtNheight, &height,
NULL);
x = (Position)(XWidthOfScreen( XtScreen(parent)) - width) / 2;
y = (Position)(XHeightOfScreen(XtScreen(parent)) - height) / 3;
XtVaSetValues(printdialog_shell,
XtNx, x,
XtNy, y,
NULL);
XtPopup(printdialog_shell, XtGrabNonexclusive);
}
#endif /* INCLUDE_XPRINT_SUPPORT */
/* Function Name: SourceChanged
* Description: A callback routine called when the source has changed.
* Arguments: w - the text source that has changed.
@ -734,6 +620,7 @@ FindFile(Widget w, XEvent *event, String *params, Cardinal *num_params)
XawTextPosition end = XawTextSourceScan(XawTextGetSource(filenamewindow),
0, XawstAll, XawsdRight, 1, True);
slash = NULL;
if (!line_edit) {
string = GetString(filenamewindow);
if (string)
@ -741,7 +628,6 @@ FindFile(Widget w, XEvent *event, String *params, Cardinal *num_params)
}
else {
string = "";
slash = NULL;
line_edit = False;
}
@ -1189,7 +1075,7 @@ DirWindowCB(Widget w, XtPointer user_data, XtPointer call_data)
Feep();
}
else {
(void)ReallyDoLoad(path, path);
(void)ReallyDoLoad(path, ResolveName(path));
SwitchDirWindow(False);
XtSetKeyboardFocus(topwindow, textwindow);
}

30
app/xedit/config.h.in
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
/* Define to 1 if your C compiler doesn't accept -c and -o together. */
#undef NO_MINUS_C_MINUS_O
@ -30,5 +57,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

2157
app/xedit/configure vendored
View File

File diff suppressed because it is too large Load Diff

37
app/xedit/configure.ac
View File

@ -21,29 +21,25 @@ dnl PERFORMANCE OF THIS SOFTWARE.
dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
AC_INIT(xedit,[1.1.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xedit)
AM_INIT_AUTOMAKE([dist-bzip2])
AC_PREREQ([2.60])
AC_INIT([xedit], [1.2.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xedit])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
# 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
AM_CONFIG_HEADER(config.h)
AC_PROG_CC
AM_PROG_CC_C_O
AC_PROG_INSTALL
AC_PROG_RANLIB
PKG_PROG_PKG_CONFIG
AC_ARG_ENABLE(xprint,
AS_HELP_STRING([--enable-xprint],
[Compile with xprint support (default: disabled)]),
[enable_xprint=$enableval], [enable_xprint=no])
AM_CONDITIONAL(USE_XPRINT, test x$enable_xprint = xyes)
if test x$enable_xprint = xyes; then
PKG_CHECK_MODULES(PKGDEPS, xprintutil xp xaw8)
else
PKG_CHECK_MODULES(PKGDEPS, xaw7)
fi
PKG_CHECK_MODULES(PKGDEPS, xaw7 xmu xt x11)
AC_ARG_WITH(lispdir, AS_HELP_STRING([--with-lispdir=PATH],
[Directory to install lisp files (default: $libdir/X11/xedit/lisp)]),
@ -59,14 +55,13 @@ AM_CONDITIONAL(NEED_STRCASECMP, test x$have_strcasecmp = xyes)
AC_CHECK_FUNC(unsetenv, [], [have_unsetenv=yes])
AM_CONDITIONAL(NEED_UNSETENV, test x$have_unsetenv = xyes)
AC_SUBST(PKGDEPS_CFLAGS)
AC_SUBST(PKGDEPS_LIBS)
PKG_CHECK_MODULES(APPDEFS, xt)
appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
xt_appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt`
AC_ARG_WITH(appdefaultdir,
AC_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])

14
app/xedit/lisp/io.c
View File

@ -107,13 +107,15 @@ LispUnget(int ch)
{
LispUngetInfo *unget = lisp__data.unget[lisp__data.iunget];
if (unget->offset == sizeof(unget->buffer)) {
LispWarning("character %c lost at LispUnget()", unget->buffer[0]);
memmove(unget->buffer, unget->buffer + 1, unget->offset - 1);
unget->buffer[unget->offset - 1] = ch;
if ((ch & 0xff) == ch) {
if (unget->offset == sizeof(unget->buffer)) {
LispWarning("character %c lost at LispUnget()", unget->buffer[0]);
memmove(unget->buffer, unget->buffer + 1, unget->offset - 1);
unget->buffer[unget->offset - 1] = ch;
}
else
unget->buffer[unget->offset++] = ch;
}
else
unget->buffer[unget->offset++] = ch;
return (ch);
}

13
app/xedit/lisp/modules/progmodes/auto.lsp
View File

@ -85,19 +85,20 @@
;; allow nesting
(syntoken "[" :nospec t :property *prop-separator* :begin :quoted)
(syntoken "]" :nospec t :property *prop-separator* :switch -1)
(synaugment :shared :variables))
(synaugment :shared :comments :variables))
(syntoken ")" :nospec t :property *prop-macro* :switch -1)
(synaugment :shared :variables :comments))
(synaugment :shared :quotes :variables :comments))
(syntable :shared nil nil
(syntoken "[a-zA-Z0-9_]+\\(" :property *prop-macro* :begin :macro)
;; variable assignment
(syntoken "[a-zA-Z0-9_-]+=" :property *prop-keyword*)
(syntoken "[a-zA-Z0-9_-]+=" :property *prop-keyword*))
(syntable :quotes nil nil
(syntoken "\"" :nospec t :begin :string :contained t)
(syntoken "'" :nospec t :begin :constant :contained t)
(syntoken "`" :nospec t :begin :escape :contained t)
(syntoken "\\\"" :nospec t :begin :quoted-string :contained t)
)
(syntoken "\\\"" :nospec t :begin :quoted-string :contained t))
(syntable :variables nil nil
(syntoken "\\$[a-zA-Z0-9_-]+" :property *prop-variable*)
@ -107,4 +108,4 @@
(syntable :comments nil nil
(syntoken "(#.*|\\<dnl($|\\>.*))" :property *prop-comment*))
(synaugment :shared :variables))
(synaugment :shared :quotes :variables))

435
app/xedit/print.c
View File

@ -1,435 +0,0 @@
/*
* $Xorg: print.c,v 1.1 2004/04/30 02:05:54 gisburn Exp $
*
Copyright 2004 Roland Mainz <roland.mainz@nrubsig.org>
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
documentation.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Except as contained in this notice, the name of The Open Group shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*
*/
/* Turn a NULL pointer string into an empty string */
#define NULLSTR(x) (((x)!=NULL)?(x):(""))
#define Error(x) { printf x ; exit(EXIT_FAILURE); }
#define Assertion(expr, msg) { if (!(expr)) { Error msg } }
#define Log(x) { if(True) printf x; }
#ifdef XEDIT
#include "xedit.h"
#endif /* XEDIT */
#include "print.h"
#include <X11/Xaw/Form.h>
#include <X11/Xaw/Label.h>
#include <X11/Xaw/AsciiText.h>
#include <stdio.h>
#include <stdlib.h>
static Widget
CreatePrintShell(Widget videoshell,
Screen *pscreen,
Visual *pvisual,
String printshell_name,
ArgList args,
Cardinal numargs)
{
String videoname,
videoclass;
Widget pappshell,
printshell;
Display *pdpy = XDisplayOfScreen(pscreen);
int dummyc = 0;
String dummys = "";
Cardinal shell_n;
Arg shell_args[5];
XtGetApplicationNameAndClass(XtDisplay(videoshell),
&videoname, &videoclass);
/* XXX: Why is the |dummyc|&&|dummys| stuff needed here ? */
XtDisplayInitialize(XtWidgetToApplicationContext(videoshell), pdpy,
videoname, videoclass,
NULL, 0,
&dummyc, &dummys);
shell_n = 0;
XtSetArg(shell_args[shell_n], XtNscreen, pscreen); shell_n++;
if (pvisual) {
XtSetArg(shell_args[shell_n], XtNvisual, pvisual); shell_n++;
}
pappshell = XtAppCreateShell(videoname, videoclass,
applicationShellWidgetClass,
pdpy,
shell_args, shell_n);
printshell = XtCreatePopupShell(printshell_name,
xawPrintShellWidgetClass,
pappshell, args, numargs);
/* we're mapping/unmapping at start/end page time */
XtSetMappedWhenManaged(printshell, False);
/* We realise the widget when we're done with building the widget tree... */
return printshell;
}
typedef struct
{
const char *programname;
Widget toplevel;
Bool isPrinting;
Widget printshell;
struct
{
Widget form;
Widget pageheaderlabel;
Widget text;
} content; /* content to print */
int numpages;
Display *pdpy;
Screen *pscreen;
XPContext pcontext;
XtCallbackProc pdpyDestroyCallback;
void *printtofile_handle;
const char *jobtitle;
} AppPrintData;
static AppPrintData apdx;
static AppPrintData *apd = &apdx;
/* Count pages in a text widget
* WARNING: This will reset the current position of the text widget
* back to the beginning */
static
long CountPages(Widget textWidget)
{
long numpages = 0;
XawTextPosition prevpagepos = -1,
currpos = 0;
/* Move to the top of the file... */
XtCallActionProc(textWidget, "beginning-of-file", NULL, NULL, 0);
/* ... count pages ...*/
do
{
prevpagepos = XawTextTopPosition(textWidget);
XtCallActionProc(textWidget, "next-page", NULL, NULL, 0);
currpos = XawTextTopPosition(textWidget);
numpages++;
} while(prevpagepos != currpos);
/* ... and move to the top of the file... */
XtCallActionProc(textWidget, "beginning-of-file", NULL, NULL, 0);
Log(("CountPages() found %ld pages.\n", numpages))
return numpages;
}
static void
PageSetupCB(Widget widget, XtPointer client_data, XtPointer call_data)
{
Widget pshell = widget;
XawPrintShellCallbackStruct *psp = (XawPrintShellCallbackStruct *)call_data;
AppPrintData *p = (AppPrintData *)client_data;
Log(("--> PageSetupCB\n"));
if (!psp->last_page_in_job) {
int currpage;
char buffer[256];
XtVaGetValues(pshell, XawNcurrPageNumInJob, &currpage, NULL);
sprintf(buffer, "Title: %s / Page: %d/%d", p->jobtitle, currpage, p->numpages);
XtVaSetValues(apd->content.pageheaderlabel, XtNlabel, buffer, NULL);
/* Note: XawPrintShell's pagecount starts with '1'
* (=first page is page no. '1') */
if (currpage > 1) {
Log(("pagedown %d\n", currpage));
XtCallActionProc(p->content.text, "next-page", NULL, NULL, 0);
}
else
{
Log(("first page\n"));
}
if (currpage >= p->numpages) {
psp->last_page_in_job = True;
}
}
}
static
void FinishPrinting(AppPrintData *p)
{
char *scr;
if (p->printtofile_handle) {
if (XpuWaitForPrintFileChild(p->printtofile_handle) != XPGetDocFinished) {
PrintMsg(("Error while printing to file.\n"));
}
p->printtofile_handle = NULL;
}
/* Job completed, check if there are any messages from the spooler command */
scr = XpGetOneAttribute(p->pdpy, p->pcontext, XPJobAttr, "xp-spooler-command-results");
if( scr )
{
if( strlen(scr) > 0 )
{
const char *msg = XpuCompoundTextToXmb(p->pdpy, scr);
if( msg )
{
PrintMsg(("Spooler command returned:\n%s", msg));
XpuFreeXmbString(msg);
}
else
{
PrintMsg(("Spooler command returned (unconverted):\n%s", scr));
}
}
XFree((void *)scr);
}
if (p->printshell) {
XtDestroyWidget(p->printshell);
p->printshell = NULL;
}
/* Two issues here:
* 1. The print display connection is owned by the print dialog
* To avoid any problems with that use a callback back to the main
* application which calls
* |XawPrintDialogClosePrinterConnection(w, False)| to ask the
* print dialog widget to close all print display resources and
* disown the object.
* 2. We have to use XpDestroyContext() and XtCloseDisplay()
* instead of XpuClosePrinterDisplay() to make libXt happy...
*
* Call callback... */
(*apd->pdpyDestroyCallback)(NULL, NULL, NULL); /* HACK! */
/* ... and then get rid of the display */
if (p->pcontext != None) {
XpDestroyContext(p->pdpy, p->pcontext);
}
XtCloseDisplay(p->pdpy);
p->toplevel = NULL;
p->isPrinting = False;
p->pdpy = NULL;
p->pscreen = NULL;
p->pcontext = None;
}
static
void PrintEndJobCB(Widget pshell, XtPointer client_data, XtPointer call_data)
{
AppPrintData *p = (AppPrintData *)client_data;
Log(("--> PrintEndJobCB\n"));
/* Finish printing and destroy print shell (it's legal to destroy Xt
* widgets from within it's own callbacks) */
FinishPrinting(p);
}
static
XFontSet GetPrintTextFontSet(const char *appname, Display *pdpy, long dpi_x, long dpi_y)
{
XFontSet fontset;
char fontname[1024];
char **missing_charset_list_return;
int missing_charset_count_return;
char *def_string_return;
int i;
sprintf(fontname, /* Default font for CDE */
"-dt-interface user-medium-r-normal-s*-*-120-%ld-%ld-*-*,"
/* Default font */
"-adobe-courier-medium-r-normal--*-120-%ld-%ld-*-*,"
/* Default font for Linux/Japanese locales (ja_JP.SJIS) */
"-watanabe-mincho-medium-r-normal--*-120-%ld-%ld-*-*,"
"-wadalab-gothic-medium-r-normal--*-120-%ld-%ld-*-*,"
/* Fallback */
"-*-*-*-*-*--*-120-%ld-%ld-*-*",
dpi_x, dpi_y,
dpi_x, dpi_y,
dpi_x, dpi_y,
dpi_x, dpi_y,
dpi_x, dpi_y);
fontset = XCreateFontSet(pdpy, fontname,
&missing_charset_list_return,
&missing_charset_count_return,
&def_string_return);
for( i=0 ; i < missing_charset_count_return ; i++ ) {
fprintf(stderr, "%s: warning: font for charset %s is lacking.\n",
appname, missing_charset_list_return[i]);
}
if (!fontset)
Error(("GetPrintTextFontSet: XCreateFontSet() failure.\n"));
return fontset;
}
void DoPrintTextSource(const char *programname,
Widget textsource, Widget toplevel,
Display *pdpy, XPContext pcontext,
XpuColorspaceRec *colorspace,
XtCallbackProc pdpyDestroyCB,
const char *jobtitle, const char *toFile)
{
long dpi_x = 0L,
dpi_y = 0L;
int n;
Arg args[20];
XFontSet textfontset = NULL;
XFontSetExtents *font_extents;
apd->programname = programname;
apd->pdpyDestroyCallback = pdpyDestroyCB;
if (apd->isPrinting) {
PrintMsg(("Already busy with printing.\n"));
return;
}
/* Configure the print context (paper size, title etc.)
* We must do this before creating any Xt widgets - otherwise they will
* make wrong assuptions about fonts, resultions etc. ...
*/
XpuSetJobTitle(pdpy, pcontext, jobtitle);
/* Configuration done, set the context */
XpSetContext(pdpy, pcontext);
/* Get default printer resolution */
if (XpuGetResolution(pdpy, pcontext, &dpi_x, &dpi_y) != 1) {
PrintMsg(("No default resolution for printer.\n"));
XpuClosePrinterDisplay(pdpy, pcontext);
return;
}
apd->toplevel = toplevel;
apd->pdpy = pdpy;
apd->pcontext = pcontext;
apd->pscreen = XpGetScreenOfContext(pdpy, pcontext);
apd->jobtitle = jobtitle;
n = 0;
/* Override any geometry resource settings as XawPrintShell adjusts it's size
* to the current page siue when |XawPrintLAYOUTMODE_DRAWABLEAREA| or
* |XawPrintLAYOUTMODE_PAGESIZE| are used. */
XtSetArg(args[n], XtNgeometry, "+0+0"); n++;
XtSetArg(args[n], XawNlayoutMode, XawPrintLAYOUTMODE_DRAWABLEAREA); n++;
if (colorspace) {
printf("Setting visual to id=0x%lx.\n", colorspace->visualinfo.visualid);
}
apd->printshell = CreatePrintShell(toplevel, apd->pscreen,
(colorspace?(colorspace->visualinfo.visual):(NULL)),
"printshell", args, n);
n = 0;
XtSetArg(args[n], XtNresizable, True); n++;
XtSetArg(args[n], XtNright, XtChainRight); n++;
apd->content.form = XtCreateManagedWidget("form", formWidgetClass, apd->printshell, args, n);
textfontset = GetPrintTextFontSet(apd->programname, pdpy, dpi_x, dpi_y);
n = 0;
XtSetArg(args[n], XtNinternational, True); n++;
XtSetArg(args[n], XtNfromHoriz, NULL); n++;
XtSetArg(args[n], XtNfromVert, NULL); n++;
XtSetArg(args[n], XtNtop, XtChainTop); n++;
XtSetArg(args[n], XtNright, XtChainRight); n++;
XtSetArg(args[n], XtNresizable, True); n++;
XtSetArg(args[n], XtNfontSet, textfontset); n++;
XtSetArg(args[n], XtNlabel, "Page: n/n"); n++;
XtSetArg(args[n], XtNjustify, XtJustifyRight); n++;
apd->content.pageheaderlabel = XtCreateManagedWidget("pageinfo", labelWidgetClass, apd->content.form, args, n);
font_extents = XExtentsOfFontSet(textfontset);
n = 0;
XtSetArg(args[n], XtNinternational, True); n++;
XtSetArg(args[n], XtNtextSource, textsource); n++;
XtSetArg(args[n], XtNscrollHorizontal, XawtextScrollNever); n++;
XtSetArg(args[n], XtNscrollVertical, XawtextScrollNever); n++;
/* Usually I would expect that using |XtNfromVert, apd->content.pageheaderlabel|
* would be the correct way to place the text widget with the main content below
* the page header widget - but for an unknown reason this doesn not work: The
* text widget squishes itself into the bottom half of the page and only occupies
* 1/2 of the page's with... ;-(( */
#define WORKAROUND_FOR_SOMETHING_IS_WRONG 1
#ifdef WORKAROUND_FOR_SOMETHING_IS_WRONG
XtSetArg(args[n], XtNtop, XtChainTop); n++;
XtSetArg(args[n], XtNright, XtChainRight); n++;
XtSetArg(args[n], XtNvertDistance, (font_extents->max_logical_extent.height+2)*2); n++;
#else
XtSetArg(args[n], XtNfromHoriz, NULL); n++;
XtSetArg(args[n], XtNfromVert, apd->content.pageheaderlabel); n++;
#endif
XtSetArg(args[n], XtNfontSet, textfontset); n++;
apd->content.text = XtCreateManagedWidget("text", asciiTextWidgetClass, apd->content.form, args, n);
/* Disable the caret - that is not needed for printing */
XawTextDisplayCaret(apd->content.text, False);
XtAddCallback(apd->printshell, XawNpageSetupCallback, PageSetupCB, (XtPointer)apd);
XtAddCallback(apd->printshell, XawNendJobCallback, PrintEndJobCB, (XtPointer)apd);
/* Realise print shell (which will set position+size of the child
* widgets based on the current page size) */
XtRealizeWidget(apd->printshell);
/* Count number of pages in the text widget */
apd->numpages = CountPages(apd->content.text);
/* Make sure that the Xt machinery is really using the right screen (assertion) */
if (XpGetScreenOfContext(XtDisplay(apd->printshell), apd->pcontext) != XtScreen(apd->printshell))
Error(("Widget's screen != print screen. BAD.\n"));
apd->isPrinting = True;
if (toFile) {
PrintMsg(("Printing to file '%s'...\n", toFile));
apd->printtofile_handle = XpuStartJobToFile(pdpy, pcontext, toFile);
if (!apd->printtofile_handle) {
perror("XpuStartJobToFile failure");
PrintMsg(("Printing failed: XpuStartJobToFile\n"));
apd->isPrinting = False;
return;
}
}
else
{
PrintMsg(("Printing to printer...\n"));
XpuStartJobToSpooler(pdpy);
}
}

56
app/xedit/print.h
View File

@ -1,56 +0,0 @@
/*
* $Xorg: print.h,v 1.1 2004/04/30 02:05:54 gisburn Exp $
*
Copyright 2004 Roland Mainz <roland.mainz@nrubsig.org>
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
documentation.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Except as contained in this notice, the name of The Open Group shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*
*/
#ifndef XMORE_PRINT_H
#define XMORE_PRINT_H 1
#include <X11/Intrinsic.h>
#include <X11/StringDefs.h>
#include <X11/Shell.h>
#include <X11/Xaw/Print.h>
#include <X11/Xaw/Cardinals.h>
#include <X11/XprintUtil/xprintutil.h>
#if defined(XMORE)
#define PrintMsg(x) { printf("xmore: "); printf x ; }
#elif defined(XEDIT)
#define PrintMsg(x) { XeditPrintf x ; }
#else
#error unknown application
#endif
/* Prototypes */
void DoPrintTextSource(const char *programname,
Widget textsource,
Widget toplevel,
Display *pdpy, XPContext pcontext,
XpuColorspaceRec *colorspace,
XtCallbackProc printDisplayDestroyCallback,
const char *jobTitle,
const char *toFile);
#endif /* !XMORE_PRINT_H */

1396
app/xedit/printdialog.c
View File

File diff suppressed because it is too large Load Diff

70
app/xedit/printdialog.h
View File

@ -1,70 +0,0 @@
/*
* $Xorg: printdialog.h,v 1.1 2004/04/30 02:05:54 gisburn Exp $
*
Copyright 2004 Roland Mainz <roland.mainz@nrubsig.org>
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
documentation.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Except as contained in this notice, the name of The Open Group shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*
*/
#ifndef XMORE_PRINTDIALOG_H
#define XMORE_PRINTDIALOG_H 1
#include <X11/Intrinsic.h>
#include <X11/StringDefs.h>
#include <X11/Shell.h>
#include <X11/Xaw/Print.h>
#include <X11/Xaw/Cardinals.h>
#include <X11/Xaw/Form.h>
#include <X11/XprintUtil/xprintutil.h>
/* Resources:
NOT WRITTEN YET
*/
#define XtCIcon "Icon"
#define XtNicon "icon"
#define XawNOkCallback "okCallback"
#define XawNCancelCallback "cancelCallback"
typedef struct
{
Display *pdpy;
XPContext pcontext;
const char *printToFileName;
Boolean printToFile;
XpuColorspaceRec *colorspace;
} XawPrintDialogCallbackStruct;
typedef struct _PrintDialogClassRec *PrintDialogWidgetClass;
typedef struct _PrintDialogRec *PrintDialogWidget;
extern WidgetClass printDialogWidgetClass;
_XFUNCPROTOBEGIN
/* Prototypes */
void XawPrintDialogClosePrinterConnection(Widget w, Bool closeDisplay);
_XFUNCPROTOEND
#endif /* !XMORE_PRINTDIALOG_H */

182
app/xedit/printdialogprivates.h
View File

@ -1,182 +0,0 @@
/*
* $Xorg: printdialogprivates.h,v 1.1 2004/05/12 02:05:54 gisburn Exp $
*
Copyright 2004 Roland Mainz <roland.mainz@nrubsig.org>
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
documentation.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Except as contained in this notice, the name of The Open Group shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*
*/
#ifndef _XawPrintDialogP_h
#define _XawPrintDialogP_h 1
#include <X11/IntrinsicP.h>
#include <X11/StringDefs.h>
#include <X11/Xos.h>
#include <X11/Xmu/Misc.h>
#include <X11/CoreP.h>
#include <X11/Xaw/AsciiText.h>
#include <X11/Xaw/Cardinals.h>
#include <X11/Xaw/Command.h>
#include <X11/Xaw/Label.h>
#include <X11/Xaw/DialogP.h>
#include <X11/Xaw/XawInit.h>
#include <X11/Xaw/Dialog.h>
#include <X11/Xaw/FormP.h>
/* From Xaw/Privates.h */
#ifndef XtWidth
#define XtWidth(w) (((RectObj)w)->rectangle.width)
#endif
#ifndef XtHeight
#define XtHeight(w) (((RectObj)w)->rectangle.height)
#endif
typedef struct {
XtPointer extension;
} PrintDialogClassPart;
typedef struct _PrintDialogClassRec {
CoreClassPart core_class;
CompositeClassPart composite_class;
ConstraintClassPart constraint_class;
FormClassPart form_class;
PrintDialogClassPart print_dialog_class;
} PrintDialogClassRec;
extern PrintDialogClassRec printDialogClassRec;
typedef struct _PrintDialogPart {
/* resources */
String label; /* description of the dialog */
String value; /* for the user response */
Pixmap icon; /* icon bitmap */
XtCallbackList ok_callback,
cancel_callback;
/* private */
Widget iconW; /* widget to display the icon */
struct
{
Widget form,
innerform,
desclabel,
desc,
info,
namelabel,
name,
selectprinter,
filenamelabel,
filename,
selectfile,
printtoprinter,
printtofile,
ok,
setup,
cancel;
} main;
Bool printToFile;
char *filename;
Bool canPrint, /* can we print ? */
canReallyPrint; /* is it really save to print ? */
XpuColorspaceRec *selected_colorspace;
struct
{
Widget popup,
form,
list,
ok,
cancel;
} selectPrinter;
struct
{
Widget popup,
form,
paperlist,
resolutionlist,
orientationlist,
plexlist,
colorspacelist,
jobcopieslabel,
jobcopies,
ok,
cancel;
} setup;
struct
{
Widget dialog,
shell;
} selectFile;
XPPrinterList printerlist;
int num_printers;
String *widget_printerlist;
String printer_name;
Display *pdpy;
XPContext pcontext;
XpuMediumSourceSizeList paperlist;
int num_papers;
String *widget_paperlist;
XpuResolutionList resolutionlist;
int num_resolutions;
String *widget_resolutionlist;
XpuOrientationList orientationlist;
int num_orientations;
String *widget_orientationlist;
XpuPlexList plexlist;
int num_plex;
String *widget_plexlist;
XpuColorspaceList colorspacelist;
int num_colorspaces;
String *widget_colorspacelist;
} PrintDialogPart;
typedef struct _PrintDialogRec {
CorePart core;
CompositePart composite;
ConstraintPart constraint;
FormPart form;
PrintDialogPart printdialog;
} PrintDialogRec;
typedef struct {
XtPointer extension;
} PrintDialogConstraintsPart;
typedef struct _PrintDialogConstraintsRec {
FormConstraintsPart form;
PrintDialogConstraintsPart printdialog;
} PrintDialogConstraintsRec, *PrintDialogConstraints;
#endif /* !_XawPrintDialogP_h */

20
app/xedit/tags.c
View File

@ -116,7 +116,7 @@ TagsAction(Widget w, XEvent *event, String *params, Cardinal *num_params)
char buffer[1024];
XawTextPosition position, left, right;
XawTextBlock block;
int length;
int length, bytes;
Widget source;
source = XawTextGetSource(w);
@ -128,14 +128,20 @@ TagsAction(Widget w, XEvent *event, String *params, Cardinal *num_params)
position = XawTextGetInsertionPoint(w);
XawTextGetSelectionPos(w, &left, &right);
if (right > left) {
XawTextSourceRead(source, left, &block, right - left);
length = block.length + 1;
if (length >= sizeof(buffer))
length = sizeof(buffer);
XmuSnprintf(buffer, length, "%s", block.ptr);
length = 0;
do {
bytes = right - left;
left = XawTextSourceRead(source, left, &block, bytes);
if (block.length < bytes)
bytes = block.length;
if (length + bytes + 1 >= sizeof(buffer))
bytes = sizeof(buffer) - length - 1;
XmuSnprintf(buffer + length, bytes + 1, "%s", block.ptr);
length += bytes;
} while (left < right);
item->tags->textwindow = w;
item->tags->position = position;
FindTagFirst(item->tags, buffer, length - 1);
FindTagFirst(item->tags, buffer, length);
}
else
FindTagNext(item->tags, w, position);

46
app/xedit/xedit.c
View File

@ -40,9 +40,6 @@ static XtActionsRec actions[] = {
{"quit", QuitAction},
{"save-file", SaveFile},
{"load-file", LoadFile},
#ifdef INCLUDE_XPRINT_SUPPORT
{"print-file", PrintFile},
#endif /* INCLUDE_XPRINT_SUPPORT */
{"find-file", FindFile},
{"cancel-find-file", CancelFindFile},
{"file-completion", FileCompletion},
@ -118,13 +115,6 @@ static XtResource resources[] = {
#undef Offset
#ifdef INCLUDE_XPRINT_SUPPORT
String fallback_resources[] = {
"*international: True", /* set this globally for ALL widgets to avoid wiered crashes */
NULL
};
#endif
int
main(int argc, char *argv[])
{
@ -133,19 +123,16 @@ main(int argc, char *argv[])
FileAccess file_access;
Widget source;
XtAppContext appcon;
unsigned int i, num_loaded, lineno;
Boolean show_dir;
xedit_flist_item *first_item;
unsigned int i, lineno;
num_loaded = lineno = 0;
lineno = 0;
show_dir = FALSE;
first_item = NULL;
#ifdef INCLUDE_XPRINT_SUPPORT
XtSetLanguageProc(NULL, NULL, NULL);
#endif
topwindow = XtAppInitialize(&appcon, "Xedit", NULL, 0, &argc, argv,
#ifdef INCLUDE_XPRINT_SUPPORT
fallback_resources,
#else
NULL,
#endif
NULL, 0);
XtAppAddActions(appcon, actions, XtNumber(actions));
@ -205,7 +192,7 @@ main(int argc, char *argv[])
char *endptr;
lineno = strtol(argv[i], &endptr, 10);
/* Don't warn or anything about incorrect input? */
/* Don't warn about incorrect input? */
if (*endptr)
lineno = 0;
continue;
@ -218,7 +205,7 @@ main(int argc, char *argv[])
num_args = 0;
if (stat(filename, &st) == 0 && !S_ISREG(st.st_mode)) {
if (S_ISDIR(st.st_mode)) {
if (!num_loaded) {
if (!first_item) {
char path[BUFSIZ + 1];
strncpy(path, filename, sizeof(path) - 2);
@ -233,7 +220,7 @@ main(int argc, char *argv[])
XtSetValues(dirlabel, args, 1);
SwitchDirWindow(True);
DirWindowCB(dirwindow, path, NULL);
++num_loaded;
show_dir = True;
}
continue;
}
@ -283,9 +270,8 @@ main(int argc, char *argv[])
item->mode = st.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO);
item->mtime = st.st_mtime;
}
if (!num_loaded)
SwitchTextSource(item);
++num_loaded;
if (!first_item && !show_dir)
first_item = item;
ResetSourceChanged(item);
}
}
@ -302,11 +288,12 @@ main(int argc, char *argv[])
XtConvertAndStore(flist.popup, XtRString, &from, XtRBitmap, &to);
}
if (num_loaded == 0) {
if (first_item == NULL) {
XtSetKeyboardFocus(topwindow, filenamewindow);
XtVaSetValues(textwindow, XtNwrap, XawtextWrapLine, NULL);
}
else {
SwitchTextSource(first_item);
XtSetKeyboardFocus(topwindow, textwindow);
if (lineno) {
XawTextPosition position;
@ -341,9 +328,6 @@ makeButtonsAndBoxes(Widget parent)
MakeCommandButton(b_row, "quit", DoQuit);
MakeCommandButton(b_row, "save", DoSave);
MakeCommandButton(b_row, "load", DoLoad);
#ifdef INCLUDE_XPRINT_SUPPORT
MakeCommandButton(b_row, "print", DoPrint);
#endif /* INCLUDE_XPRINT_SUPPORT */
filenamewindow = MakeStringBox(b_row, "filename", NULL);
}
hintswindow = XtCreateManagedWidget("bc_label", labelWidgetClass,
@ -389,14 +373,10 @@ makeButtonsAndBoxes(Widget parent)
textwindow = XtCreateManagedWidget(editWindow, asciiTextWidgetClass,
vpanes[0], arglist, num_args);
#ifdef INCLUDE_XPRINT_SUPPORT
international = True;
#else
/* Get international resource value form the textwindow */
num_args = 0;
XtSetArg(arglist[num_args], XtNinternational, &international); ++num_args;
XtGetValues(textwindow, arglist, num_args);
#endif
num_args = 0;
XtSetArg(arglist[num_args], XtNtype, XawAsciiFile); ++num_args;

6
app/xedit/xedit.h
View File

@ -143,16 +143,10 @@ void QuitAction(Widget, XEvent*, String*, Cardinal*);
void DoSave(Widget, XtPointer, XtPointer);
void SaveFile(Widget, XEvent*, String*, Cardinal*);
void DoLoad(Widget, XtPointer, XtPointer);
#ifdef INCLUDE_XPRINT_SUPPORT
void DoPrint(Widget, XtPointer, XtPointer);
#endif /* INCLUDE_XPRINT_SUPPORT */
void CancelFindFile(Widget, XEvent*, String*, Cardinal*);
void FindFile(Widget, XEvent*, String*, Cardinal*);
void LoadFile(Widget, XEvent*, String*, Cardinal*);
Bool LoadFileInTextwindow(char *name, char *resolved_name);
#ifdef INCLUDE_XPRINT_SUPPORT
void PrintFile(Widget, XEvent*, String*, Cardinal*);
#endif /* INCLUDE_XPRINT_SUPPORT */
void FileCompletion(Widget, XEvent*, String*, Cardinal*);
void KillFile(Widget, XEvent*, String*, Cardinal*);
void DirWindowCB(Widget, XtPointer, XtPointer);

4
app/xedit/xedit.man
View File

@ -299,7 +299,7 @@ the file being edited is changed.
.B autoReplace (\fPClass \fBReplace)
This resource is useful to automatically correct common misspelling errors, but
can also be used to create simple macros. The format is
\fI{non-blanks}{blanks}[{string}]\fP. Fields are separeted by newlines.
\fI{non-blanks}{blanks}[{string}]\fP. Fields are separated by newlines.
Example of use:
\"
.br
@ -316,7 +316,7 @@ by \fIsome long string with
when you type that words.
.TP 8
.B ispell.dictionaries (\fPClass \fBispell.Dictionary)
Specifies a list of dictionary names, separeted by spaces, available to the
Specifies a list of dictionary names, separated by spaces, available to the
ispell program. The default value is \fI"american americamed+ english"\fP.
.TP 8
.B ispell.dictionary (\fPClass \fBispell.Dictionary)