diff options
| author | Boram Park <boram1288.park@samsung.com> | 2012-08-21 18:04:11 +0900 |
|---|---|---|
| committer | Boram Park <boram1288.park@samsung.com> | 2012-08-21 18:04:11 +0900 |
| commit | d19e3ad6501e341782554cf264bafe23ebc16f9f (patch) | |
| tree | ec0147c4ec92b2ff999db1c76b35e5615090afb8 | |
| parent | 9b56686d3db9eada0e44b37e38eab3ee1678c8fa (diff) | |
| download | libxtst-d19e3ad6501e341782554cf264bafe23ebc16f9f.tar.gz libxtst-d19e3ad6501e341782554cf264bafe23ebc16f9f.tar.bz2 libxtst-d19e3ad6501e341782554cf264bafe23ebc16f9f.zip | |
upload tizen2.0 sourceHEADsubmit/master/20120920.1511402.0_alphamaster2.0alpha
45 files changed, 1144 insertions, 1986 deletions
diff --git a/AUTHORS b/AUTHORS deleted file mode 100644 index e69de29..0000000 --- a/AUTHORS +++ /dev/null diff --git a/ChangeLog b/ChangeLog index 9c34936..4677bec 100755..100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,245 @@ +commit eb177d24ffb459af6205d2658c3a158449660caf +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Wed Mar 7 21:11:34 2012 -0800 + + libXtst 1.2.1 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 6150958c2ae61ce82aa15f3a80107dd01278b255 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Thu Nov 10 21:43:16 2011 -0800 + + Fix gcc -Wwrite-strings warnings + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 558ec1d7194307d7ce73aeae2f4f61df9d44bba0 +Author: Matt Dew <marcoz@osource.org> +Date: Tue Oct 4 21:50:03 2011 -0600 + + Cleanup IDs and links in doc + + 1 - fix the capitalization of the ID attributes to match either the + <title> or <funcdef> string it goes with. + 2 - fix any <linkend>'s that were affected by 1. + 3 - any <function> in the docs that has an actual funcdef, + will become an olink. + + Signed-off-by: Matt Dew <marcoz@osource.org> + +commit 262904c22154d5a703ef92a7f954e52956b13663 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Tue Sep 20 15:30:22 2011 -0400 + + specs: refactor copyright legal text for multi licensing + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 8f68b59f2b66f035ad97e3fe99e9eae983d1f44b +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Fri Sep 16 22:55:23 2011 -0700 + + Strip trailing whitespace + + Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}' + git diff -w & git diff -b show no diffs from this change + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 01dc43ee0fbdb1ed2397a735dfb69b0434600a20 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Fri Sep 16 16:57:52 2011 -0400 + + xtestlib: remove duplicate paragraph in legal notice + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit d03495e02bf43e9605671d8f6474c1e9e45261e2 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Fri Sep 16 16:55:48 2011 -0400 + + specs: fix author affiliation + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit b5e58980988017265c239a2bad11489a7ab06c23 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Mon Sep 12 16:54:45 2011 -0400 + + docs: use the &fullrelvers; entity to set X11 release information + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 743447eaeab62b5e1d5951706cc99d51c0261bbf +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Sun Sep 11 19:49:54 2011 -0400 + + docs: remove <productnumber> which is not used by default + + This element is not rendered by default on the title. A template + customization is required to display it. + X Window System does not have a product number. + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit c6be40edba1fe8557ebd0b1cc09b3480bc7d6bb8 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Thu Sep 8 20:00:00 2011 -0400 + + docbook.am: embed css styles inside the HTML HEAD element + + Rather than referring to the external xorg.css stylesheet, embed the content + of the file in the html output produced. This is accomplished by using + version 1.10 of xorg-xhtml.xsl. + + This makes the whole html docs tree much more relocatable. + In addition, it eliminates xorg.css as a runtime file which makes + xorg-sgml-doctools a build time only package. + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit ee829b31b27580afbd6e16f81d9ef3526514be8e +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Wed Sep 7 10:31:04 2011 -0400 + + docbook.am: global maintenance update - entities, images and olinking + + Adding support in libX11 for html chunking caused a reorg of docbook.am + as well as the xorg-sgml-doctools masterdb for olinking. + The parameter img.src.path is added for pdf images. + A searchpath to the root builddir is added for local entities, if present. + + The docbook.am makefile hides all the details and is identical for + all 22 modules having DocBook documentation. It is included by a thin + Makefile.am which requires no docbook knowledge. + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit b8c1a91ed12488999dee915953b5bc36019bbf95 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Sun Jun 12 18:39:46 2011 -0400 + + Install xml versions of specs even if HAVE_XMLTO is false + + DocBook/XML input source is also a usefull output format that can be viewed + with an XML viewer or editor and by some O/S help system. + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 9656d08c2c01965aa57f21f29cc2261b9d015b3c +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Sun Jun 5 16:27:37 2011 -0400 + + Install target dbs alongside generated documents + + This matches a change in xorg-sgml-docs whereby the masterdb will look for + the target dbs into the same location as the generated documents. + + The target dbs are now installed alongside the generated documents. + Previously they are installed in $prefix/sgml/X11/dbs alongside masterdb which + has the potential of installing outside the package prefix and cause + distcheck to fail when user does not have write permission in this package. + + Requires XORG_CHECK_SGML_DOCTOOLS(1.8) which was released 2011-06-11 + +commit c131572b98342e0e2a599619647dd1835c740ee4 +Author: Matt Dew <marcoz@osource.org> +Date: Tue May 31 20:03:23 2011 -0600 + + Add id attributes to funcsynopsis to allow other docs to olink to them. + + Signed-off-by: Matt Dew <marcoz@osource.org> + Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> + Reviewed-by: Gaetan Nadon <memsize@videotron.ca> + +commit c82effa402128366bfd3cfb77da82d524ddb878f +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Sun Feb 27 15:06:18 2011 -0500 + + Documentation: add Docbook external references support + + When writing technical documentation, it is often necessary to cross + reference to other information. When that other information is not in the + current document, additional support is needed, namely <olink>. + + A new feature with version 1.7 of xorg-sgml-doctools adds references to + other documents within or outside this package. + + This patch adds technical support for this feature but does not change + the content of the documentation as seen by the end user. + + Each book or article must generate a database containing the href + of sections that can be referred to from another document. This database + is installed in DATAROOTDIR/sgml/X11/dbs. There is a requirement that + the value of DATAROOTDIR for xorg-sgml-doctools and for the package + documentation is the same. This forms a virtual document tree. + + This database is consulted by other documents while they are being generated + in order to fulfill the missing information for linking. + Refer to the xorg-sgml-doctools for further technical information. + + Co-authored-by: Matt Dew <marcoz@osource.org> + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 755e43b9a05dfce2564cd62cf97364db94a62731 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Wed Feb 2 11:43:45 2011 -0500 + + config: comment, minor upgrade, quote and layout configure.ac + + Group statements per section as per Autoconf standard layout + Quote statements where appropriate. + Autoconf recommends not using dnl instead of # for comments + + Use AC_CONFIG_FILES to replace the deprecated AC_OUTPUT with parameters. + Add AC_CONFIG_SRCDIR([Makefile.am]) + + This helps automated maintenance and release activities. + Details can be found in http://wiki.x.org/wiki/NewModuleGuidelines + +commit 97eab9c4e103b6b18f1307d42c4ab15bc80b8db7 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Fri Jan 28 19:41:37 2011 -0500 + + config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit a0154ff17ac2f7d08e26e82cc211f61935acf229 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Thu Jan 27 18:50:15 2011 -0500 + + config: remove AC_PROG_CC as it overrides AC_PROG_C_C99 + + XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls + AC_PROG_C_C99. This sets gcc with -std=gnu99. + If AC_PROG_CC macro is called afterwards, it resets CC to gcc. + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 22ae1c003879ccddb4143669275c5b8071f713a8 +Author: Paulo Zanoni <pzanoni@mandriva.com> +Date: Thu Dec 16 14:11:43 2010 -0200 + + Use docbookx.dtd version 4.3 for all docs + + Signed-off-by: Paulo Zanoni <pzanoni@mandriva.com> + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit e8ac35fac1974b9fd698f74c143c9691af5dd688 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Tue Nov 9 13:04:59 2010 -0500 + + config: HTML file generation: use the installed copy of xorg.css + + Currenlty the xorg.css file is copied in each location + where a DocBook/XML file resides. This produces about + 70 copies in the $(docdir) install tree. + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + commit 5c6834bc9e0ab78c78733c59046510a2f48b2d42 Author: Alan Coopersmith <alan.coopersmith@oracle.com> Date: Fri Oct 29 17:38:10 2010 -0700 @@ -0,0 +1,291 @@ +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. + diff --git a/Makefile.am b/Makefile.am index c49353f..da9d32f 100755..100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ -# +# # Copyright 2005 Red Hat, Inc. -# +# # 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 @@ -10,7 +10,7 @@ # specific, written prior permission. Red Hat makes no # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. -# +# # RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO # EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR @@ -19,7 +19,7 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -SUBDIRS = src specs +SUBDIRS = src man specs pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xtst.pc diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index 218197d..0000000 --- a/autogen.sh +++ /dev/null @@ -1,12 +0,0 @@ -#! /bin/sh - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir - -autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? - -#$srcdir/configure --enable-maintainer-mode "$@" diff --git a/configure.ac b/configure.ac index 1e66c80..1f2927f 100755..100644 --- a/configure.ac +++ b/configure.ac @@ -1,49 +1,51 @@ -dnl Copyright 2005 Red Hat, Inc. -dnl -dnl Permission to use, copy, modify, distribute, and sell this software and its -dnl documentation for any purpose is hereby granted without fee, provided that -dnl the above copyright notice appear in all copies and that both that -dnl copyright notice and this permission notice appear in supporting -dnl documentation, and that the name of Red Hat not be used in -dnl advertising or publicity pertaining to distribution of the software without -dnl specific, written prior permission. Red Hat makes no -dnl representations about the suitability of this software for any purpose. It -dnl is provided "as is" without express or implied warranty. -dnl -dnl RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -dnl EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR -dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -dnl PERFORMANCE OF THIS SOFTWARE. -dnl -dnl Process this file with autoconf to create configure. +# Copyright 2005 Red Hat, Inc. +# +# 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, and that the name of Red Hat not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. Red Hat makes no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Initialize Autoconf AC_PREREQ([2.60]) +AC_INIT([libXtst], [1.2.1], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXtst]) +AC_CONFIG_SRCDIR([Makefile.am]) +AC_CONFIG_HEADERS([config.h]) -AC_INIT([libXtst], [1.2.0], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXtst]) +# Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros minimum of 1.10 for DocBook XML documentation +# Initialize libtool +AC_PROG_LIBTOOL + +# Require xorg-macros minimum of 1.12 for DocBook external references m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.10) + [m4_fatal([must install xorg-macros 1.12 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.12) XORG_DEFAULT_OPTIONS XORG_ENABLE_SPECS -XORG_WITH_XMLTO(0.0.20) +XORG_WITH_XMLTO(0.0.22) XORG_WITH_FOP -XORG_CHECK_SGML_DOCTOOLS(1.5) -AM_CONFIG_HEADER(config.h) - -# Check for progs -AC_PROG_CC -AC_PROG_LIBTOOL +XORG_WITH_XSLTPROC +XORG_CHECK_SGML_DOCTOOLS(1.8) -# Check for dependencies +# Obtain compiler/linker options for depedencies PKG_CHECK_MODULES(XTST, x11 [xext >= 1.0.99.4] xi [recordproto >= 1.13.99.1] [xextproto >= 7.0.99.3] inputproto) # Determine if the source for man pages is available @@ -51,12 +53,14 @@ PKG_CHECK_MODULES(XTST, x11 [xext >= 1.0.99.4] xi [recordproto >= 1.13.99.1] [xe AM_CONDITIONAL([INSTALL_MANPAGES], [test -f "$srcdir/man/XTestQueryExtension.man" || test "x$have_xmlto" = xyes]) -dnl Allow checking code with lint, sparse, etc. +# Allow checking code with lint, sparse, etc. XORG_WITH_LINT XORG_LINT_LIBRARY([Xtst]) LINT_FLAGS="${LINT_FLAGS} ${XTST_CFLAGS}" -AC_OUTPUT([Makefile - src/Makefile - specs/Makefile - xtst.pc]) +AC_CONFIG_FILES([Makefile + man/Makefile + src/Makefile + specs/Makefile + xtst.pc]) +AC_OUTPUT diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index b09a1ab..0000000 --- a/debian/README.source +++ /dev/null @@ -1,73 +0,0 @@ ------------------------------------------------------- -Quick Guide To Patching This Package For The Impatient ------------------------------------------------------- - -1. Make sure you have quilt installed -2. Unpack the package as usual with "dpkg-source -x" -3. Run the "patch" target in debian/rules -4. Create a new patch with "quilt new" (see quilt(1)) -5. Edit all the files you want to include in the patch with "quilt edit" - (see quilt(1)). -6. Write the patch with "quilt refresh" (see quilt(1)) -7. Run the "clean" target in debian/rules - -Alternatively, instead of using quilt directly, you can drop the patch in to -debian/patches and add the name of the patch to debian/patches/series. - ------------------------------------- -Guide To The X Strike Force Packages ------------------------------------- - -The X Strike Force team maintains X packages in git repositories on -git.debian.org in the pkg-xorg subdirectory. Most upstream packages -are actually maintained in git repositories as well, so they often -just need to be pulled into git.debian.org in a "upstream-*" branch. -Otherwise, the upstream sources are manually installed in the Debian -git repository. - -The .orig.tar.gz upstream source file could be generated using this -"upstream-*" branch in the Debian git repository but it is actually -copied from upstream tarballs directly. - -Due to X.org being highly modular, packaging all X.org applications -as their own independent packages would have created too many Debian -packages. For this reason, some X.org applications have been grouped -into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils, -x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils. -Most packages, including the X.org server itself and all libraries -and drivers are, however maintained independently. - -The Debian packaging is added by creating the "debian-*" git branch -which contains the aforementioned "upstream-*" branch plus the debian/ -repository files. -When a patch has to be applied to the Debian package, two solutions -are involved: -* If the patch is available in one of the upstream branches, it - may be git'cherry-picked into the Debian repository. In this - case, it appears directly in the .diff.gz. -* Otherwise, the patch is added to debian/patches/ which is managed - with quilt as documented in /usr/share/doc/quilt/README.source. - -quilt is actually invoked by the Debian X packaging through a larger -set of scripts called XSFBS. XSFBS brings some other X specific -features such as managing dependencies and conflicts due to the video -and input driver ABIs. -XSFBS itself is maintained in a separate repository at - git://git.debian.org/pkg-xorg/xsfbs.git -and it is pulled inside the other Debian X repositories when needed. - -The XSFBS patching system requires a build dependency on quilt. Also -a dependency on $(STAMP_DIR)/patch has to be added to debian/rules -so that the XSFBS patching occurs before the actual build. So the -very first target of the build (likely the one running autoreconf) -should depend on $(STAMP_DIR)/patch. It should also not depend on -anything so that parallel builds are correctly supported (nothing -should probably run while patching is being done). And finally, the -clean target should depend on the xsfclean target so that patches -are unapplied on clean. - -When the upstream sources contain some DFSG-nonfree files, they are -listed in text files in debian/prune/ in the "debian-*" branch of -the Debian repository. XSFBS' scripts then take care of removing -these listed files during the build so as to generate a modified -DFSG-free .orig.tar.gz tarball. diff --git a/debian/changelog b/debian/changelog deleted file mode 100755 index 24823d9..0000000 --- a/debian/changelog +++ /dev/null @@ -1,196 +0,0 @@ -libxtst (2:1.2.0-1slp2+3) unstable; urgency=low - - * Modify files not to make/install man page - * Git: 165.213.180.234:slp/pkgs/xorg/lib/libxtst - * Tag: libxtst_1.2.0-1slp2+3 - - -- Sung-Jin Park <sj76.park@samsung.com> Wed, 02 Nov 2011 16:24:52 +0900 - -libxtst (2:1.2.0-1slp2+2) unstable; urgency=low - - * [X11R7.6] upgrade package - * Git: 165.213.180.234:slp/pkgs/xorg/lib/libxtst - * Tag: libxtst_1.2.0-1slp2+2 - - -- SooChan Lim <sc1.lim@samsung.com> Wed, 05 Jan 2011 19:25:22 +0900 - -libxtst (2:1.1.0-6slp2+2) unstable; urgency=low - - * change the rules file - * Git: 165.213.180.234:/git/slp/pkgs/xorg/lib/libxtst - * Tag: libxtst_1.1.0-6slp2+2 - - -- SooChan Lim <sc1.lim@samsung.com> Fri, 03 Dec 2010 19:09:52 +0900 - -libxtst (2:1.1.0-5slp2+2) unstable; urgency=low - - * add --as-needed - * Git: 165.213.180.234:/git/slp/pkgs/xorg/lib/libxtst - * Tag: libxtst_1.1.0-5slp2+2 - - -- SooChan Lim <sc1.lim@samsung.com> Sat, 20 Nov 2010 16:10:02 +0900 - -libxtst (2:1.1.0-5slp2+1) unstable; urgency=low - - * modify the package name - - -- SooChan Lim <sc1.lim@samsung.com> Thu, 25 Mar 2010 18:03:04 +0900 - -libxtst (2:1.1.0-4) unstable; urgency=low - - * Add configure option to choose not/to use xmlto building docs - - -- Sung-Jin Park <sj76.park@samsung.com> Wed, 17 Feb 2010 22:52:18 +0900 - -libxtst (2:1.1.0-3) unstable; urgency=low - - * Fix debian/rules not to delete ltmain.sh - - -- Sung-Jin Park <sj76.park@samsung.com> Tue, 29 Dec 2009 14:31:25 +0900 - -libxtst (2:1.1.0-3) unstable; urgency=low - - [ Julien Cristau ] - * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no - good reason. Thanks, Colin Watson! - - [ Brice Goglin ] - * Fix short description, thanks Nick Shaforostoff, closes: #565234. - - -- Julien Cristau <jcristau@debian.org> Wed, 23 Jun 2010 12:34:43 +0100 - -libxtst (2:1.1.0-2) unstable; urgency=low - - * Upload to unstable. - - -- Julien Cristau <jcristau@debian.org> Wed, 06 Jan 2010 13:02:50 +0000 - -libxtst (2:1.1.0-1) experimental; urgency=low - - [ Timo Aaltonen ] - * New upstream release. - * Bump the build-dep on xutils-dev (>= 1:7.5~1). - * Bump the build-dep on libxext-dev (>= 1:1.0.99.4). - - -- Julien Cristau <jcristau@debian.org> Thu, 26 Nov 2009 17:57:54 +0100 - -libxtst (2:1.0.99.2-2) experimental; urgency=low - - * Brown paper bag upload. - * Actually install the headers. - - -- Julien Cristau <jcristau@debian.org> Tue, 29 Sep 2009 17:16:59 +0200 - -libxtst (2:1.0.99.2-1) experimental; urgency=low - - [ Brice Goglin ] - * Bump Standards-Version to 3.7.3 (no changes). - * Drop the XS- prefix from Vcs-Git and Vcs-Browser fields in debian/control. - * Add a link to www.X.org and a reference to the upstream module - in the long description. - * Install the upstream ChangeLog. - * Add README.source, bump Standards-Version to 3.8.2. - * Use updated xsfbs, closes: #538589. - * Move -dbg package to section debug. - - [ Julien Cristau ] - * Run autoreconf at build time. - * Parse space-separated DEB_BUILD_OPTIONS, handle parallel=N. - * Drop pre-dependency on x11-common from libxtst-dev. This was needed for - upgrades from sarge. - * Bump Standards-Version to 3.8.3. - * New upstream release candidate - - record.h and XTest.h moved here from recordproto and xextproto - * Bump {Build-,}Depends, add Replaces on x11proto-xext-dev and - x11proto-record-dev. - * Drop -1 debian revision from Build-Depends [lintian]. - - -- Julien Cristau <jcristau@debian.org> Tue, 29 Sep 2009 15:53:21 +0200 - -libxtst (2:1.0.3-1) unstable; urgency=low - - [ Julien Cristau ] - * Sync package sections with the override. - * Bump epoch so Ubuntu can sync this package. - - [ Brice Goglin ] - * New upstream release. - * Add myself to Uploaders, and remove Branden and Fabio with their - permission. - * Add upstream URL to debian/copyright. - * Update 01_build_manpages.diff since its first half has been merged - upstream, and rename it to 01_fix_date_in_manpages.diff to match - the remaining part. - - -- Brice Goglin <bgoglin@debian.org> Sat, 25 Aug 2007 11:58:00 +0200 - -libxtst (1:1.0.2-1) unstable; urgency=low - - [ Drew Parsons ] - * dbg package has priority extra. - - [ Julien Cristau ] - * Add XS-Vcs-* headers, and remove outdated CVS info. - * New upstream release. - * Build and install the new manpage, and add a new patch to make that work. - Accordingly, add build-deps on quilt and xmlto. - * Use ${binary:Version} instead of ${Source-Version} in debian/control. - * Update debian/copyright from COPYING. - - -- Julien Cristau <jcristau@debian.org> Thu, 07 Jun 2007 17:54:08 +0200 - -libxtst (1:1.0.1-5) unstable; urgency=low - - * Revert .la file addition. - - -- Andres Salomon <dilinger@debian.org> Mon, 24 Jul 2006 11:20:31 -0400 - -libxtst (1:1.0.1-4) unstable; urgency=low - - * Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build; - idempotency fix. - * Run dh_install w/ --list-missing. - * Drop duplicate x11-common dep in -dev package. - * Bump standards version to 3.7.2.0. - * Version x11-common pre-dep in -dev package to 1:7.0.0 to match - the rest of Debian. - * Bump debhelper compat to 5. - * Fix dh_strip call to skip the -dbg package. - * Autoreconf w/ an updated xutils-dev so that manpages have the 'x' - extension dropped. - * Include .la files in -dev package. - * Don't attempt to install (non-existent) usr/include/X11/* stuff. - * Add a debian/copyright file. - - -- Andres Salomon <dilinger@debian.org> Mon, 24 Jul 2006 05:13:32 -0400 - -libxtst (1:1.0.1-3) unstable; urgency=low - - * Reorder makeshlib command in rules file so that ldconfig is run - properly. Thanks Drew Parsons and Steve Langasek. - - -- David Nusinow <dnusinow@debian.org> Tue, 18 Apr 2006 21:50:01 -0400 - -libxtst (1:1.0.1-2) unstable; urgency=low - - * Upload to unstable - - -- David Nusinow <dnusinow@debian.org> Thu, 23 Mar 2006 22:45:21 -0500 - -libxtst (1:1.0.1-1) experimental; urgency=low - - * First modular upload to Debian - - -- David Nusinow <dnusinow@debian.org> Thu, 29 Dec 2005 20:55:45 -0500 - -libxtst (1:1.13.0-2) breezy; urgency=low - - * Bump Build-Deps on libx11-dev and libxext-dev to avoid _XOPEN_SOURCE. - - -- Daniel Stone <daniel.stone@ubuntu.com> Sat, 23 Jul 2005 00:49:26 +1000 - -libxtst (1:1.13.0-1) breezy; urgency=low - - * First libxtst release. - - -- Daniel Stone <daniel.stone@ubuntu.com> Mon, 16 May 2005 22:10:17 +1000 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 7ed6ff8..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/debian/control b/debian/control deleted file mode 100755 index 1f5ad41..0000000 --- a/debian/control +++ /dev/null @@ -1,68 +0,0 @@ -Source: libxtst -Section: x11 -Priority: optional -Maintainer: Sung-Jin Park <sj76.park@samsung.com>, Sangjin Lee <lsj119@samsung.com>, Debian X Strike Force <debian-x@lists.debian.org> -Uploaders: Sung-Jin Park <sj76.park@samsung.com>, SooChan Lim <sc1.lim@samsung.com>, David Nusinow <dnusinow@debian.org>, Andres Salomon <dilinger@debian.org>, Brice Goglin <bgoglin@debian.org> -Build-Depends: debhelper (>= 5.0.0), libx11-dev (>= 2:0.99.3), libxext-dev (>= 2:1.0.99.4), libxi-dev, x11proto-record-dev (>= 1.13.99.1), x11proto-xext-dev (>= 7.0.99.3), x11proto-input-dev, pkg-config, xmlto, automake, libtool, xutils-dev (>= 1:7.5-1slp2), quilt -Standards-Version: 3.8.3 -Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxtst -Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxtst.git - -Package: libxtst6 -Section: libs -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common -Description: X11 Testing -- Record extension library - libXtst provides an X Window System client interface to the Record - extension to the X protocol. - . - The Record extension allows X clients to synthesise input events, which - is useful for automated testing. - . - More information about X.Org can be found at: - <URL:http://www.X.org> - . - This module can be found at - git://anongit.freedesktop.org/git/xorg/lib/libXtst - -Package: libxtst6-dbg -Architecture: any -Section: debug -Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, libxtst6 (= ${binary:Version}) -Description: X11 Record extension library (debug package) - libXtst provides an X Window System client interface to the Record - extension to the X protocol. - . - The Record extension allows X clients to synthesise input events, which - is useful for automated testing. - . - This package contains the debug versions of the library found in libxtst6. - Non-developers likely have little use for this package. - . - More information about X.Org can be found at: - <URL:http://www.X.org> - . - This module can be found at - git://anongit.freedesktop.org/git/xorg/lib/libXtst - -Package: libxtst-dev -Section: libdevel -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libxtst6 (= ${binary:Version}), libx11-dev, libxext-dev, libxi-dev, x11proto-xext-dev (>= 7.0.99.3), x11proto-record-dev (>= 1.13.99.1), -Replaces: x11proto-xext-dev (<< 7.0.99.3), x11proto-record-dev (<< 1.13.99.1) -Description: X11 Record extension library (development headers) - libXtst provides an X Window System client interface to the Record - extension to the X protocol. - . - The Record extension allows X clients to synthesise input events, which - is useful for automated testing. - . - This package contains the development headers for the library found in - libxtst6. Non-developers likely have little use for this package. - . - More information about X.Org can be found at: - <URL:http://www.X.org> - . - This module can be found at - git://anongit.freedesktop.org/git/xorg/lib/libXtst diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index 313e438..0000000 --- a/debian/copyright +++ /dev/null @@ -1,73 +0,0 @@ -This package was downloaded from -http://xorg.freedesktop.org/releases/individual/lib/ - -Copyright: - XTest.c - Copyright 1990, 1991 by UniSoft Group Limited - Copyright 1992, 1993, 1998 The Open Group - XRecord.c - Copyright 1995, 1998 The Open Group - Copyright 1995 Network Computing Devices - By Stephen Gildea, X Consortium, and Martha Zimet, NCD. - Build system: Copyright 2005 Red Hat, Inc. - -License: - - 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. - -XRecord also contains the following license: - - 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, and that the name of Network Computing Devices - not be used in advertising or publicity pertaining to distribution - of the software without specific, written prior permission. - - NETWORK COMPUTING DEVICES DISCLAIMs ALL WARRANTIES WITH REGARD TO - THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS, IN NO EVENT SHALL NETWORK COMPUTING DEVICES BE LIABLE - FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN - AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - -License for the build system: - - 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, and that the name of Red Hat not be used in - advertising or publicity pertaining to distribution of the software without - specific, written prior permission. Red Hat makes no - representations about the suitability of this software for any purpose. It - is provided "as is" without express or implied warranty. - - RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR - CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - PERFORMANCE OF THIS SOFTWARE. - diff --git a/debian/libxtst-dev.install b/debian/libxtst-dev.install deleted file mode 100755 index 66d1e5c..0000000 --- a/debian/libxtst-dev.install +++ /dev/null @@ -1,6 +0,0 @@ -usr/lib/libXtst.a -usr/lib/libXtst.la -usr/lib/libXtst.so -usr/lib/pkgconfig/xtst.pc -#usr/share/man/man3 -usr/include/X11/extensions/ diff --git a/debian/libxtst6.install b/debian/libxtst6.install deleted file mode 100644 index 9f81ac0..0000000 --- a/debian/libxtst6.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libXtst.so.6* diff --git a/debian/patches/01_fix_date_in_manpages.diff b/debian/patches/01_fix_date_in_manpages.diff deleted file mode 100644 index bdd77be..0000000 --- a/debian/patches/01_fix_date_in_manpages.diff +++ /dev/null @@ -1,14 +0,0 @@ -Make sure the manpage footer contains the date, not the date within -<pubdate></pubdate>. - ---- a/man/XTest.xml -+++ b/man/XTest.xml -@@ -43,7 +43,7 @@ X Consortium. - <!-- $Xorg: xtestlib.ms,v 1.3 2000/08/17 19:42:37 cpqbld Exp $ --> - <refentryinfo> - <productname>__vendorversion__</productname> -- <pubdate>6 June 2007</pubdate> -+ <date>6 June 2007</date> - <author><firstname>Kieron</firstname><surname>Drake</surname> - <affiliation><orgname>UniSoft Ltd.</orgname></affiliation> - </author> diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index b93a37a..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -01_fix_date_in_manpages.diff diff --git a/debian/rules b/debian/rules deleted file mode 100755 index cf85100..0000000 --- a/debian/rules +++ /dev/null @@ -1,104 +0,0 @@ -#!/usr/bin/make -f -# debian/rules for the Debian libxtst package. -# Copyright © 2004 Scott James Remnant <scott@netsplit.com> -# Copyright © 2005 Daniel Stone <daniel@fooishbar.org> -# Copyright © 2005 David Nusinow <dnusinow@debian.org> - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -# set this to the name of the main shlib's binary package -PACKAGE = libxtst6 - -include debian/xsfbs/xsfbs.mk - -CFLAGS = -Wall -g -LDFLAGS += -Wl,--hash-style=both -Wl,--as-needed -ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif -ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) - NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) - MAKEFLAGS += -j$(NUMJOBS) -endif - -DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) - confflags += --build=$(DEB_HOST_GNU_TYPE) -else - confflags += --build=$(DEB_HOST_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) -# confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) -endif - - -build: build-stamp -build-stamp: -#build-stamp: $(STAMP_DIR)/patch - dh_testdir - autoreconf -vfi - ./autogen.sh - mkdir -p obj-$(DEB_BUILD_GNU_TYPE) - cd obj-$(DEB_BUILD_GNU_TYPE) && \ - ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ - --infodir=\$${prefix}/share/info $(confflags) \ - CFLAGS="$(CFLAGS)" \ - LDFLAGS="$(LDFLAGS)" - cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) - >$@ - -clean: xsfclean - dh_testdir - dh_testroot - rm -f build-stamp - - rm -f config.cache config.log config.status - rm -f */config.cache */config.log */config.status - rm -f conftest* */conftest* - rm -rf autom4te.cache */autom4te.cache - rm -rf obj-* - rm -f INSTALL aclocal.m4 config.guess config.sub config.h.in configure - rm -f depcomp install-sh missing mkinstalldirs - rm -f ltmain.sh - find -name Makefile.in -exec rm -f {} \; - #find -name Makefile.in -delete - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - -# dh_installdocs - dh_install --sourcedir=debian/tmp --list-missing -# dh_installchangelogs ChangeLog -# dh_installman - dh_link - dh_strip --dbg-package=$(PACKAGE)-dbg - dh_compress - dh_fixperms - dh_makeshlibs - dh_shlibdeps - dh_installdeb - dh_gencontrol - dh_md5sums - dh_builddeb - -# Build architecture-independent files here. -binary-indep: build install -# Nothing to do - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/watch b/debian/watch deleted file mode 100644 index 0e59a4d..0000000 --- a/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/lib/ libXtst-(.*)\.tar\.gz diff --git a/debian/xsfbs/repack.sh b/debian/xsfbs/repack.sh deleted file mode 100644 index 5935cc9..0000000 --- a/debian/xsfbs/repack.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -set -e - -if ! [ -d debian/prune ]; then - exit 0 -fi - -if [ "x$1" != x--upstream-version ]; then - exit 1 -fi - -version="$2" -filename="$3" - -if [ -z "$version" ] || ! [ -f "$filename" ]; then - exit 1 -fi - -dir="$(pwd)" -tempdir="$(mktemp -d)" - -cd "$tempdir" -tar xf "$dir/$filename" -cat "$dir"/debian/prune/* | while read file; do rm -f */$file; done - -tar czf "$dir/$filename" * -cd "$dir" -rm -rf "$tempdir" -echo "Done pruning upstream tarball" - -exit 0 diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk deleted file mode 100644 index 3c59c20..0000000 --- a/debian/xsfbs/xsfbs.mk +++ /dev/null @@ -1,285 +0,0 @@ -#!/usr/bin/make -f - -# Debian X Strike Force Build System (XSFBS): Make portion - -# Copyright 1996 Stephen Early -# Copyright 1997 Mark Eichin -# Copyright 1998-2005, 2007 Branden Robinson -# Copyright 2005 David Nusinow -# -# Licensed under the GNU General Public License, version 2. See the file -# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>. - -# Originally by Stephen Early <sde1000@debian.org> -# Modified by Mark W. Eichin <eichin@kitten.gen.ma.us> -# Modified by Adam Heath <doogie@debian.org> -# Modified by Branden Robinson <branden@debian.org> -# Modified by Fabio Massimo Di Nitto <fabbione@fabbione.net> -# Modified by David Nusinow <dnusinow@debian.org> -# Acknowledgements to Manoj Srivastava. - -# Pass $(DH_OPTIONS) into the environment for debhelper's benefit. -export DH_OPTIONS - -# force quilt to not use ~/.quiltrc and to use debian/patches -QUILT = QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null - -# Set up parameters for the upstream build environment. - -# Determine (source) package name from Debian changelog. -SOURCE_NAME:=$(shell dpkg-parsechangelog -ldebian/changelog \ - | grep '^Source:' | awk '{print $$2}') - -# Determine package version from Debian changelog. -SOURCE_VERSION:=$(shell dpkg-parsechangelog -ldebian/changelog \ - | grep '^Version:' | awk '{print $$2}') - -# Determine upstream version number. -UPSTREAM_VERSION:=$(shell echo $(SOURCE_VERSION) | sed 's/-.*//') - -# Determine the source version without the epoch for make-orig-tar-gz -NO_EPOCH_VER:=$(shell echo $(UPSTREAM_VERSION) | sed 's/^.://') - -# Figure out who's building this package. -BUILDER:=$(shell echo $${DEBEMAIL:-$${EMAIL:-$$(echo $$LOGNAME@$$(cat /etc/mailname 2>/dev/null))}}) - -# Find out if this is an official build; an official build has nothing but -# digits, dots, and/or the codename of a release in the Debian part of the -# version number. Anything else indicates an unofficial build. -OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr "$$(echo $${VERSION\#\#*-} | sed 's/\(woody\|sarge\|etch\|lenny\)//g')" : ".*[^0-9.].*" >/dev/null 2>&1; then echo yes; fi) - -# Set up parameters for the Debian build environment. - -# Determine our architecture. -BUILD_ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH) -# Work around some old-time dpkg braindamage. -BUILD_ARCH:=$(subst i486,i386,$(BUILD_ARCH)) -# The DEB_HOST_ARCH variable may be set per the Debian cross-compilation policy. -ifdef DEB_HOST_ARCH - ARCH:=$(DEB_HOST_ARCH) -else - # dpkg-cross sets the ARCH environment variable; if set, use it. - ifdef ARCH - ARCH:=$(ARCH) - else - ARCH:=$(BUILD_ARCH) - endif -endif - -# $(STAMP_DIR) houses stamp files for complex targets. -STAMP_DIR:=stampdir - -# $(DEBTREEDIR) is where all install rules are told (via $(DESTDIR)) to place -# their files. -DEBTREEDIR:=$(CURDIR)/debian/tmp - -# All "important" targets have four lines: -# 1) A target name that is invoked by a package-building tool or the user. -# This consists of a dependency on a "$(STAMP_DIR)/"-prefixed counterpart. -# 2) A line delcaring 1) as a phony target (".PHONY:"). -# 3) A "$(STAMP_DIR)/"-prefixed target which does the actual work, and may -# depend on other targets. -# 4) A line declaring 3) as a member of the $(stampdir_targets) variable; the -# "$(STAMP_DIR)/" prefix is omitted. -# -# This indirection is needed so that the "stamp" files that signify when a rule -# is done can be located in a separate "stampdir". Recall that make has no way -# to know when a goal has been met for a phony target (like "build" or -# "install"). -# -# At the end of each "$(STAMP_DIR)/" target, be sure to run the command ">$@" -# so that the target will not be run again. Removing the file will make Make -# run the target over. - -# All phony targets should be declared as dependencies of .PHONY, even if they -# do not have "($STAMP_DIR)/"-prefixed counterparts. - -# Define a harmless default rule to keep things from going nuts by accident. -.PHONY: default -default: - -# Set up the $(STAMP_DIR) directory. -.PHONY: stampdir -stampdir_targets+=stampdir -stampdir: $(STAMP_DIR)/stampdir -$(STAMP_DIR)/stampdir: - mkdir $(STAMP_DIR) - >$@ - -# Set up the package build directory as quilt expects to find it. -.PHONY: prepare -stampdir_targets+=prepare -prepare: $(STAMP_DIR)/prepare -$(STAMP_DIR)/prepare: $(STAMP_DIR)/logdir $(STAMP_DIR)/genscripts - >$@ - -.PHONY: logdir -stampdir_targets+=logdir -logdir: $(STAMP_DIR)/logdir -$(STAMP_DIR)/logdir: $(STAMP_DIR)/stampdir - mkdir -p $(STAMP_DIR)/log - >$@ - -# Apply all patches to the upstream source. -.PHONY: patch -stampdir_targets+=patch -patch: $(STAMP_DIR)/patch -$(STAMP_DIR)/patch: $(STAMP_DIR)/prepare - if ! [ `which quilt` ]; then \ - echo "Couldn't find quilt. Please install it or add it to the build-depends for this package."; \ - exit 1; \ - fi; \ - if $(QUILT) next >/dev/null 2>&1; then \ - echo -n "Applying patches..."; \ - if $(QUILT) push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \ - cat $(STAMP_DIR)/log/patch; \ - echo "successful."; \ - else \ - cat $(STAMP_DIR)/log/patch; \ - echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \ - exit 1; \ - fi; \ - else \ - echo "No patches to apply"; \ - fi; \ - >$@ - -# Revert all patches to the upstream source. -.PHONY: unpatch -unpatch: $(STAMP_DIR)/logdir - rm -f $(STAMP_DIR)/patch - @echo -n "Unapplying patches..."; \ - if $(QUILT) applied >/dev/null 2>/dev/null; then \ - if $(QUILT) pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \ - cat $(STAMP_DIR)/log/unpatch; \ - echo "successful."; \ - else \ - cat $(STAMP_DIR)/log/unpatch; \ - echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \ - exit 1; \ - fi; \ - else \ - echo "nothing to do."; \ - fi - -# Clean the generated maintainer scripts. -.PHONY: cleanscripts -cleanscripts: - rm -f $(STAMP_DIR)/genscripts - rm -f debian/*.config \ - debian/*.postinst \ - debian/*.postrm \ - debian/*.preinst \ - debian/*.prerm - -# Clean the package build tree. -.PHONY: xsfclean -xsfclean: cleanscripts unpatch - dh_testdir - rm -rf .pc - rm -rf $(STAMP_DIR) - dh_clean - -# Remove files from the upstream source tree that we don't need, or which have -# licensing problems. It must be run before creating the .orig.tar.gz. -# -# Note: This rule is for Debian package maintainers' convenience, and is not -# needed for conventional build scenarios. -.PHONY: prune-upstream-tree -prune-upstream-tree: - # Ensure we're in the correct directory. - dh_testdir - grep -rvh '^#' debian/prune/ | xargs --no-run-if-empty rm -rf - -# Verify that there are no offsets or fuzz in the patches we apply. -# -# Note: This rule is for Debian package maintainers' convenience, and is not -# needed for conventional build scenarios. -.PHONY: patch-audit -patch-audit: prepare unpatch - @echo -n "Auditing patches..."; \ - >$(STAMP_DIR)/log/patch; \ - FUZZY=; \ - while [ -n "$$($(QUILT) next)" ]; do \ - RESULT=$$($(QUILT) push -v | tee -a $(STAMP_DIR)/log/patch | grep ^Hunk | sed 's/^Hunk.*\(succeeded\|FAILED\).*/\1/');\ - case "$$RESULT" in \ - succeeded) \ - echo "fuzzy patch: $$($(QUILT) top)" \ - | tee -a $(STAMP_DIR)/log/$$($(QUILT) top); \ - FUZZY=yes; \ - ;; \ - FAILED) \ - echo "broken patch: $$($(QUILT) next)" \ - | tee -a $(STAMP_DIR)/log/$$($(QUILT) next); \ - exit 1; \ - ;; \ - esac; \ - done; \ - if [ -n "$$FUZZY" ]; then \ - echo "there were fuzzy patches; please fix."; \ - exit 1; \ - else \ - echo "done."; \ - fi - -# Generate the maintainer scripts. -.PHONY: genscripts -stampdir_targets+=genscripts -genscripts: $(STAMP_DIR)/genscripts -$(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir - for FILE in debian/*.config.in \ - debian/*.postinst.in \ - debian/*.postrm.in \ - debian/*.preinst.in \ - debian/*.prerm.in; do \ - if [ -e "$$FILE" ]; then \ - MAINTSCRIPT=$$(echo $$FILE | sed 's/.in$$//'); \ - sed -n '1,/^#INCLUDE_SHELL_LIB#$$/p' <$$FILE \ - | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >$$MAINTSCRIPT.tmp; \ - cat debian/xsfbs/xsfbs.sh >>$$MAINTSCRIPT.tmp; \ - sed -n '/^#INCLUDE_SHELL_LIB#$$/,$$p' <$$FILE \ - | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \ - sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \ - -e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \ - <$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \ - rm $$MAINTSCRIPT.tmp; \ - fi; \ - done - # Validate syntax of generated shell scripts. - #sh debian/scripts/validate-posix-sh debian/*.config \ - # debian/*.postinst \ - # debian/*.postrm \ - # debian/*.preinst \ - # debian/*.prerm - >$@ - -# Compute dependencies for drivers -# -VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null) -INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null) - -# these two can be removed post-squeeze -VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) -INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) -VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI), xorg-driver-video -INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI), xorg-driver-input - -ifeq ($(PACKAGE),) -PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) -endif - -.PHONY: serverabi -serverabi: install -ifeq ($(VIDEODEP),) - @echo 'error: xserver-xorg-dev >= 1.7.6.901 needs to be installed' - @exit 1 -else - echo "xviddriver:Depends=$(VIDEODEP)" >> debian/$(PACKAGE).substvars - echo "xinpdriver:Depends=$(INPUTDEP)" >> debian/$(PACKAGE).substvars - # the following is there for compatibility... - echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars - echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars - echo "xserver:Depends=$(VIDEODEP), $(INPUTDEP)" >> debian/$(PACKAGE).substvars -endif - -# vim:set noet ai sts=8 sw=8 tw=0: diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh deleted file mode 100644 index 813fd8d..0000000 --- a/debian/xsfbs/xsfbs.sh +++ /dev/null @@ -1,622 +0,0 @@ -# This is the X Strike Force shell library for X Window System package -# maintainer scripts. It serves to define shell functions commonly used by -# such packages, and performs some error checking necessary for proper operation -# of those functions. By itself, it does not "do" much; the maintainer scripts -# invoke the functions defined here to accomplish package installation and -# removal tasks. - -# If you are reading this within a Debian package maintainer script (e.g., -# /var/lib/dpkg/info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can -# skip past this library by scanning forward in this file to the string -# "GOBSTOPPER". - -SOURCE_VERSION=@SOURCE_VERSION@ -OFFICIAL_BUILD=@OFFICIAL_BUILD@ - -# Use special abnormal exit codes so that problems with this library are more -# easily tracked down. -SHELL_LIB_INTERNAL_ERROR=86 -SHELL_LIB_THROWN_ERROR=74 -SHELL_LIB_USAGE_ERROR=99 - -# old -> new variable names -if [ -z "$DEBUG_XORG_PACKAGE" ] && [ -n "$DEBUG_XFREE86_PACKAGE" ]; then - DEBUG_XORG_PACKAGE="$DEBUG_XFREE86_PACKAGE" -fi -if [ -z "$DEBUG_XORG_DEBCONF" ] && [ -n "$DEBUG_XFREE86_DEBCONF" ]; then - DEBUG_XORG_DEBCONF="$DEBUG_XFREE86_DEBCONF" -fi - -# initial sanity checks -if [ -z "$THIS_PACKAGE" ]; then - cat >&2 <<EOF -Error: package maintainer script attempted to use shell library without -definining \$THIS_PACKAGE shell variable. Please report the package name, -version, and the text of this error message to the Debian Bug Tracking System. -Visit <http://www.debian.org/Bugs/Reporting> on the World Wide Web for -instructions, read the file /usr/share/doc/debian/bug-reporting.txt from the -"doc-debian" package, or install the "reportbug" package and use the command of -the same name to file a report against version $SOURCE_VERSION of this package. -EOF - exit $SHELL_LIB_USAGE_ERROR -fi - -if [ -z "$THIS_SCRIPT" ]; then - cat >&2 <<EOF -Error: package maintainer script attempted to use shell library without -definining \$THIS_SCRIPT shell variable. Please report the package name, -version, and the text of this error message to the Debian Bug Tracking System. -Visit <http://www.debian.org/Bugs/Reporting> on the World Wide Web for -instructions, read the file /usr/share/doc/debian/bug-reporting.txt from the -"doc-debian" package, or install the "reportbug" package and use the command of -the same name to file a report against version $SOURCE_VERSION of the -"$THIS_PACKAGE" package. -EOF - exit $SHELL_LIB_USAGE_ERROR -fi - -if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then - RECONFIGURE="true" -else - RECONFIGURE= -fi - -if ([ "$1" = "install" ] || [ "$1" = "configure" ]) && [ -z "$2" ]; then - FIRSTINST="yes" -fi - -if [ -z "$RECONFIGURE" ] && [ -z "$FIRSTINST" ]; then - UPGRADE="yes" -fi - -trap "message;\ - message \"Received signal. Aborting $THIS_PACKAGE package $THIS_SCRIPT script.\";\ - message;\ - exit 1" HUP INT QUIT TERM - -reject_nondigits () { - # syntax: reject_nondigits [ operand ... ] - # - # scan operands (typically shell variables whose values cannot be trusted) for - # characters other than decimal digits and barf if any are found - while [ -n "$1" ]; do - # does the operand contain anything but digits? - if ! expr "$1" : "[[:digit:]]\+$" > /dev/null 2>&1; then - # can't use die(), because it wraps message() which wraps this function - echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_nondigits() encountered" \ - "possibly malicious garbage \"$1\"" >&2 - exit $SHELL_LIB_THROWN_ERROR - fi - shift - done -} - -reject_unlikely_path_chars () { - # syntax: reject_unlikely_path_chars [ operand ... ] - # - # scan operands (typically shell variables whose values cannot be trusted) for - # characters unlikely to be seen in a path and which the shell might - # interpret and barf if any are found - while [ -n "$1" ]; do - # does the operand contain any funny characters? - if expr "$1" : '.*[!$&()*;<>?|].*' > /dev/null 2>&1; then - # can't use die(), because I want to avoid forward references - echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_unlikely_path_chars()" \ - "encountered possibly malicious garbage \"$1\"" >&2 - exit $SHELL_LIB_THROWN_ERROR - fi - shift - done -} - -# Query the terminal to establish a default number of columns to use for -# displaying messages to the user. This is used only as a fallback in the -# event the COLUMNS variable is not set. ($COLUMNS can react to SIGWINCH while -# the script is running, and this cannot, only being calculated once.) -DEFCOLUMNS=$(stty size 2> /dev/null | awk '{print $2}') || true -if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" > /dev/null 2>&1; then - DEFCOLUMNS=80 -fi - -message () { - # pretty-print messages of arbitrary length - reject_nondigits "$COLUMNS" - echo "$*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS} >&2 -} - -observe () { - # syntax: observe message ... - # - # issue observational message suitable for logging someday when support for - # it exists in dpkg - if [ -n "$DEBUG_XORG_PACKAGE" ]; then - message "$THIS_PACKAGE $THIS_SCRIPT note: $*" - fi -} - -warn () { - # syntax: warn message ... - # - # issue warning message suitable for logging someday when support for - # it exists in dpkg; also send to standard error - message "$THIS_PACKAGE $THIS_SCRIPT warning: $*" -} - -die () { - # syntax: die message ... - # - # exit script with error message - message "$THIS_PACKAGE $THIS_SCRIPT error: $*" - exit $SHELL_LIB_THROWN_ERROR -} - -internal_error () { - # exit script with error; essentially a "THIS SHOULD NEVER HAPPEN" message - message "internal error: $*" - if [ -n "$OFFICIAL_BUILD" ]; then - message "Please report a bug in the $THIS_SCRIPT script of the" \ - "$THIS_PACKAGE package, version $SOURCE_VERSION to the Debian Bug" \ - "Tracking System. Include all messages above that mention the" \ - "$THIS_PACKAGE package. Visit " \ - "<http://www.debian.org/Bugs/Reporting> on the World Wide Web for" \ - "instructions, read the file" \ - "/usr/share/doc/debian/bug-reporting.txt from the doc-debian" \ - "package, or install the reportbug package and use the command of" \ - "the same name to file a report." - fi - exit $SHELL_LIB_INTERNAL_ERROR -} - -usage_error () { - message "usage error: $*" - message "Please report a bug in the $THIS_SCRIPT script of the" \ - "$THIS_PACKAGE package, version $SOURCE_VERSION to the Debian Bug" \ - "Tracking System. Include all messages above that mention the" \ - "$THIS_PACKAGE package. Visit " \ - "<http://www.debian.org/Bugs/Reporting> on the World Wide Web for" \ - "instructions, read the file" \ - "/usr/share/doc/debian/bug-reporting.txt from the doc-debian" \ - "package, or install the reportbug package and use the command of" \ - "the same name to file a report." - exit $SHELL_LIB_USAGE_ERROR -} - -font_update () { - # run $UPDATECMDS in $FONTDIRS - - local dir cmd shortcmd x_font_dir_prefix - - x_font_dir_prefix="/usr/share/fonts/X11" - - if [ -z "$UPDATECMDS" ]; then - usage_error "font_update() called but \$UPDATECMDS not set" - fi - if [ -z "$FONTDIRS" ]; then - usage_error "font_update() called but \$FONTDIRS not set" - fi - - reject_unlikely_path_chars "$UPDATECMDS" - reject_unlikely_path_chars "$FONTDIRS" - - for dir in $FONTDIRS; do - if [ -d "$x_font_dir_prefix/$dir" ]; then - for cmd in $UPDATECMDS; do - if which "$cmd" > /dev/null 2>&1; then - shortcmd=${cmd##*/} - observe "running $shortcmd in $dir font directory" - cmd_opts= - if [ "$shortcmd" = "update-fonts-alias" ]; then - cmd_opts=--x11r7-layout - fi - if [ "$shortcmd" = "update-fonts-dir" ]; then - cmd_opts=--x11r7-layout - fi - if [ "$shortcmd" = "update-fonts-scale" ]; then - cmd_opts=--x11r7-layout - fi - $cmd $cmd_opts $dir || warn "$cmd $cmd_opts $dir" \ - "failed; font directory data may not" \ - "be up to date" - else - warn "$cmd not found; not updating corresponding $dir font" \ - "directory data" - fi - done - else - warn "$dir is not a directory; not updating font directory data" - fi - done -} - -remove_conffile_prepare () { - # syntax: remove_conffile_prepare filename official_md5sum ... - # - # Check a conffile "filename" against a list of canonical MD5 checksums. - # If the file's current MD5 checksum matches one of the "official_md5sum" - # operands provided, then prepare the conffile for removal from the system. - # We defer actual deletion until the package is configured so that we can - # roll this operation back if package installation fails. - # - # Call this function from a preinst script in the event $1 is "upgrade" or - # "install" and verify $2 to ensure the package is being upgraded from a - # version (or installed over a version removed-but-not-purged) prior to the - # one in which the conffile was obsoleted. - - local conffile current_checksum - - # validate arguments - if [ $# -lt 2 ]; then - usage_error "remove_conffile_prepare() called with wrong number of" \ - "arguments; expected at least 2, got $#" - exit $SHELL_LIB_USAGE_ERROR - fi - - conffile="$1" - shift - - # does the conffile even exist? - if [ -e "$conffile" ]; then - # calculate its checksum - current_checksum=$(md5sum < "$conffile" | sed 's/[[:space:]].*//') - # compare it to each supplied checksum - while [ -n "$1" ]; do - if [ "$current_checksum" = "$1" ]; then - # we found a match; move the confffile and stop looking - observe "preparing obsolete conffile $conffile for removal" - mv "$conffile" "$conffile.$THIS_PACKAGE-tmp" - break - fi - shift - done - fi -} - -remove_conffile_lookup () { - # syntax: remove_conffile_lookup package filename - # - # Lookup the md5sum of a conffile in dpkg's database, and prepare for removal - # if it matches the actual file's md5sum. - # - # Call this function when you would call remove_conffile_prepare but only - # want to check against dpkg's status database instead of known checksums. - - local package conffile old_md5sum - - # validate arguments - if [ $# -ne 2 ]; then - usage_error "remove_conffile_lookup() called with wrong number of" \ - "arguments; expected 1, got $#" - exit $SHELL_LIB_USAGE_ERROR - fi - - package="$1" - conffile="$2" - - if ! [ -e "$conffile" ]; then - return - fi - old_md5sum="$(dpkg-query -W -f='${Conffiles}' "$package" | \ - awk '{ if (match($0, "^ '"$conffile"' ")) print $2}')" - if [ -n "$old_md5sum" ]; then - remove_conffile_prepare "$conffile" "$old_md5sum" - fi -} - -remove_conffile_commit () { - # syntax: remove_conffile_commit filename - # - # Complete the removal of a conffile "filename" that has become obsolete. - # - # Call this function from a postinst script after having used - # remove_conffile_prepare() in the preinst. - - local conffile - - # validate arguments - if [ $# -ne 1 ]; then - usage_error "remove_conffile_commit() called with wrong number of" \ - "arguments; expected 1, got $#" - exit $SHELL_LIB_USAGE_ERROR - fi - - conffile="$1" - - # if the temporary file created by remove_conffile_prepare() exists, remove it - if [ -e "$conffile.$THIS_PACKAGE-tmp" ]; then - observe "committing removal of obsolete conffile $conffile" - rm "$conffile.$THIS_PACKAGE-tmp" - fi -} - -remove_conffile_rollback () { - # syntax: remove_conffile_rollback filename - # - # Roll back the removal of a conffile "filename". - # - # Call this function from a postrm script in the event $1 is "abort-upgrade" - # or "abort-install" is after having used remove_conffile_prepare() in the - # preinst. - - local conffile - - # validate arguments - if [ $# -ne 1 ]; then - usage_error "remove_conffile_rollback() called with wrong number of" \ - "arguments; expected 1, got $#" - exit $SHELL_LIB_USAGE_ERROR - fi - - conffile="$1" - - # if the temporary file created by remove_conffile_prepare() exists, move it - # back - if [ -e "$conffile.$THIS_PACKAGE-tmp" ]; then - observe "rolling back removal of obsolete conffile $conffile" - mv "$conffile.$THIS_PACKAGE-tmp" "$conffile" - fi -} - -replace_conffile_with_symlink_prepare () { - # syntax: replace_conffile_with_symlink_prepare oldfilename newfilename \ - # official_md5sum ... - # - # Check a conffile "oldfilename" against a list of canonical MD5 checksums. - # If the file's current MD5 checksum matches one of the "official_md5sum" - # operands provided, then prepare the conffile for removal from the system. - # We defer actual deletion until the package is configured so that we can - # roll this operation back if package installation fails. Otherwise copy it - # to newfilename and let dpkg handle it through conffiles mechanism. - # - # Call this function from a preinst script in the event $1 is "upgrade" or - # "install" and verify $2 to ensure the package is being upgraded from a - # version (or installed over a version removed-but-not-purged) prior to the - # one in which the conffile was obsoleted. - - local conffile current_checksum - - # validate arguments - if [ $# -lt 3 ]; then - usage_error "replace_conffile_with_symlink_prepare() called with wrong" \ - " number of arguments; expected at least 3, got $#" - exit $SHELL_LIB_USAGE_ERROR - fi - - oldconffile="$1" - shift - newconffile="$1" - shift - - remove_conffile_prepare "$_oldconffile" "$@" - # If $oldconffile still exists, then md5sums didn't match. - # Copy it to new one. - if [ -f "$oldconffile" ]; then - cp "$oldconffile" "$newconffile" - fi - -} - -replace_conffile_with_symlink_commit () { - # syntax: replace_conffile_with_symlink_commit oldfilename - # - # Complete the removal of a conffile "oldfilename" that has been - # replaced by a symlink. - # - # Call this function from a postinst script after having used - # replace_conffile_with_symlink_prepare() in the preinst. - - local conffile - - # validate arguments - if [ $# -ne 1 ]; then - usage_error "replace_conffile_with_symlink_commit() called with wrong" \ - "number of arguments; expected 1, got $#" - exit $SHELL_LIB_USAGE_ERROR - fi - - conffile="$1" - - remove_conffile_commit "$conffile" -} - -replace_conffile_with_symlink_rollback () { - # syntax: replace_conffile_with_symlink_rollback oldfilename newfilename - # - # Roll back the replacing of a conffile "oldfilename" with symlink to - # "newfilename". - # - # Call this function from a postrm script in the event $1 is "abort-upgrade" - # or "abort-install" and verify $2 to ensure the package failed to upgrade - # from a version (or install over a version removed-but-not-purged) prior - # to the one in which the conffile was obsoleted. - # You should have used replace_conffile_with_symlink_prepare() in the - # preinst. - - local conffile - - # validate arguments - if [ $# -ne 2 ]; then - usage_error "replace_conffile_with_symlink_rollback() called with wrong" \ - "number of arguments; expected 2, got $#" - exit $SHELL_LIB_USAGE_ERROR - fi - - oldconffile="$1" - newconffile="$2" - - remove_conffile_rollback "$_oldconffile" - if [ -f "$newconffile" ]; then - rm "$newconffile" - fi -} - -run () { - # syntax: run command [ argument ... ] - # - # Run specified command with optional arguments and report its exit status. - # Useful for commands whose exit status may be nonzero, but still acceptable, - # or commands whose failure is not fatal to us. - # - # NOTE: Do *not* use this function with db_get or db_metaget commands; in - # those cases the return value of the debconf command *must* be checked - # before the string returned by debconf is used for anything. - - local retval - - # validate arguments - if [ $# -lt 1 ]; then - usage_error "run() called with wrong number of arguments; expected at" \ - "least 1, got $#" - exit $SHELL_LIB_USAGE_ERROR - fi - - "$@" || retval=$? - - if [ ${retval:-0} -ne 0 ]; then - observe "command \"$*\" exited with status $retval" - fi -} - -make_symlink_sane () { - # syntax: make_symlink_sane symlink target - # - # Ensure that the symbolic link symlink exists, and points to target. - # - # If symlink does not exist, create it and point it at target. - # - # If symlink exists but is not a symbolic link, back it up. - # - # If symlink exists, is a symbolic link, but points to the wrong location, fix - # it. - # - # If symlink exists, is a symbolic link, and already points to target, do - # nothing. - # - # This function wouldn't be needed if ln had an -I, --idempotent option. - - # Validate arguments. - if [ $# -ne 2 ]; then - usage_error "make_symlink_sane() called with wrong number of arguments;" \ - "expected 2, got $#" - exit $SHELL_LIB_USAGE_ERROR - fi - - # We could just use the positional parameters as-is, but that makes things - # harder to follow. - local symlink target - - symlink="$1" - target="$2" - - if [ -L "$symlink" ] && [ "$(readlink "$symlink")" = "$target" ]; then - observe "link from $symlink to $target already exists" - else - observe "creating symbolic link from $symlink to $target" - mkdir -p "${target%/*}" "${symlink%/*}" - ln -s -b -S ".dpkg-old" "$target" "$symlink" - fi -} - -migrate_dir_to_symlink () { - # syntax: migrate_dir_to_symlink old_location new_location - # - # Per Debian Policy section 6.5.4, "A directory will never be replaced by a - # symbolic link to a directory or vice versa; instead, the existing state - # (symlink or not) will be left alone and dpkg will follow the symlink if - # there is one." - # - # We have to do it ourselves. - # - # This function moves the contents of old_location, a directory, into - # new_location, a directory, then makes old_location a symbolic link to - # new_location. - # - # old_location need not exist, but if it does, it must be a directory (or a - # symlink to a directory). If it is not, it is backed up. If new_location - # exists already and is not a directory, it is backed up. - # - # This function should be called from a package's preinst so that other - # packages unpacked after this one --- but before this package's postinst runs - # --- are unpacked into new_location even if their payloads contain - # old_location filespecs. - - # Validate arguments. - if [ $# -ne 2 ]; then - usage_error "migrate_dir_to_symlink() called with wrong number of" - "arguments; expected 2, got $#" - exit $SHELL_LIB_USAGE_ERROR - fi - - # We could just use the positional parameters as-is, but that makes things - # harder to follow. - local new old - - old="$1" - new="$2" - - # Is old location a symlink? - if [ -L "$old" ]; then - # Does it already point to new location? - if [ "$(readlink "$old")" = "$new" ]; then - # Nothing to do; migration has already been done. - observe "migration of $old to $new already done" - return 0 - else - # Back it up. - warn "backing up symbolic link $old as $old.dpkg-old" - mv -b "$old" "$old.dpkg-old" - fi - fi - - # Does old location exist, but is not a directory? - if [ -e "$old" ] && ! [ -d "$old" ]; then - # Back it up. - warn "backing up non-directory $old as $old.dpkg-old" - mv -b "$old" "$old.dpkg-old" - fi - - observe "migrating $old to $new" - - # Is new location a symlink? - if [ -L "$new" ]; then - # Does it point the wrong way, i.e., back to where we're migrating from? - if [ "$(readlink "$new")" = "$old" ]; then - # Get rid of it. - observe "removing symbolic link $new which points to $old" - rm "$new" - else - # Back it up. - warn "backing up symbolic link $new as $new.dpkg-old" - mv -b "$new" "$new.dpkg-old" - fi - fi - - # Does new location exist, but is not a directory? - if [ -e "$new" ] && ! [ -d "$new" ]; then - warn "backing up non-directory $new as $new.dpkg-old" - mv -b "$new" "$new.dpkg-old" - fi - - # Create new directory if it does not yet exist. - if ! [ -e "$new" ]; then - observe "creating $new" - mkdir -p "$new" - fi - - # Copy files in old location to new location. Back up any filenames that - # already exist in the new location with the extension ".dpkg-old". - observe "copying files from $old to $new" - if ! (cd "$old" && cp -a -b -S ".dpkg-old" . "$new"); then - die "error(s) encountered while copying files from $old to $new" - fi - - # Remove files at old location. - observe "removing $old" - rm -r "$old" - - # Create symlink from old location to new location. - make_symlink_sane "$old" "$new" -} - -# vim:set ai et sw=2 ts=2 tw=80: - -# GOBSTOPPER: The X Strike Force shell library ends here. diff --git a/docbook.am b/docbook.am new file mode 100644 index 0000000..bba4d54 --- /dev/null +++ b/docbook.am @@ -0,0 +1,105 @@ +# +# Generate output formats for a single DocBook/XML with/without chapters +# +# Variables set by the calling Makefile: +# shelfdir: the location where the docs/specs are installed. Typically $(docdir) +# docbook: the main DocBook/XML file, no chapters, appendix or image files +# chapters: all files pulled in by an XInclude statement and images. +# + +# +# This makefile is intended for Users Documentation and Functional Specifications. +# Do not use for Developer Documentation which is not installed and does not require olink. +# Refer to http://www.x.org/releases/X11R7.6/doc/xorg-docs/ReleaseNotes.html#id2584393 +# for an explanation on documents classification. +# + +# DocBook/XML generated output formats to be installed +shelf_DATA = + +# DocBook/XML file with chapters, appendix and images it includes +dist_shelf_DATA = $(docbook) $(chapters) + +if HAVE_XMLTO +if HAVE_STYLESHEETS + +XMLTO_SEARCHPATH_FLAGS = \ + --searchpath "$(XORG_SGML_PATH)/X11" \ + --searchpath "$(abs_top_builddir)" +XMLTO_HTML_OLINK_FLAGS = \ + --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.html.xml \ + --stringparam current.docid="$(<:.xml=)" +XMLTO_HTML_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl +XMLTO_HTML_FLAGS = \ + $(XMLTO_SEARCHPATH_FLAGS) \ + $(XMLTO_HTML_STYLESHEET_FLAGS) \ + $(XMLTO_HTML_OLINK_FLAGS) + +shelf_DATA += $(docbook:.xml=.html) +%.html: %.xml $(chapters) + $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) xhtml-nochunks $< + +if HAVE_XMLTO_TEXT + +shelf_DATA += $(docbook:.xml=.txt) +%.txt: %.xml $(chapters) + $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) txt $< +endif HAVE_XMLTO_TEXT + +if HAVE_FOP +XMLTO_FO_IMAGEPATH_FLAGS = --stringparam img.src.path=$(abs_builddir)/ +XMLTO_PDF_OLINK_FLAGS = \ + --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.pdf.xml \ + --stringparam current.docid="$(<:.xml=)" +XMLTO_FO_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl + +XMLTO_FO_FLAGS = \ + $(XMLTO_SEARCHPATH_FLAGS) \ + $(XMLTO_FO_STYLESHEET_FLAGS) \ + $(XMLTO_FO_IMAGEPATH_FLAGS) \ + $(XMLTO_PDF_OLINK_FLAGS) + +shelf_DATA += $(docbook:.xml=.pdf) +%.pdf: %.xml $(chapters) + $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop pdf $< + +shelf_DATA += $(docbook:.xml=.ps) +%.ps: %.xml $(chapters) + $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop ps $< +endif HAVE_FOP + +# Generate documents cross-reference target databases +if HAVE_XSLTPROC + +XSLT_SEARCHPATH_FLAGS = \ + --path "$(XORG_SGML_PATH)/X11" \ + --path "$(abs_top_builddir)" +XSLT_OLINK_FLAGS = \ + --stringparam targets.filename "$@" \ + --stringparam collect.xref.targets "only" \ + --stringparam olink.base.uri "$(@:.db=)" + +XSLT_HTML_FLAGS = \ + $(XSLT_SEARCHPATH_FLAGS) \ + $(XSLT_OLINK_FLAGS) \ + --nonet --xinclude \ + $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl +XSLT_PDF_FLAGS = \ + $(XSLT_SEARCHPATH_FLAGS) \ + $(XSLT_OLINK_FLAGS) \ + --nonet --xinclude \ + $(STYLESHEET_SRCDIR)/xorg-fo.xsl + +shelf_DATA += $(docbook:.xml=.html.db) +%.html.db: %.xml $(chapters) + $(AM_V_GEN)$(XSLTPROC) $(XSLT_HTML_FLAGS) $< + +shelf_DATA += $(docbook:.xml=.pdf.db) +%.pdf.db: %.xml $(chapters) + $(AM_V_GEN)$(XSLTPROC) $(XSLT_PDF_FLAGS) $< + +endif HAVE_XSLTPROC +endif HAVE_STYLESHEETS +endif HAVE_XMLTO + +CLEANFILES = $(shelf_DATA) diff --git a/include/X11/extensions/XTest.h b/include/X11/extensions/XTest.h index f973aeb..f973aeb 100755..100644 --- a/include/X11/extensions/XTest.h +++ b/include/X11/extensions/XTest.h diff --git a/man/Makefile.am b/man/Makefile.am index 2597d07..2597d07 100755..100644 --- a/man/Makefile.am +++ b/man/Makefile.am diff --git a/man/XTest.xml b/man/XTest.xml index 0c33ed8..9d21ef7 100755..100644 --- a/man/XTest.xml +++ b/man/XTest.xml @@ -1,24 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" - "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" + "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"> <!-- lifted from troff+man by doclifter --> <refentry id='XTest.man'> -<!-- +<!-- Copyright © 1992 by UniSoft Group Ltd. Permission to use, copy, modify, and distribute this documentation for any purpose and without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies. -UniSoft makes no representations about the suitability for any purpose of +copyright notice and this permission notice appear in all copies. +UniSoft makes no representations about the suitability for any purpose of the information in this document. This documentation is provided "as is" without express or implied warranty. Copyright © 1992, 1994 X Consortium -Permission is hereby granted, free of charge, to any person obtaining a +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in @@ -26,15 +26,15 @@ 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 X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE X CONSORTIUM 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 +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 X Consortium 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 +be used in advertising or otherwise to promote the sale, use or other +dealings in this Software without prior written authorization from the X Consortium. --> @@ -207,7 +207,7 @@ cc [ flag ... ] file ... -lXtst [ library ... ] <para>This extension is a minimal set of client and server extensions required to completely test the X11 server with no user intervention. This extension is not intended to support general journaling and -playback of user actions.</para> +playback of user actions.</para> <para>The functions provided by this extension fall into two groups:</para> <variablelist remap='IP'> @@ -218,7 +218,7 @@ playback of user actions.</para> actual implementation will depend on the details of the actual language binding and what degree of request buffering, GContext caching, and so on, is provided. In the C binding, routines are provided -to access the internals of two opaque data structures +to access the internals of two opaque data structures — <structname>GC</structname>s and <structname>Visual</structname>s — @@ -236,7 +236,7 @@ number to the server and for the server to respond with major and minor versions of its own. The remaining two requests allow the following:</para> <itemizedlist> <listitem> -<para>Access to an otherwise <emphasis>write-only</emphasis> server resource: +<para>Access to an otherwise <emphasis>write-only</emphasis> server resource: the cursor associated with a given window</para> </listitem> <listitem> @@ -278,12 +278,12 @@ with the cursor of the window specified by window returning <returnvalue>True</returnvalue> if they are the same and <returnvalue>False</returnvalue> -otherwise. +otherwise. If the extension is not supported, then the request is ignored and zero is returned.</para> -<para>If the extension is supported, +<para>If the extension is supported, <function>XTestCompareCurrentCursorWithWindow</function> performs a comparison of the current cursor with the cursor of the specified window returning diff --git a/man/XTestCompareCurrentCursorWithWindow.man b/man/XTestCompareCurrentCursorWithWindow.man index 7d905aa..4373039 100644 --- a/man/XTestCompareCurrentCursorWithWindow.man +++ b/man/XTestCompareCurrentCursorWithWindow.man @@ -1 +1 @@ -.so man__libmansuffix__/XTestQueryExtension.__libmansuffix__ +.so XTestQueryExtension.__libmansuffix__ diff --git a/man/XTestCompareCursorWithWindow.man b/man/XTestCompareCursorWithWindow.man index 7d905aa..4373039 100644 --- a/man/XTestCompareCursorWithWindow.man +++ b/man/XTestCompareCursorWithWindow.man @@ -1 +1 @@ -.so man__libmansuffix__/XTestQueryExtension.__libmansuffix__ +.so XTestQueryExtension.__libmansuffix__ diff --git a/man/XTestDiscard.man b/man/XTestDiscard.man index 7d905aa..4373039 100644 --- a/man/XTestDiscard.man +++ b/man/XTestDiscard.man @@ -1 +1 @@ -.so man__libmansuffix__/XTestQueryExtension.__libmansuffix__ +.so XTestQueryExtension.__libmansuffix__ diff --git a/man/XTestFakeButtonEvent.man b/man/XTestFakeButtonEvent.man index 7d905aa..4373039 100644 --- a/man/XTestFakeButtonEvent.man +++ b/man/XTestFakeButtonEvent.man @@ -1 +1 @@ -.so man__libmansuffix__/XTestQueryExtension.__libmansuffix__ +.so XTestQueryExtension.__libmansuffix__ diff --git a/man/XTestFakeKeyEvent.man b/man/XTestFakeKeyEvent.man index 7d905aa..4373039 100644 --- a/man/XTestFakeKeyEvent.man +++ b/man/XTestFakeKeyEvent.man @@ -1 +1 @@ -.so man__libmansuffix__/XTestQueryExtension.__libmansuffix__ +.so XTestQueryExtension.__libmansuffix__ diff --git a/man/XTestFakeMotionEvent.man b/man/XTestFakeMotionEvent.man index 7d905aa..4373039 100644 --- a/man/XTestFakeMotionEvent.man +++ b/man/XTestFakeMotionEvent.man @@ -1 +1 @@ -.so man__libmansuffix__/XTestQueryExtension.__libmansuffix__ +.so XTestQueryExtension.__libmansuffix__ diff --git a/man/XTestFakeRelativeMotionEvent.man b/man/XTestFakeRelativeMotionEvent.man index 7d905aa..4373039 100644 --- a/man/XTestFakeRelativeMotionEvent.man +++ b/man/XTestFakeRelativeMotionEvent.man @@ -1 +1 @@ -.so man__libmansuffix__/XTestQueryExtension.__libmansuffix__ +.so XTestQueryExtension.__libmansuffix__ diff --git a/man/XTestGrabControl.man b/man/XTestGrabControl.man index 7d905aa..4373039 100644 --- a/man/XTestGrabControl.man +++ b/man/XTestGrabControl.man @@ -1 +1 @@ -.so man__libmansuffix__/XTestQueryExtension.__libmansuffix__ +.so XTestQueryExtension.__libmansuffix__ diff --git a/man/XTestQueryExtension.man b/man/XTestQueryExtension.man index 0370bca..41da9f3 100755..100644 --- a/man/XTestQueryExtension.man +++ b/man/XTestQueryExtension.man @@ -1,152 +1,216 @@ -.\" ** You probably do not want to edit this file directly ** -.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). -.\" Instead of manually editing it, you probably should edit the DocBook XML -.\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "XTEST" "__libmansuffix__" "6 June 2007" "__xorgversion__" "XTST FUNCTIONS" +'\" t +.\" Title: XTest +.\" Author: Kieron Drake +.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> +.\" Date: <pubdate>6 June 2007</pubdate> +.\" Manual: XTST FUNCTIONS +.\" Source: __xorgversion__ +.\" Language: English +.\" +.TH "XTEST" "__libmansuffix__" "<pubdate>6 June 2007</pubdate>" "__xorgversion__" "XTST FUNCTIONS" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) .ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- .SH "NAME" XTestQueryExtension, XTestCompareCursorWithWindow, XTestCompareCurrentCursorWithWindow, XTestFakeKeyEvent, XTestFakeButtonEvent, XTestFakeMotionEvent, XTestFakeRelativeMotionEvent, XTestGrabControl, XTestSetGContextOfGC, XTestSetVisualIDOfVisual, XTestDiscard \- XTest extension functions .SH "SYNOPSIS" -.PP -\fB -cc [ flag ... ] file ... \-lXtst [ library ... ] -\fR -.PP -\fB -#include <X11/extensions/XTest.h> -\fR -.HP 25 -\fB\fBBool\fR\ XTestQueryExtension\fR\fB(\fR\fB\fIdisplay\fR\fR\fB, \fR\fB\fIevent_base_return\fR\fR\fB, \fR\fB\fIerror_base_return\fR\fR\fB, \fR\fB\fImajor_version_return\fR\fR\fB, \fR\fB\fIminor_version_return\fR\fR\fB);\fR -.PP -\fB +.sp +.ft B +.nf +cc [ flag \&.\&.\&. ] file \&.\&.\&. \-lXtst [ library \&.\&.\&. ] +.fi +.ft +.sp +.ft B +.nf +#include <X11/extensions/XTest\&.h> +.fi +.ft +.HP \w'Bool\ XTestQueryExtension('u +.BI "Bool XTestQueryExtension(" "display" ", " "event_base_return" ", " "error_base_return" ", " "major_version_return" ", " "minor_version_return" ");" +.sp +.ft B +.nf Display *display; int *event_base_return; int *error_base_return; int *major_version_return; int *minor_version_return; -\fR -.HP 34 -\fB\fBBool\fR\ XTestCompareCursorWithWindow\fR\fB(\fR\fB\fIdisplay\fR\fR\fB, \fR\fB\fIwindow\fR\fR\fB, \fR\fB\fIcursor\fR\fR\fB);\fR -.PP -\fB +.fi +.ft +.HP \w'Bool\ XTestCompareCursorWithWindow('u +.BI "Bool XTestCompareCursorWithWindow(" "display" ", " "window" ", " "cursor" ");" +.sp +.ft B +.nf Display *display; Window window; Cursor cursor; -\fR -.HP 41 -\fB\fBBool\fR\ XTestCompareCurrentCursorWithWindow\fR\fB(\fR\fB\fIdisplay\fR\fR\fB, \fR\fB\fIwindow\fR\fR\fB);\fR -.PP -\fB +.fi +.ft +.HP \w'Bool\ XTestCompareCurrentCursorWithWindow('u +.BI "Bool XTestCompareCurrentCursorWithWindow(" "display" ", " "window" ");" +.sp +.ft B +.nf Display *display; Window window; -\fR -.HP 22 -\fBint\ \fBXTestFakeKeyEvent\fR\fR\fB(\fR\fB\fIdisplay\fR\fR\fB, \fR\fB\fIkeycode\fR\fR\fB, \fR\fB\fIis_press\fR\fR\fB, \fR\fB\fIdelay\fR\fR\fB);\fR -.PP -\fB +.fi +.ft +.HP \w'int\ XTestFakeKeyEvent('u +.BI "int XTestFakeKeyEvent(" "display" ", " "keycode" ", " "is_press" ", " "delay" ");" +.sp +.ft B +.nf Display *display; unsigned int keycode; Bool is_press; unsigned long delay; -\fR -.HP 25 -\fBint\ \fBXTestFakeButtonEvent\fR\fR\fB(\fR\fB\fIdisplay\fR\fR\fB, \fR\fB\fIbutton\fR\fR\fB, \fR\fB\fIis_press\fR\fR\fB, \fR\fB\fIdelay\fR\fR\fB);\fR -.PP -\fB +.fi +.ft +.HP \w'int\ XTestFakeButtonEvent('u +.BI "int XTestFakeButtonEvent(" "display" ", " "button" ", " "is_press" ", " "delay" ");" +.sp +.ft B +.nf Display *display; unsigned int button; Bool is_press; unsigned long delay; -\fR -.HP 25 -\fBint\ \fBXTestFakeMotionEvent\fR\fR\fB(\fR\fB\fIdisplay\fR\fR\fB, \fR\fB\fIscreen_number\fR\fR\fB, \fR\fB\fIx\fR\fR\fB, \fR\fB\fIy\fR\fR\fB, \fR\fB\fIdelay\fR\fR\fB);\fR -.PP -\fB +.fi +.ft +.HP \w'int\ XTestFakeMotionEvent('u +.BI "int XTestFakeMotionEvent(" "display" ", " "screen_number" ", " "x" ", " "y" ", " "delay" ");" +.sp +.ft B +.nf Display *display; int screen_number; int x, y; unsigned long delay; -\fR -.HP 33 -\fBint\ \fBXTestFakeRelativeMotionEvent\fR\fR\fB(\fR\fB\fIdisplay\fR\fR\fB, \fR\fB\fIscreen_number\fR\fR\fB, \fR\fB\fIx\fR\fR\fB, \fR\fB\fIy\fR\fR\fB, \fR\fB\fIdelay\fR\fR\fB);\fR -.PP -\fB +.fi +.ft +.HP \w'int\ XTestFakeRelativeMotionEvent('u +.BI "int XTestFakeRelativeMotionEvent(" "display" ", " "screen_number" ", " "x" ", " "y" ", " "delay" ");" +.sp +.ft B +.nf Display *display; int screen_number; int x, y; unsigned long delay; -\fR -.HP 21 -\fBint\ \fBXTestGrabControl\fR\fR\fB(\fR\fB\fIdisplay\fR\fR\fB, \fR\fB\fIimpervious\fR\fR\fB);\fR -.PP -\fB +.fi +.ft +.HP \w'int\ XTestGrabControl('u +.BI "int XTestGrabControl(" "display" ", " "impervious" ");" +.sp +.ft B +.nf Display *display; Bool impervious; -\fR -.HP 26 -\fBvoid\ \fBXTestSetGContextOfGC\fR\fR\fB(\fR\fB\fIgc\fR\fR\fB, \fR\fB\fIgid\fR\fR\fB);\fR -.PP -\fB +.fi +.ft +.HP \w'void\ XTestSetGContextOfGC('u +.BI "void XTestSetGContextOfGC(" "gc" ", " "gid" ");" +.sp +.ft B +.nf GC gc; GContext gid; -\fR -.HP 30 -\fBvoid\ \fBXTestSetVisualIDOfVisual\fR\fR\fB(\fR\fB\fIvisual\fR\fR\fB, \fR\fB\fIvisualid\fR\fR\fB);\fR -.PP -\fB +.fi +.ft +.HP \w'void\ XTestSetVisualIDOfVisual('u +.BI "void XTestSetVisualIDOfVisual(" "visual" ", " "visualid" ");" +.sp +.ft B +.nf Visual *visual; VisualID visualid; -\fR -.HP 20 -\fB\fBStatus\fR\ XTestDiscard\fR\fB(\fR\fB\fIdisplay\fR\fR\fB);\fR -.PP -\fB +.fi +.ft +.HP \w'Status\ XTestDiscard('u +.BI "Status XTestDiscard(" "display" ");" +.sp +.ft B +.nf Display *display; -\fR +.fi +.ft .SH "DESCRIPTION" .PP -This extension is a minimal set of client and server extensions required to completely test the X11 server with no user intervention. This extension is not intended to support general journaling and playback of user actions. +This extension is a minimal set of client and server extensions required to completely test the X11 server with no user intervention\&. This extension is not intended to support general journaling and playback of user actions\&. .PP The functions provided by this extension fall into two groups: -.TP -\fIClient Operations\fR -These routines manipulate otherwise hidden client\-side behavior. The actual implementation will depend on the details of the actual language binding and what degree of request buffering, GContext caching, and so on, is provided. In the C binding, routines are provided to access the internals of two opaque data structures \(em +.PP +\fBClient Operations\fR +.RS 4 +These routines manipulate otherwise hidden client\-side behavior\&. The actual implementation will depend on the details of the actual language binding and what degree of request buffering, GContext caching, and so on, is provided\&. In the C binding, routines are provided to access the internals of two opaque data structures \(em GCs and -Visuals \(em and to discard any requests pending within the output buffer of a connection. The exact details can be expected to differ for other language bindings. -.TP -\fIServer Requests\fR -The first of these requests is similar to that provided in most extensions: it allows a client to specify a major and minor version number to the server and for the server to respond with major and minor versions of its own. The remaining two requests allow the following: -.RS -.TP 3 -\(bu +Visuals \(em and to discard any requests pending within the output buffer of a connection\&. The exact details can be expected to differ for other language bindings\&. +.RE +.PP +\fBServer Requests\fR +.RS 4 +The first of these requests is similar to that provided in most extensions: it allows a client to specify a major and minor version number to the server and for the server to respond with major and minor versions of its own\&. The remaining two requests allow the following: +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} Access to an otherwise \fIwrite\-only\fR server resource: the cursor associated with a given window -.TP -\(bu -Perhaps most importantly, limited synthesis of input device events, almost as if a cooperative user had moved the pointing device or pressed a key or button. +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +Perhaps most importantly, limited synthesis of input device events, almost as if a cooperative user had moved the pointing device or pressed a key or button\&. +.RE .RE .PP All XTEST extension functions and procedures, and all manifest constants and macros, will start with the string -\fIXTest\fR. All operations are classified as server/client (Server) or client\-only (Client). +\fIXTest\fR\&. All operations are classified as server/client (Server) or client\-only (Client)\&. .PP \fBXTestQueryExtension\fR returns True if the specified display supports the XTEST extension, else -False. If the extension is supported, *event_base would be set to the event number for the first event for this extension and *error_base would be set to the error number for the first error for this extension. As no errors or events are defined for this version of the extension, the values returned here are not defined (nor useful). If the extension is supported, *major_version and *minor_version are set to the major and minor version numbers of the extension supported by the display. Otherwise, none of the arguments are set. +False\&. If the extension is supported, *event_base would be set to the event number for the first event for this extension and *error_base would be set to the error number for the first error for this extension\&. As no errors or events are defined for this version of the extension, the values returned here are not defined (nor useful)\&. If the extension is supported, *major_version and *minor_version are set to the major and minor version numbers of the extension supported by the display\&. Otherwise, none of the arguments are set\&. .PP If the extension is supported, \fBXTestCompareCursorWithWindow\fR performs a comparison of the cursor whose ID is specified by cursor (which may be -\fINone\fR) with the cursor of the window specified by window returning +\fBNone\fR) with the cursor of the window specified by window returning True if they are the same and False -otherwise. If the extension is not supported, then the request is ignored and zero is returned. +otherwise\&. If the extension is not supported, then the request is ignored and zero is returned\&. .PP If the extension is supported, \fBXTestCompareCurrentCursorWithWindow\fR @@ -154,65 +218,71 @@ performs a comparison of the current cursor with the cursor of the specified win True if they are the same and False -otherwise. If the extension is not supported, then the request is ignored and zero is returned. +otherwise\&. If the extension is not supported, then the request is ignored and zero is returned\&. .PP If the extension is supported, \fBXTestFakeKeyEvent\fR requests the server to simulate either a -\fIKeyPress\fR +\fBKeyPress\fR (if is_press is True) or a -\fIKeyRelease\fR +\fBKeyRelease\fR (if is_press is -False) of the key with the specified keycode; otherwise, the request is ignored. +False) of the key with the specified keycode; otherwise, the request is ignored\&. .PP If the extension is supported, the simulated event will not be processed until delay milliseconds after the request is received (if delay is -\fICurrentTime\fR, then this is interpreted as no delay at all). No other requests from this client will be processed until this delay, if any, has expired and subsequent processing of the simulated event has been completed. +\fBCurrentTime\fR, then this is interpreted as no delay at all)\&. No other requests from this client will be processed until this delay, if any, has expired and subsequent processing of the simulated event has been completed\&. .PP If the extension is supported, \fBXTestFakeButtonEvent\fR requests the server to simulate either a -\fIButtonPress\fR +\fBButtonPress\fR (if is_press is True) or a -\fIButtonRelease\fR +\fBButtonRelease\fR (if is_press is -False) of the logical button numbered by the specified button; otherwise, the request is ignored. +False) of the logical button numbered by the specified button; otherwise, the request is ignored\&. .PP If the extension is supported, the simulated event will not be processed until delay milliseconds after the request is received (if delay is -\fICurrentTime\fR, then this is interpreted as no delay at all). No other requests from this client will be processed until this delay, if any, has expired and subsequent processing of the simulated event has been completed. +\fBCurrentTime\fR, then this is interpreted as no delay at all)\&. No other requests from this client will be processed until this delay, if any, has expired and subsequent processing of the simulated event has been completed\&. .PP If the extension is supported, \fBXTestFakeMotionEvent\fR -requests the server to simulate a movement of the pointer to the specified position (x, y) on the root window of screen_number; otherwise, the request is ignored. If screen_number is \-1, the current screen (that the pointer is on) is used. +requests the server to simulate a movement of the pointer to the specified position (x, y) on the root window of screen_number; otherwise, the request is ignored\&. If screen_number is \-1, the current screen (that the pointer is on) is used\&. .PP If the extension is supported, the simulated event will not be processed until delay milliseconds after the request is received (if delay is -\fICurrentTime\fR, then this is interpreted as no delay at all). No other requests from this client will be processed until this delay, if any, has expired and subsequent processing of the simulated event has been completed. +\fBCurrentTime\fR, then this is interpreted as no delay at all)\&. No other requests from this client will be processed until this delay, if any, has expired and subsequent processing of the simulated event has been completed\&. .PP If the extension is supported, \fBXTestFakeRelativeMotionEvent\fR -requests the server to simulate a movement of the pointer by the specified offsets (x, y) relative to the current pointer position on screen_number; otherwise, the request is ignored. If screen_number is \-1, the current screen (that the pointer is on) is used. +requests the server to simulate a movement of the pointer by the specified offsets (x, y) relative to the current pointer position on screen_number; otherwise, the request is ignored\&. If screen_number is \-1, the current screen (that the pointer is on) is used\&. .PP If the extension is supported, the simulated event will not be processed until delay milliseconds after the request is received (if delay is -\fICurrentTime\fR, then this is interpreted as no delay at all). No other requests from this client will be processed until this delay, if any, has expired and subsequent processing of the simulated event has been completed. +\fBCurrentTime\fR, then this is interpreted as no delay at all)\&. No other requests from this client will be processed until this delay, if any, has expired and subsequent processing of the simulated event has been completed\&. .PP If impervious is -True, then the executing client becomes impervious to server grabs. If impervious is -False, then the executing client returns to the normal state of being susceptible to server grabs. +True, then the executing client becomes impervious to server grabs\&. If impervious is +False, then the executing client returns to the normal state of being susceptible to server grabs\&. .PP \fBXTestSetGContextOfGC\fR -sets the GContext within the opaque datatype referenced by gc to be that specified by gid. +sets the GContext within the opaque datatype referenced by gc to be that specified by gid\&. .PP \fBXTestSetVisualIDOfVisual\fR -sets the VisualID within the opaque datatype referenced by visual to be that specified by visualid. +sets the VisualID within the opaque datatype referenced by visual to be that specified by visualid\&. .PP \fBXTestDiscard\fR -discards any requests within the output buffer for the specified display. It returns +discards any requests within the output buffer for the specified display\&. It returns True if any requests were discarded; otherwise, it returns -False. +False\&. .SH "RETURN VALUES" .PP -All routines that have return type Status will return nonzero for success and zero for failure. Even if the XTEST extension is supported, the server may withdraw such facilities arbitrarily; in which case they will subsequently return zero. +All routines that have return type Status will return nonzero for success and zero for failure\&. Even if the XTEST extension is supported, the server may withdraw such facilities arbitrarily; in which case they will subsequently return zero\&. .SH "AUTHOR" -Kieron Drake. +.PP +\fBKieron Drake\fR +.br +UniSoft Ltd\&. +.RS 4 +Author. +.RE diff --git a/man/XTestSetGContextOfGC.man b/man/XTestSetGContextOfGC.man index 7d905aa..4373039 100644 --- a/man/XTestSetGContextOfGC.man +++ b/man/XTestSetGContextOfGC.man @@ -1 +1 @@ -.so man__libmansuffix__/XTestQueryExtension.__libmansuffix__ +.so XTestQueryExtension.__libmansuffix__ diff --git a/man/XTestSetVisualIDOfVisual.man b/man/XTestSetVisualIDOfVisual.man index 7d905aa..4373039 100644 --- a/man/XTestSetVisualIDOfVisual.man +++ b/man/XTestSetVisualIDOfVisual.man @@ -1 +1 @@ -.so man__libmansuffix__/XTestQueryExtension.__libmansuffix__ +.so XTestQueryExtension.__libmansuffix__ diff --git a/packaging/libXtst.spec b/packaging/libXtst.spec new file mode 100644 index 0000000..e6220b2 --- /dev/null +++ b/packaging/libXtst.spec @@ -0,0 +1,81 @@ +Summary: X.Org X11 libXtst runtime library +Name: libXtst +Version: 1.2.0 +Release: 3 +License: MIT +Group: System Environment/Libraries +URL: http://www.x.org + +Source0: %{name}-%{version}.tar.gz + +BuildRequires: pkgconfig(xorg-macros) +BuildRequires: pkgconfig(xproto) +BuildRequires: pkgconfig(xextproto) +BuildRequires: pkgconfig(randrproto) +BuildRequires: pkgconfig(inputproto) +BuildRequires: pkgconfig(recordproto) +BuildRequires: pkgconfig(xextproto) +BuildRequires: libX11-devel +BuildRequires: libXext-devel +BuildRequires: libXi-devel + +%description +X.Org X11 libXtst runtime library + +%package devel +Summary: X.Org X11 libXtst development package +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: libXi-devel +Provides: libxtst-devel + +%description devel +X.Org X11 libXtst development package + +%prep +%setup -q + +# Disable static library creation by default. +%define with_static 0 + +%build + +%reconfigure --disable-static \ + LDFLAGS="${LDFLAGS} -Wl,--hash-style=both -Wl,--as-needed" +make %{?jobs:-j%jobs} + +%install +rm -rf $RPM_BUILD_ROOT + +make install DESTDIR=$RPM_BUILD_ROOT + +# We intentionally don't ship *.la files +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la + +rm -rf $RPM_BUILD_ROOT%{_docdir} + +%remove_docs + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%doc COPYING ChangeLog +%{_libdir}/libXtst.so.6 +%{_libdir}/libXtst.so.6.1.0 + +%files devel +%defattr(-,root,root,-) +#%doc specs/*.txt +%{_includedir}/X11/extensions/XTest.h +%{_includedir}/X11/extensions/record.h +%if %{with_static} +%{_libdir}/libXtst.a +%endif +%{_libdir}/libXtst.so +%{_libdir}/pkgconfig/xtst.pc +#%{_mandir}/man3/XTest*.3* diff --git a/packaging/libxtst.spec b/packaging/libxtst.spec deleted file mode 100644 index 7f35bcb..0000000 --- a/packaging/libxtst.spec +++ /dev/null @@ -1,78 +0,0 @@ -Name: libxtst -Summary: X.Org X11 libXtst runtime library -Version: 1.2.0 -Release: 2.6 -Group: System/Libraries -License: MIT -URL: http://www.x.org/ -Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.gz -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig -BuildRequires: pkgconfig(xproto) -BuildRequires: pkgconfig(xextproto) -BuildRequires: pkgconfig(randrproto) -BuildRequires: pkgconfig(inputproto) -BuildRequires: pkgconfig(recordproto) -BuildRequires: pkgconfig(xextproto) -BuildRequires: pkgconfig(xi) -BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xext) -BuildRequires: pkgconfig(xrender) -BuildRequires: pkgconfig(xorg-macros) - -%description -Description: %{summary} - - -%package devel -Summary: Development components for the libXtst library -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} - -%description devel -Description: %{summary} - - -%prep -%setup -q - -%build - -%reconfigure \ - CFLAGS="-Wall -g" \ - LDFLAGS="-Wl,--hash-style=both -Wl,--as-needed" - -# Call make instruction with smp support -make %{?jobs:-j%jobs} - -%install -rm -rf %{buildroot} -%make_install - - -%clean -rm -rf %{buildroot} - - - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - - - -%files -%defattr(-,root,root,-) -%doc COPYING ChangeLog -%{_libdir}/libXtst.so.6 -%{_libdir}/libXtst.so.6.1.0 - - -%files devel -%defattr(-,root,root,-) -%{_libdir}/libXtst.so -%{_libdir}/pkgconfig/xtst.pc -%{_includedir}/X11/extensions/XTest.h -%{_includedir}/X11/extensions/record.h -%{_docdir}/libXtst/*.xml - diff --git a/specs/Makefile.am b/specs/Makefile.am index fdaba22..f35ef69 100755..100644 --- a/specs/Makefile.am +++ b/specs/Makefile.am @@ -1,64 +1,13 @@ -# -# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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. -# if ENABLE_SPECS -doc_sources = xtestlib.xml recordlib.xml -dist_doc_DATA = $(doc_sources) -if HAVE_XMLTO -doc_DATA = $(doc_sources:.xml=.html) +# Main DocBook/XML files (DOCTYPE book) +docbook = xtestlib.xml recordlib.xml -if HAVE_FOP -doc_DATA += $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf) -endif +# The location where the DocBook/XML files and their generated formats are installed +shelfdir = $(docdir) -if HAVE_XMLTO_TEXT -doc_DATA += $(doc_sources:.xml=.txt) -endif +# Generate DocBook/XML output formats with or without stylesheets +include $(top_srcdir)/docbook.am -if HAVE_STYLESHEETS -XMLTO_FLAGS = -m $(XSL_STYLESHEET) - -doc_DATA += xorg.css -xorg.css: $(STYLESHEET_SRCDIR)/xorg.css - $(AM_V_GEN)cp -pf $(STYLESHEET_SRCDIR)/xorg.css $@ -endif - -CLEANFILES = $(doc_DATA) - -SUFFIXES = .xml .ps .pdf .txt .html - -.xml.txt: - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $< - -.xml.html: - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $< - -.xml.pdf: - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $< - -.xml.ps: - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $< - -endif HAVE_XMLTO endif ENABLE_SPECS diff --git a/specs/recordlib.xml b/specs/recordlib.xml index 903f02a..08d3eb2 100755..100644 --- a/specs/recordlib.xml +++ b/specs/recordlib.xml @@ -1,6 +1,9 @@ <?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" - "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" + "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" +[ +<!ENTITY % defs SYSTEM "defs.ent"> %defs; +]> <!-- lifted from troff+ms+XMan by doclifter --> @@ -9,25 +12,21 @@ <bookinfo> <title>X Record Extension Library</title> <subtitle>X Consortium Standard</subtitle> - <releaseinfo>X Version 11, Release 6.7</releaseinfo> + <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo> + <releaseinfo>Version 1.13</releaseinfo> <authorgroup> <author> <firstname>Martha</firstname><surname>Zimet</surname> + <affiliation><orgname>Network Computing Devices, Inc.</orgname></affiliation> </author> - </authorgroup> - <corpname>Network Computing Devices, Inc.</corpname> - <copyright><year>1994</year><holder>Network Computing Devices, Inc.</holder></copyright> - <copyright><year>1995</year><holder>X Consortium</holder></copyright> - <releaseinfo>Version 1.13</releaseinfo> - <affiliation><orgname>X Consortium</orgname></affiliation> - <productnumber>X Version 11, Release 6.7</productnumber> - <editor> + <editor> <firstname>Stephen</firstname><surname>Gildea</surname> <affiliation><orgname>X Consortium</orgname></affiliation> - </editor> + </editor> + </authorgroup> + <copyright><year>1994</year><holder>Network Computing Devices, Inc.</holder></copyright> <legalnotice> - <para> Permission to use, copy, modify, distribute, and sell this documentation for any purpose is hereby granted without fee, @@ -37,18 +36,20 @@ makes no representations about the suitability for any purpose of the information in this document. This documentation is provided "as is" without express or implied warranty. </para> +</legalnotice> +<legalnotice> +<para role="multiLicensing">Copyright © 1995 X Consortium</para> <para> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files -(the "Software"), to deal in the Software without +(the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: </para> - -<para>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +<para>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 X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR @@ -56,19 +57,17 @@ 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. </para> - <para> Except as contained in this notice, the name of the X Consortium 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 X Consortium. </para> - <para>X Window System is a trademark of The Open Group.</para> </legalnotice> </bookinfo> -<chapter id="record_extension_overview"> +<chapter id='Record_Extension_Overview'> <title>Record Extension Overview</title> <para> The purpose of this extension is to support the recording and reporting of @@ -77,7 +76,7 @@ gives an overview of the Record extension. The following sections describe how to use the Record extension library. </para> -<sect1 id="synchronous_playback"> +<sect1 id='Synchronous_Playback'> <title>Synchronous Playback</title> <para> Environment information is generally provided to an X-based playback @@ -114,7 +113,7 @@ synchronization methodology. </para> </sect1> -<sect1 id="design_approach"> +<sect1 id='Design_Approach'> <title>Design Approach</title> <para> The design approach of the extension is to record core X protocol and @@ -126,7 +125,7 @@ events, including input device events that do not go to any clients. </para> </sect1> -<sect1 id="record_clients"> +<sect1 id='Record_Clients'> <title>Record Clients</title> <para> The recommended communication model for a Record application is to open two @@ -145,14 +144,13 @@ recording operations. <para> A client that wishes to record X protocol does so through the library functions defined in -<link linkend="library_extension_requests"> -<xref linkend="library_extension_requests"></xref></link> +<xref linkend='Library_Extension_Requests' xrefstyle='select: title'/> A typical sequence of requests that a client would make is as follows: </para> <itemizedlist> <listitem> <para> -<function>XRecordQueryVersion</function> +<xref linkend='XRecordQueryVersion' xrefstyle='select: title'/> </para> <para> query the extension protocol version. @@ -160,7 +158,7 @@ query the extension protocol version. </listitem> <listitem> <para> -<function>XRecordCreateContext</function> +<xref linkend='XRecordCreateContext' xrefstyle='select: title'/> </para> <para> request that the server create a record context for access by this client, @@ -171,7 +169,7 @@ used by most other extension requests to identify the specified context. </listitem> <listitem> <para> -<function>XRecordEnableContext</function> +<xref linkend='XRecordEnableContext' xrefstyle='select: title'/> </para> <para> begin the recording and reporting of protocol data. @@ -179,7 +177,7 @@ begin the recording and reporting of protocol data. </listitem> <listitem> <para> -<function>XRecordDisableContext</function> +<xref linkend='XRecordDisableContext' xrefstyle='select: title'/> </para> <para> end the recording and reporting of protocol data. @@ -187,7 +185,7 @@ end the recording and reporting of protocol data. </listitem> <listitem> <para> -<function>XRecordFreeContext</function> +<xref linkend='XRecordFreeContext' xrefstyle='select: title'/> </para> <para> free the record context. @@ -206,11 +204,11 @@ The <function>Xtst</function> library contains the </sect1> </chapter> -<chapter id="common_arguments"> +<chapter id='Common_Arguments'> <title>Common Arguments</title> <para> -The Record extension functions <function>XRecordCreateContext</function> - and <function>XRecordRegisterClients</function> allow applications to +The Record extension functions <xref linkend='XRecordCreateContext' xrefstyle='select: title'/> + and <xref linkend='XRecordRegisterClients' xrefstyle='select: title'/> allow applications to specify the following: </para> <itemizedlist> @@ -232,21 +230,20 @@ recording client although it may not be sent to a recorded client. The device_events type differs from delivered_events, which also can be specified by a recording client; delivered_events are actually delivered to one or more clients. These event types are discussed in -<link linkend="protocol_ranges"> -<xref linkend="protocol_ranges"></xref></link> +<xref linkend='Protocol_Ranges' xrefstyle='select: title'/> </para> <para> -The Record extension functions <function>XRecordCreateContext</function> - and <function>XRecordRegisterClients</function> have the common arguments +The Record extension functions <xref linkend='XRecordCreateContext' xrefstyle='select: title'/> + and <xref linkend='XRecordRegisterClients' xrefstyle='select: title'/> have the common arguments datum_flags, clients, and ranges, which specify whether server time and/or client sequence number should precede protocol elements, the clients or client set to record, and the protocol ranges to record, respectively. These are discussed in the following sections. </para> -<sect1 id="datum_flags"> +<sect1 id='Datum_Flags'> <title>Datum Flags</title> <para> The datum_flags argument is a set of flags OR’ed together to specify options @@ -275,7 +272,7 @@ The <function>XRecordFromClientSequence</function> flag specifies that </para> </sect1> -<sect1 id="selecting_clients"> +<sect1 id='Selecting_Clients'> <title>Selecting Clients</title> <para> @@ -300,8 +297,7 @@ If the element in the array identifies a particular client, protocol specified by the ranges argument will be recorded by the server. The recorded protocol data will not be returned to the recording client until the record context has been enabled. This is described in -<link linkend="data_transfer"> -<xref linkend="data_transfer"></xref></link> +<xref linkend='Data_Transfer' xrefstyle='select: title'/> </para> <para> If the element is <function>XRecordCurrentClients</function>, the protocol @@ -321,12 +317,12 @@ silently exclude the recording data connection. It is an error to explicitly register the data connection. </para> </sect1> -<sect1 id="protocol_ranges"> +<sect1 id='Protocol_Ranges'> <title>Protocol Ranges</title> <para> -The functions <function>XRecordCreateContext</function> and -<function>XRecordRegisterClients</function> have another common argument, +The functions <xref linkend='XRecordCreateContext' xrefstyle='select: title'/> and +<xref linkend='XRecordRegisterClients' xrefstyle='select: title'/> have another common argument, ranges, which is an array of pointers to <function>XRecordRange</function> structures. Each structure contains ranges of numeric values for each of the protocol types that can be specified and recorded individually by the @@ -508,7 +504,7 @@ notification when a client disconnects is not specified by this </sect1> </chapter> -<chapter id='library_extension_requests'> +<chapter id='Library_Extension_Requests'> <title>Library Extension Requests</title> <para> @@ -523,17 +519,17 @@ or errors. </para> -<sect1 id='query_extension_version'> +<sect1 id='Query_Extension_Version'> <title>Query Extension Version</title> <para> An application uses the -<function>XRecordQueryVersion</function> +<xref linkend='XRecordQueryVersion' xrefstyle='select: title'/> function to determine the version of the Record extension protocol supported by an X server. </para> -<funcsynopsis> +<funcsynopsis id='XRecordQueryVersion'> <funcprototype> <funcdef>Status <function>XRecordQueryVersion</function></funcdef> <paramdef>Display <parameter> *display</parameter></paramdef> @@ -559,27 +555,27 @@ the version of the Record extension protocol supported by an X server. <para> The -<function>XRecordQueryVersion</function> +<xref linkend='XRecordQueryVersion' xrefstyle='select: title'/> function returns the major and minor protocol version numbers supported by the server. -<function>XRecordQueryVersion</function> +<xref linkend='XRecordQueryVersion' xrefstyle='select: title'/> returns nonzero (success) only if the returned version numbers are common to both the library and the server; otherwise, it returns zero. </para> </sect1> -<sect1 id='create_and_modify_context'> +<sect1 id='Create_and_Modify_Context'> <title>Create and Modify Context</title> <para> An application uses the -<function>XRecordCreateContext</function> +<xref linkend='XRecordCreateContext' xrefstyle='select: title'/> function to create a record context. At the time the record context is created by the recording client, the clients to be recorded and the protocol to record for each client may be specified. </para> -<funcsynopsis> +<funcsynopsis id='XRecordCreateContext'> <funcprototype> <funcdef>XRecordContext <function>XRecordCreateContext</function></funcdef> <paramdef>Display <parameter> *display</parameter></paramdef> @@ -620,15 +616,14 @@ protocol to record for each client may be specified. <para> The -<function>XRecordCreateContext</function> +<xref linkend='XRecordCreateContext' xrefstyle='select: title'/> function creates a record context and returns an <function>XRecordContext</function> which is then used in the other Record library calls. This request is typically executed by the recording client over its control connection to the X server. The datum_flags specifies whether server time and/or client sequence number should precede protocol elements recorded by context ( -<link linkend="datum_flags"> -<xref linkend="datum_flags"></xref></link> +<xref linkend='Datum_Flags' xrefstyle='select: title'/> ). When a clients element identifies a particular client, the client is added to the context and the protocol to record for that client is set to the union of all ranges. When a clients element is @@ -637,15 +632,14 @@ union of all ranges. When a clients element is or <function>XRecordAllClients</function> the actions described in -<link linkend="selecting_clients"> -<xref linkend="selecting_clients"></xref></link> +<xref linkend='Selecting_Clients' xrefstyle='select: title'/> are performed. </para> <para> -<function>XRecordCreateContext</function> +<xref linkend='XRecordCreateContext' xrefstyle='select: title'/> returns zero if the request failed. -<function>XRecordCreateContext</function> +<xref linkend='XRecordCreateContext' xrefstyle='select: title'/> can generate <function>BadIDChoice</function> <function>BadMatch</function> @@ -676,21 +670,21 @@ structure. The structure is initialized to specify no protocol. The function returns NULL if the structure allocation fails. The application can free the structure by calling -<function>XFree</function> +<olink targetdoc='libX11' targetptr='XFree'><function>XFree</function></olink> </para> -<sect2 id='additions'> +<sect2 id='Additions'> <title>Additions</title> <para> An application uses the -<function>XRecordRegisterClients</function> +<xref linkend='XRecordRegisterClients' xrefstyle='select: title'/> function to modify a previously created record context, by adding clients or modifying the recorded protocol, typically over its control connection to the X server. </para> -<funcsynopsis> +<funcsynopsis id='XRecordRegisterClients'> <funcprototype> <funcdef>Status <function>XRecordRegisterClients</function></funcdef> <paramdef>Display <parameter> *display</parameter></paramdef> @@ -737,8 +731,7 @@ typically over its control connection to the X server. <para> The datum_flags specifies whether server time and/or client sequence number should precede protocol elements for all clients recorded by context (See -<link linkend="datum_flags"> -<xref linkend="datum_flags"></xref></link> +<xref linkend='Datum_Flags' xrefstyle='select: title'/> ). When a clients element identifies a particular client and the client is not yet targeted for recording in the given context, the client is added to the set of clients to record, and the protocol to record for that client @@ -750,19 +743,18 @@ is set to the union of all ranges. When the element is or <function>XRecordAllClients</function> the actions described in -<link linkend="selecting_clients"> -<xref linkend="selecting_clients"></xref></link> +<xref linkend='Selecting_Clients' xrefstyle='select: title'/> are performed. </para> <para> -<function>XRecordRegisterClients</function> +<xref linkend='XRecordRegisterClients' xrefstyle='select: title'/> returns zero if the request failed; otherwise, it returns nonzero. </para> <para> -<function>XRecordRegisterClients</function> +<xref linkend='XRecordRegisterClients' xrefstyle='select: title'/> can generate <function>XRecordBadContext</function> <function>BadMatch</function> @@ -772,7 +764,7 @@ errors. </para> </sect2> -<sect2 id='deletions'> +<sect2 id='Deletions'> <title>Deletions</title> <para> @@ -782,7 +774,7 @@ function to delete clients from a previously created record context, typically over its control connection to the X server. </para> -<funcsynopsis> +<funcsynopsis id='XRecordUnRegisterClients'> <funcprototype> <funcdef>Status <function>XRecordUnRegisterClients</function></funcdef> <paramdef>Display <parameter> *display</parameter></paramdef> @@ -858,17 +850,17 @@ errors.</para> </sect2> </sect1> -<sect1 id='query_context_state'> +<sect1 id='Query_Context_State'> <title>Query Context State</title> <para> An application uses the -<function>XRecordGetContext</function> +<xref linkend='XRecordGetContext' xrefstyle='select: title'/> function to query the current state of a record context, typically over its control connection to the X server. </para> -<funcsynopsis> +<funcsynopsis id='XRecordGetContext'> <funcprototype> <funcdef>Status <function>XRecordGetContext</function></funcdef> <paramdef>Display <parameter> *display</parameter></paramdef> @@ -898,7 +890,7 @@ the function stores a pointer to the current state of the record context. The <function>XRecordState</function> typedef returned by -<function>XRecordGetContext</function> +<xref linkend='XRecordGetContext' xrefstyle='select: title'/> is a structure with the following members: </para> @@ -946,7 +938,7 @@ structures, which specify the protocol ranges to record. </para> <para> -<function>XRecordGetContext</function> +<xref linkend='XRecordGetContext' xrefstyle='select: title'/> returns zero if the request failed; otherwise, it returns nonzero. The context argument must specify a valid <function>XRecordContext</function> @@ -957,12 +949,12 @@ error results. <para> Recording clients should use the -<function>XRecordFreeState</function> +<xref linkend='XRecordFreeState' xrefstyle='select: title'/> function to free the state data returned by -<function>XRecordGetContext</function> +<xref linkend='XRecordGetContext' xrefstyle='select: title'/> </para> -<funcsynopsis> +<funcsynopsis id='XRecordFreeState'> <funcprototype> <funcdef>void <function>XRecordFreeState</function></funcdef> <paramdef>XRecordState <parameter> *state</parameter></paramdef> @@ -977,37 +969,37 @@ function to free the state data returned by </variablelist> <para> -<function>XRecordFreeState</function> +<xref linkend='XRecordFreeState' xrefstyle='select: title'/> frees the data pointed to by state. If the argument does not match an <function>XRecordState</function> pointer returned from a successful call to -<function>XRecordGetContext</function> +<xref linkend='XRecordGetContext' xrefstyle='select: title'/> or if -<function>XRecordFreeState</function> +<xref linkend='XRecordFreeState' xrefstyle='select: title'/> has already been called with it, the behavior is undefined. </para> </sect1> -<sect1 id='data_transfer'> +<sect1 id='Data_Transfer'> <title>Data Transfer</title> <para> An application uses the -<function>XRecordEnableContext</function> +<xref linkend='XRecordEnableContext' xrefstyle='select: title'/> and -<function>XRecordDisableContext</function> +<xref linkend='XRecordDisableContext' xrefstyle='select: title'/> functions to change the state of data transfer between the X server and the recording client. These functions allow the application to start recording and reporting of protocol data and to stop recording and reporting of protocol data, respectively. </para> -<sect2 id='enable_context'> +<sect2 id='Enable_Context'> <title>Enable Context</title> <para> To direct the X server to record and report protocol, a program uses -<function>XRecordEnableContext</function> +<xref linkend='XRecordEnableContext' xrefstyle='select: title'/> typically over its data connection to the X server. The reporting of recorded protocol back to the recording client is handled by the following data structures and procedure definitions. @@ -1151,7 +1143,7 @@ in the same reply packet. When a reply is received, a procedure of type is called for each protocol element in the reply. </para> -<funcsynopsis> +<funcsynopsis id='XRecordInterceptProc'> <funcprototype> <funcdef>typedef void <function>(*XRecordInterceptProc)</function></funcdef> <paramdef>XPointer<parameter> closure</parameter></paramdef> @@ -1177,13 +1169,13 @@ connection other than the data connection). <para> Recording clients should use the -<function>XRecordFreeData</function> +<xref linkend='XRecordFreeData' xrefstyle='select: title'/> function to free the <function>XRecordInterceptData</function> structure. </para> -<funcsynopsis> +<funcsynopsis id='XRecordEnableContext'> <funcprototype> <funcdef>Status <function>XRecordEnableContext</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1214,7 +1206,7 @@ structure. <para> -<function>XRecordEnableContext</function> +<xref linkend='XRecordEnableContext' xrefstyle='select: title'/> enables data transfer between the recording client and the X server. All core and extension protocol received from or sent to targeted clients that the recording client has expressed @@ -1222,7 +1214,7 @@ interest in will be recorded and reported to the recording client. </para> <para> -<function>XRecordEnableContext</function> +<xref linkend='XRecordEnableContext' xrefstyle='select: title'/> returns zero if the request failed; otherwise, it returns nonzero. The context argument must specify a valid <function>XRecordContext</function> @@ -1234,16 +1226,16 @@ results when data transfer is already enabled on the given context. </para> </sect2> -<sect2 id='enable_context_asynchronously'> +<sect2 id='Enable_Context_Asynchronously'> <title>Enable Context Asynchronously</title> <para>Because -<function>XRecordEnableContext</function> +<xref linkend='XRecordEnableContext' xrefstyle='select: title'/> does not return until -<function>XRecordDisableContext</function> +<xref linkend='XRecordDisableContext' xrefstyle='select: title'/> is executed on the control connection, a nonblocking interface in addition to -<function>XRecordEnableContext</function> +<xref linkend='XRecordEnableContext' xrefstyle='select: title'/> is provided. This interface also enables data transfer; however, it does not block. </para> @@ -1252,7 +1244,7 @@ enables data transfer; however, it does not block. This interface is defined as follows: </para> -<funcsynopsis> +<funcsynopsis id='XRecordEnableContextAsync'> <funcprototype> <funcdef>Status <function>XRecordEnableContextAsync</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1282,22 +1274,22 @@ This interface is defined as follows: </variablelist> <para> -<function>XRecordEnableContextAsync</function> +<xref linkend='XRecordEnableContextAsync' xrefstyle='select: title'/> enables data transfer between the recording client and the X server just as -<function>XRecordEnableContext</function> +<xref linkend='XRecordEnableContext' xrefstyle='select: title'/> does. Unlike -<function>XRecordEnableContext</function> +<xref linkend='XRecordEnableContext' xrefstyle='select: title'/> it does not wait for the context to be disabled before returning; -<function>XRecordEnableContextAsync</function> +<xref linkend='XRecordEnableContextAsync' xrefstyle='select: title'/> returns as soon as the <function>XRecordStartOfData</function> reply has been received and processed. </para> <para> -<function>XRecordEnableContextAsync</function> +<xref linkend='XRecordEnableContextAsync' xrefstyle='select: title'/> returns zero if it could not allocate the necessary memory and nonzero if it sent the request successfully to the server. The context argument must specify a valid @@ -1314,11 +1306,11 @@ Each time it reads data from the server connection, Xlib will check for incoming replies and call <emphasis remap='I'>callback</emphasis> as necessary. The application may direct Xlib explicitly to check for Record data with the -<function>XRecordProcessReplies</function> +<xref linkend='XRecordProcessReplies' xrefstyle='select: title'/> function. </para> -<funcsynopsis> +<funcsynopsis id='XRecordProcessReplies'> <funcprototype> <funcdef>void <function>XRecordProcessReplies</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1333,11 +1325,11 @@ function. </variablelist> <para> -<function>XRecordProcessReplies</function> +<xref linkend='XRecordProcessReplies' xrefstyle='select: title'/> will check for any replies that have not yet been processed by the application. The asynchronous callback will be called as appropriate. -<function>XRecordProcessReplies</function> +<xref linkend='XRecordProcessReplies' xrefstyle='select: title'/> returns when all immediately available replies have been processed. It does not block. </para> @@ -1345,9 +1337,9 @@ available replies have been processed. It does not block. <para>To free the data passed to the <function>XRecordInterceptProc</function> callback, use -<function>XRecordFreeData</function></para> +<xref linkend='XRecordFreeData' xrefstyle='select: title'/></para> -<funcsynopsis> +<funcsynopsis id='XRecordFreeData'> <funcprototype> <funcdef>void <function>XRecordFreeData</function></funcdef> <paramdef>XRecordInterceptData<parameter> *data</parameter></paramdef> @@ -1363,28 +1355,28 @@ callback, use <para> -<function>XRecordFreeData</function> +<xref linkend='XRecordFreeData' xrefstyle='select: title'/> frees the data pointed to by data. If the argument does not match an <function>XRecordInterceptData</function> pointer earlier passed to an <function>XRecordInterceptProc</function> callback or if -<function>XRecordFreeData</function> +<xref linkend='XRecordFreeData' xrefstyle='select: title'/> has already been called with it, the behavior is undefined. </para> </sect2> -<sect2 id='disable_context'> +<sect2 id='Disable_Context'> <title>Disable Context</title> <para> To direct the X server to halt the reporting of recorded protocol, the program executes -<function>XRecordDisableContext</function> +<xref linkend='XRecordDisableContext' xrefstyle='select: title'/> typically over its control connection to the X server. </para> -<funcsynopsis> +<funcsynopsis id='XRecordDisableContext'> <funcprototype> <funcdef>Status <function>XRecordDisableContext</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1406,7 +1398,7 @@ typically over its control connection to the X server. <para> The -<function>XRecordDisableContext</function> +<xref linkend='XRecordDisableContext' xrefstyle='select: title'/> function disables context, stopping all recording over its data connection. Any complete protocol elements for context that were buffered in the server will be sent to the recording client rather than being discarded. @@ -1416,7 +1408,7 @@ that has not been enabled, no action will take place. </para> <para> -<function>XRecordDisableContext</function> +<xref linkend='XRecordDisableContext' xrefstyle='select: title'/> returns zero if the request failed; otherwise, it returns nonzero. The context argument must specify a valid <function>XRecordContext</function> @@ -1427,13 +1419,14 @@ error results. </sect2> </sect1> -<sect1 id='id_base_mask'><title>ID Base Mask</title> +<sect1 id='ID_Base_Mask'> +<title>ID Base Mask</title> <para> To determine the mask the server uses for the client ID base, use -<function>XRecordIdBaseMask</function></para> +<xref linkend='XRecordIdBaseMask' xrefstyle='select: title'/></para> -<funcsynopsis> +<funcsynopsis id='XRecordIdBaseMask'> <funcprototype> <funcdef>XID <function>XRecordIdBaseMask</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1449,25 +1442,25 @@ To determine the mask the server uses for the client ID base, use <para> The -<function>XRecordIdBaseMask</function> +<xref linkend='XRecordIdBaseMask' xrefstyle='select: title'/> function returns the resource ID mask passed to the client by the server at connection setup. </para> </sect1> -<sect1 id='free_context'> +<sect1 id='Free_Context'> <title>Free Context</title> <para> Before terminating, the program should request that the server free the record context. This is done with the -<function>XRecordFreeContext</function> +<xref linkend='XRecordFreeContext' xrefstyle='select: title'/> function, typically over the record client's control connection to the X server. </para> -<funcsynopsis> +<funcsynopsis id='XRecordFreeContext'> <funcprototype> <funcdef>Status <function>XRecordFreeContext</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1488,21 +1481,21 @@ to the X server. <para> The -<function>XRecordFreeContext</function> +<xref linkend='XRecordFreeContext' xrefstyle='select: title'/> function frees the given context for the requesting client. Freeing a record context releases the clients targeted for recording and their respective protocol ranges to record. If protocol data is being reported to the recording client, generally over the data connection to the X server, the reporting ceases as if -<function>XRecordDisableContext</function> +<xref linkend='XRecordDisableContext' xrefstyle='select: title'/> had been called on the given context. When a program terminates without freeing its record context, the X server will automatically free that context on behalf of the client. </para> <para> -<function>XRecordFreeContext</function> +<xref linkend='XRecordFreeContext' xrefstyle='select: title'/> returns zero if the request failed; otherwise,it returns nonzero. The context argument must specify a valid <function>XRecordContext</function> diff --git a/specs/xtestlib.xml b/specs/xtestlib.xml index e177345..463149a 100755..100644 --- a/specs/xtestlib.xml +++ b/specs/xtestlib.xml @@ -1,6 +1,9 @@ <?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" - "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" + "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" +[ +<!ENTITY % defs SYSTEM "defs.ent"> %defs; +]> <!-- lifted from troff+ms+XMan by doclifter --> @@ -9,22 +12,17 @@ <bookinfo> <title>XTEST Extension Library</title> <subtitle>X Consortium Standard</subtitle> - <releaseinfo>X Version 11, Release 6.4</releaseinfo> + <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo> + <releaseinfo>Version 2.2</releaseinfo> <authorgroup> <author> <firstname>Kieron</firstname><surname>Drake</surname> + <affiliation><orgname>UniSoft Ltd.</orgname></affiliation> </author> </authorgroup> - <corpname>UniSoft Ltd.</corpname> <copyright><year>1992</year><holder>UniSoft Group Ltd.</holder></copyright> - <copyright><year>1992</year><holder>X Consortium</holder></copyright> - <copyright><year>1994</year><holder>X Consortium</holder></copyright> - <releaseinfo>Version 2.2</releaseinfo> - <affiliation><orgname>X Consortium</orgname></affiliation> - <productnumber>X Version 11, Release 7</productnumber> <legalnotice> - <para> Permission to use, copy, modify, and distribute this documentation for any purpose and without fee is hereby granted, provided that the above @@ -33,7 +31,10 @@ makes no representations about the suitability for any purpose of the information in this document. This documentation is provided “as is” without express or implied warranty. </para> +</legalnotice> +<legalnotice> +<para role="multiLicensing">Copyright © 1992,1994 X Consortium</para> <para> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files @@ -43,12 +44,10 @@ distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: </para> - <para> The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. </para> - <para> THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF @@ -58,24 +57,16 @@ 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. </para> - <para> Except as contained in this notice, the name of the X Consortium 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 X Consortium. </para> - <para>X Window System is a trademark of The Open Group.</para> - -<para> -Except as contained in this notice, the name of the X Consortium 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 X Consortium. -</para> </legalnotice> </bookinfo> -<chapter id='overview'> +<chapter id='Overview'> <title>Overview</title> <para> @@ -123,7 +114,7 @@ Minimize performance penalties on normal server operation. </itemizedlist> </chapter> -<chapter id='description'> +<chapter id='Description'> <title>Description</title> <para>The functions provided by this extension fall into two groups:</para> @@ -173,7 +164,7 @@ or pressed a key or button. </itemizedlist> </chapter> -<chapter id='c_language_binding'> +<chapter id='C_Language_Binding'> <title>C Language Binding</title> <para> @@ -197,7 +188,7 @@ The include file for this extension is <<symbol role='Pn'>X11/extensions/XTest.h</symbol>>. </para> -<funcsynopsis> +<funcsynopsis id='XTestQueryExtension'> <funcprototype> <funcdef>Bool<function> XTestQueryExtension</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -209,7 +200,7 @@ The include file for this extension is </funcsynopsis> <para> -<function>XTestQueryExtension</function> +<xref linkend='XTestQueryExtension' xrefstyle='select: title'/> returns <function>True</function> if the specified display supports the XTEST extension, else @@ -224,7 +215,7 @@ numbers of the extension supported by the display. Otherwise, none of the arguments are set. </para> -<funcsynopsis> +<funcsynopsis id='XTestCompareCursorWithWindow'> <funcprototype> <funcdef>Bool<function> XTestCompareCursorWithWindow</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -234,7 +225,7 @@ the arguments are set. </funcsynopsis> <para>If the extension is supported, -<function>XTestCompareCursorWithWindow</function> +<xref linkend='XTestCompareCursorWithWindow' xrefstyle='select: title'/> performs a comparison of the cursor whose ID is specified by cursor (which may be <function>None</function> @@ -246,7 +237,7 @@ otherwise. If the extension is not supported, then the request is ignored and zero is returned. </para> -<funcsynopsis> +<funcsynopsis id='XTestCompareCurrentCursorWithWindow'> <funcprototype> <funcdef>Bool<function>XTestCompareCurrentCursorWithWindow</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -255,7 +246,7 @@ zero is returned. </funcsynopsis> <para>If the extension is supported, -<function>XTestCompareCurrentCursorWithWindow</function> +<xref linkend='XTestCompareCurrentCursorWithWindow' xrefstyle='select: title'/> performs a comparison of the current cursor with the cursor of the specified window returning <function>True</function> @@ -265,7 +256,7 @@ otherwise. If the extension is not supported, then the request is ignored and zero is returned. </para> -<funcsynopsis> +<funcsynopsis id='XTestFakeKeyEvent'> <funcprototype> <funcdef><function>XTestFakeKeyEvent</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -276,7 +267,7 @@ zero is returned. </funcsynopsis> <para>If the extension is supported, -<function>XTestFakeKeyEvent</function> +<xref linkend='XTestFakeKeyEvent' xrefstyle='select: title'/> requests the server to simulate either a <function>KeyPress</function> (if is_press is @@ -297,7 +288,7 @@ this client will be processed until this delay, if any, has expired and subsequent processing of the simulated event has been completed. </para> -<funcsynopsis> +<funcsynopsis id='XTestFakeButtonEvent'> <funcprototype> <funcdef><function>XTestFakeButtonEvent</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -308,7 +299,7 @@ and subsequent processing of the simulated event has been completed. </funcsynopsis> <para>If the extension is supported, -<function>XTestFakeButtonEvent</function> +<xref linkend='XTestFakeButtonEvent' xrefstyle='select: title'/> requests the server to simulate either a <function>ButtonPress</function> (if is_press is @@ -330,7 +321,7 @@ this client will be processed until this delay, if any, has expired and subsequent processing of the simulated event has been completed. </para> -<funcsynopsis> +<funcsynopsis id='XTestFakeMotionEvent'> <funcprototype> <funcdef><function>XTestFakeMotionEvent</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -342,7 +333,7 @@ and subsequent processing of the simulated event has been completed. </funcsynopsis> <para>If the extension is supported, -<function>XTestFakeMotionEvent</function> +<xref linkend='XTestFakeMotionEvent' xrefstyle='select: title'/> requests the server to simulate a movement of the pointer to the specified position (x, y) on the root window of screen_number; otherwise, the request is ignored. If screen_number is -1, the current screen (that the pointer @@ -358,7 +349,7 @@ this client will be processed until this delay, if any, has expired and subsequent processing of the simulated event has been completed. </para> -<funcsynopsis> +<funcsynopsis id='XTestFakeRelativeMotionEvent'> <funcprototype> <funcdef><function>XTestFakeRelativeMotionEvent</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -371,7 +362,7 @@ and subsequent processing of the simulated event has been completed. <para> If the extension is supported, -<function>XTestFakeRelativeMotionEvent</function> +<xref linkend='XTestFakeRelativeMotionEvent' xrefstyle='select: title'/> requests the server to simulate a movement of the pointer by the specified offsets (x, y) relative to the current pointer position on screen_number; otherwise, the request is ignored. If screen_number is -1, the @@ -387,7 +378,7 @@ this client will be processed until this delay, if any, has expired and subsequent processing of the simulated event has been completed. </para> -<funcsynopsis> +<funcsynopsis id='XTestGrabControl'> <funcprototype> <funcdef><function>XTestGrabControl</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -403,7 +394,7 @@ then the executing client returns to the normal state of being susceptible to server grabs. </para> -<funcsynopsis> +<funcsynopsis id='XTestSetGContextOfGC'> <funcprototype> <funcdef>Bool<function> XTestSetGContextOfGC</function></funcdef> <paramdef>GC<parameter> gc</parameter></paramdef> @@ -412,12 +403,12 @@ to server grabs. </funcsynopsis> <para> -<function>XTestSetGContextOfGC</function> +<xref linkend='XTestSetGContextOfGC' xrefstyle='select: title'/> sets the GContext within the opaque datatype referenced by gc to be that specified by gid. </para> -<funcsynopsis> +<funcsynopsis id='XTestSetVisualIDOfVisual'> <funcprototype> <funcdef><function>XTestSetVisualIDOfVisual</function></funcdef> <paramdef>Visual<parameter> *visual</parameter></paramdef> @@ -426,12 +417,12 @@ be that specified by gid. </funcsynopsis> <para> -<function>XTestSetVisualIDOfVisual</function> +<xref linkend='XTestSetVisualIDOfVisual' xrefstyle='select: title'/> sets the VisualID within the opaque datatype referenced by visual to be that specified by visualid. </para> -<funcsynopsis> +<funcsynopsis id='XTestDiscard'> <funcprototype> <funcdef>Bool<function> XTestDiscard</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -439,7 +430,7 @@ be that specified by visualid. </funcsynopsis> <para> -<function>XTestDiscard</function> +<xref linkend='XTestDiscard' xrefstyle='select: title'/> discards any requests within the output buffer for the specified display. It returns <function>True</function> @@ -448,7 +439,7 @@ if any requests were discarded; otherwise, it returns </para> </chapter> -<chapter id='references'> +<chapter id='References'> <title>References</title> <para> diff --git a/src/Makefile.am b/src/Makefile.am index 1091ece..1091ece 100755..100644 --- a/src/Makefile.am +++ b/src/Makefile.am diff --git a/src/XRecord.c b/src/XRecord.c index 45c8b43..b65451c 100755..100644 --- a/src/XRecord.c +++ b/src/XRecord.c @@ -59,7 +59,7 @@ from The Open Group. static XExtensionInfo _xrecord_info_data; static XExtensionInfo *xrecord_info = &_xrecord_info_data; -static /* const */ char *xrecord_extension_name = RECORD_NAME; +static const char *xrecord_extension_name = RECORD_NAME; #define XRecordCheckExtension(dpy,i,val) \ XextCheckExtension(dpy, i, xrecord_extension_name, val) @@ -160,7 +160,7 @@ static int close_display( static XPointer alloc_mem_cache(void) { struct mem_cache_str *cache; - + /* note that an error will go unnoticed */ cache = (struct mem_cache_str *) Xmalloc(sizeof(struct mem_cache_str)); if (cache) { @@ -234,7 +234,7 @@ SendRange( xrange.errorsLast = (*range_item)->errors.last; xrange.clientStarted = (*range_item)->client_started; xrange.clientDied = (*range_item)->client_died; - + Data(dpy, (char *)&xrange, rlen); range_item++; } @@ -727,7 +727,7 @@ parse_reply_call_callback( data = alloc_inter_data(info); if (!data) return Error; - + data->id_base = rep->idBase; data->category = rep->category; data->client_swapped = rep->clientSwapped; @@ -795,7 +795,7 @@ parse_reply_call_callback( case XRecordEndOfData: datum_bytes = 0; } - + if (datum_bytes > 0) { if (current_index + datum_bytes > rep->length << 2) fprintf(stderr, @@ -805,7 +805,7 @@ parse_reply_call_callback( /* * This assignment (and indeed the whole buffer sharing * scheme) assumes arbitrary 4-byte boundaries are - * addressable. + * addressable. */ data->data = reply->buf+current_index; reply->ref_count++; @@ -813,9 +813,9 @@ parse_reply_call_callback( data->data = NULL; } data->data_len = datum_bytes >> 2; - + (*callback)(closure, data); - + current_index += datum_bytes; } while (current_index<rep->length<<2); @@ -931,7 +931,7 @@ record_async_handler( Xfree(state->async); return False; } - + _XGetAsyncData(dpy, (char *)reply->buf, buf, len, SIZEOF(xRecordEnableContextReply), rep->generic.length << 2, 0); @@ -939,8 +939,8 @@ record_async_handler( reply = NULL; } - status = parse_reply_call_callback(dpy, state->info, - (xRecordEnableContextReply*) rep, + status = parse_reply_call_callback(dpy, state->info, + (xRecordEnableContextReply*) rep, reply, state->callback, state->closure); if (status != Continue) diff --git a/src/XTest.c b/src/XTest.c index 76193a1..3e4bb17 100755..100644 --- a/src/XTest.c +++ b/src/XTest.c @@ -40,7 +40,7 @@ from The Open Group. static XExtensionInfo _xtest_info_data; static XExtensionInfo *xtest_info = &_xtest_info_data; -static /* const */ char *xtest_extension_name = XTestExtensionName; +static const char *xtest_extension_name = XTestExtensionName; #define XTestCheckExtension(dpy,i,val) \ XextCheckExtension (dpy, i, xtest_extension_name, val) @@ -81,7 +81,7 @@ get_xinput_base(Display *dpy) } static XEXT_GENERATE_FIND_DISPLAY (find_display, xtest_info, - xtest_extension_name, + xtest_extension_name, &xtest_extension_hooks, XTestNumberEvents, get_xinput_base(dpy)) |