summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2010-05-10 20:10:08 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2010-05-10 20:10:08 +0000
commitc002f9802384d9f040621c12f917e8b7fcf9be47 (patch)
treeb6eee905d78b116e732e876b19bbb44145de7e79 /lib
parentd4244f9d8f4ebf58eaecc51a08b937a835f6cf86 (diff)
Update to libXtst 1.1.0. Tested on a ports bulk build by naddy@.
Diffstat (limited to 'lib')
-rw-r--r--lib/libXtst/ChangeLog418
-rw-r--r--lib/libXtst/Makefile.am16
-rw-r--r--lib/libXtst/Makefile.in10
-rw-r--r--lib/libXtst/README24
-rw-r--r--lib/libXtst/autogen.sh12
-rw-r--r--lib/libXtst/configure794
-rw-r--r--lib/libXtst/configure.ac17
-rw-r--r--lib/libXtst/include/X11/extensions/XTest.h146
-rw-r--r--lib/libXtst/include/X11/extensions/record.h183
-rw-r--r--lib/libXtst/man/Makefile.am66
-rw-r--r--lib/libXtst/man/Makefile.in88
-rw-r--r--lib/libXtst/man/XTest.xml16
-rw-r--r--lib/libXtst/man/XTestQueryExtension.man283
-rw-r--r--lib/libXtst/src/Makefile.am18
-rw-r--r--lib/libXtst/src/Makefile.in62
-rw-r--r--lib/libXtst/src/XRecord.c151
-rw-r--r--lib/libXtst/src/XTest.c130
17 files changed, 1828 insertions, 606 deletions
diff --git a/lib/libXtst/ChangeLog b/lib/libXtst/ChangeLog
index 9eff79a96..3778c3b23 100644
--- a/lib/libXtst/ChangeLog
+++ b/lib/libXtst/ChangeLog
@@ -1,49 +1,405 @@
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit ddc11c4ef1bd0e6c970630dea74f54bb2b0ea893
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Oct 5 11:38:38 2009 +1000
- * configure.ac:
- Update package version for X11R7 release.
+ libXtst 1.1.0
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit e3d74ecf1a3a7adfeafca8cd02c1da82e95d5eaf
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Oct 5 11:40:53 2009 +1000
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Require libXext 1.0.99.4
+
+ libXext 1.0.99.1 up to including 1.0.99.3 had the XTest.h header which is
+ now in this module.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 7a9b269ed83c106265896373120603b9c06997f3
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Oct 5 10:38:34 2009 +1000
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Require macros 1.3 for XORG_DEFAULT_OPTIONS
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 9f727168f561c76c5ae6c3115282ac803172e9f8
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Aug 25 14:09:47 2009 +1000
- * xtst.pc.in:
- Update pkgconfig files to separate library build-time dependencies
- from application build-time dependencies.
+ Version bump: 1.0.99.2
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 527759ae93ceaafca670995ab97545112f89bfbc
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Aug 18 11:12:37 2009 +1000
- * configure.ac:
- Update package version number for X11R7 RC2 release.
+ Include recordproto.h instead of recordstr.h
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 849fa907e129575831fbd3fa69249ff843413fd5
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Aug 14 14:15:48 2009 +1000
- * configure.ac:
- Update pkgcheck dependencies to work with separate build roots.
+ Move record headers to here.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 1c928d9c138c90512d534e67e96bced247ca3241
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Aug 14 15:00:15 2009 +1000
- * configure.ac:
- Update package version number for RC1 release.
+ XRecord: avoid use of uninitialised variables.
+
+ Both variables are initialized inside an if condition but later checked for
+ NULL.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-2005-07-08 Keith Packard <keithp@keithp.com>
+commit c0404c6db9a8eacc07d140093982b910e54e3f97
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed Jul 22 20:34:51 2009 +1000
- * .cvsignore:
- * src/.cvsignore:
- * src/Makefile.am:
- Add .cvsignore files
- Switch _la_CFLAGS for AM_CFLAGS to clean up directory
+ Version bump: 1.0.99.1
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-2005-06-21 Alexander Gottwald <ago at freedesktop dot org>
+commit 3f4b895a29b1b48336621e6dcc80831a5910bed9
+Author: Magnus Kessler <Magnus.Kessler@gmx.net>
+Date: Wed Jul 22 09:29:16 2009 +0100
- * configure.ac
- Add missing xext.pc and xextproto.pc
+ Rename xtest.h to xtestconst.h to avoid a collision with XTest.h on case-insensitive filesystems
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+commit ab9ad139b1f20866405ddcc44d25b7b141cd7bce
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Jul 20 13:26:45 2009 +1000
+
+ Move XTest.h header from xextproto/libXext to here.
+
+ XTest.h was in xextproto until xextproto-7.1 and did a short but whoefully
+ misguided visit to libXext during the cleanup of the xextproto headers.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit a119baf3c5aa4f035040e0b991e99e6b382b9670
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Jul 16 09:41:33 2009 +1000
+
+ Include xtestproto.h, not xteststr.h
+
+ Require xextproto 7.0.99.1.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 378db00ee91a11629666fc1c5e5a5e13c65ffefc
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Feb 2 20:34:37 2009 -0800
+
+ Add README with pointers to mailing list, bugzilla & git repos
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 3237cc5b45a41ffe93ebde10b1090a7f2db6f88e
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date: Fri Jan 30 20:41:31 2009 -0200
+
+ Janitor: ansification, make distcheck, compiler warnings.
+
+ Manual page generation, and xmlto handling, shamelessly cut&paste'd
+ from libXi/man/Makefile.am, so that make distcheck will work.
+
+commit 48544103324d1816139dfafe5873a11c88ee05b6
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date: Fri Aug 8 10:18:19 2008 +0930
+
+ Require xi.pc for XInput.h include.
+
+ XInput.h is now part of libXi. But just in case we have an older version of
+ libXi floating around, pull in inputproto too.
+
+commit 5b4ba84a422d168c01b335c4fc4046a7316463e0
+Author: Ian Romanick <idr@us.ibm.com>
+Date: Wed May 21 12:38:00 2008 -0700
+
+ Add .PHONY build target to fix parallel builds
+
+commit 56bc832134b4f6884999797f0f0c1b846602088d
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Mon May 19 17:38:08 2008 +0930
+
+ Rename parameters to clarify QueryExtension call.
+
+ These parameters are not treated as input. Rename them to make the inner
+ workings slightly more obvious.
+
+ X.Org Bug 14511 <http://bugs.freedesktop.org/show_bug.cgi?id=14511>
+
+commit f3971bca54ff6018758642303108eec975d80cd5
+Author: James Cloos <cloos@jhcloos.com>
+Date: Thu Dec 6 15:51:20 2007 -0500
+
+ Add missing PHONY line for automatic ChangeLog generation
+
+commit 8db9ffdf7a16162cd81da2bf1e914ecf3981d0ee
+Author: Egbert Eich <eich@freedesktop.org>
+Date: Tue Oct 16 14:27:57 2007 +0200
+
+ Wrong place. Reverting srcdir patch.
+
+commit 7684e7da5648fb8664c145a5f4d79d8e2d085808
+Author: Egbert Eich <eich@freedesktop.org>
+Date: Mon Oct 15 11:44:53 2007 +0200
+
+ Fix man page build when srcdir is specified.
+
+commit 4a5ac6a63c22bdfac9a873803f3a0fa3d6e20a5b
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Fri Aug 17 14:57:22 2007 -0700
+
+ Version bump: 1.0.3
+
+commit fe206f87078c90afaa5eba42a4bbe1c0ea300e9b
+Author: zoka <zoran@microtrol.com.au>
+Date: Mon Jul 2 20:34:52 2007 -0700
+
+ libXtst man pages generation fails if srcdir != builddir
+
+commit a8738715dd5b74f0dec904c83b732ef6471be0db
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Wed Jun 6 18:57:12 2007 -0700
+
+ Version bump: 1.0.2
+
+commit 8bbc3b75318c67f6089d50f68d53d092390c8233
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Wed Jun 6 18:41:36 2007 -0700
+
+ Replace static ChangeLog with dist-hook to generate from git
+
+commit 6aaa875dffbcc5dd2206644cfa73fdfd8ffe280f
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Wed Jun 6 18:13:32 2007 -0700
+
+ Convert man page to docbook/xml (thanks to doclifter)
+
+commit d9514f97f54b47630b645ef44a5d40262a10d33a
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Wed Jun 6 16:39:01 2007 -0700
+
+ Add man pages for XTest*() functions
+
+ Converted xorg-docs/Xext/xtestlib.ms to man page formatting
+
+commit 68a28875bc7a2cd760f035508997dfd88b3b6cc8
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Wed Jun 6 14:43:59 2007 -0700
+
+ Fill in COPYING file with real copyright/licenses
+
+commit 931675017dd28ccca8353abeff3055f0c47bc3b2
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Wed Jun 6 14:36:43 2007 -0700
+
+ Coverity #578/579: Don't leak memory if one malloc fails but other succeeds
+
+ (Unlikely to happen, since the smaller malloc was first, but still possible.)
+
+commit dab4830b8db0d3cf5db5e96b2b870e94a48330bc
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Wed Jun 6 14:23:17 2007 -0700
+
+ ANSIfy static function declarations (clears some lint warnings)
+
+commit 57a201a15637cfea6c15a4d0ed8b629c9cd49495
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Wed Jun 6 14:11:04 2007 -0700
+
+ Add hooks to check code with sparse/lint
+
+commit 5e791a1465aba3b8be89b4cf2d9f90dee18e8e96
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Wed Jun 6 14:10:44 2007 -0700
+
+ Add *~ to .gitignore to skip emacs/patch droppings
+
+commit 68ca8cd2ba9877ee2e3695783f3a8445ab366ea8
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Jul 13 14:59:09 2006 -0700
+
+ renamed: .cvsignore -> .gitignore
+
+commit 1f76457e307db2cec4c7f1e4b66dab597271fc86
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Dec 21 02:30:06 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit 0f5c2436708a0d399f8fc348902518a9117728ac
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Dec 19 16:28:27 2005 +0000
+
+ Stub COPYING files
+
+commit b5670af70e2e29f67639e85106817740c83ccc8d
+Author: Kevin E Martin <kem@kem.org>
+Date: Thu Dec 15 00:24:35 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit c68f6e145fac21f3fc6fe7d09b5e8639538d54e1
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Dec 3 05:49:45 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit 1d76bb2d8bb23d91a64c23923fc819af0badb57b
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Nov 19 07:15:43 2005 +0000
+
+ Update pkgconfig files to separate library build-time dependencies from
+ application build-time dependencies, and update package deps to work
+ with separate build roots.
+
+commit 3e0b2a05fcfb60561402b46318bd152b466509f9
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Nov 9 21:19:13 2005 +0000
+
+ Update package version number for X11R7 RC2 release.
+
+commit c753f306d0bda3dc3009ad273e9cd3548ea13bb8
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Nov 1 15:11:52 2005 +0000
+
+ Update pkgcheck dependencies to work with separate build roots.
+
+commit 36c47a88481794b25118870a6caf93d2b2ca9344
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Oct 19 02:48:12 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 6578854789201d229f20ae560d4b7051e9402c84
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Wed Aug 3 03:28:02 2005 +0000
+
+ Do PKG_CHECK_MODULES on a unique token instead of on "DEP", so builds with
+ a global configure cache don't get confused.
+
+commit aa10e9ef0425286da35fb3312dd6df31066c627a
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Jul 29 21:22:53 2005 +0000
+
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
+
+commit a72494febb5b14a5ad860f1048ff11bdd83bbe53
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Sat Jul 16 07:39:26 2005 +0000
+
+ Set soversion to 6.1.0 with -version-number.
+
+commit 9001f6684617761cf258e71259f98f85c02f33d1
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Thu Jul 14 15:07:42 2005 +0000
+
+ more trailing whitespace
+
+commit 3568421ddbec548cff7b49eb339d5bafaab2cbd3
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Jul 9 06:50:41 2005 +0000
+
+ Add .cvsignore files Switch _la_CFLAGS for AM_CFLAGS to clean up directory
+
+commit 1f8c48e0574892a0b3fe359fb65523d7d1dcc236
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Jul 2 06:35:03 2005 +0000
+
+ Add appropriate lib*_CFLAGS to Makefile.am's -- fixes build problems
+
+commit 250934b516532e24e48a9aa93dd389493acc4f53
+Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
+Date: Tue Jun 21 15:41:36 2005 +0000
+
+ lib/XScrnSaver/configure.ac
+ lib/XScrnSaver/src/Makefile.am
+ lib/Xfontcache/configure.ac
+ lib/Xfontcache/src/Makefile.am
+ lib/Xinerama/configure.ac
+ lib/Xinerama/src/Makefile.am
+ lib/Xtst/configure.ac
+ lib/Xv/configure.ac
+ lib/XvMC/configure.ac
+ lib/dmx/configure.ac Add missing xext.pc and xextproto.pc Add DEP_CFLAGS to
+ src/Makefile.am
+
+commit dbedf673f50e0baf6d5af60f60dbd16368071ed4
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Mon Jun 13 19:44:25 2005 +0000
+
+ - Add Xtst to symlink.sh
+ - Add Xtst build system
+
+commit e2cdce7dab4c62bdfcff33ee9270f6a7703352ef
+Author: Egbert Eich <eich@suse.de>
+Date: Mon May 24 19:06:58 2004 +0000
+
+ Fix build glitches when building modules independently using Imake.
+
+commit 3bb9e7d92569600697ec398e9cff01e50101ff22
+Author: Egbert Eich <eich@suse.de>
+Date: Fri Apr 23 18:43:55 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 91ddef6b5dec497a7501fc7a9416cfc6454824f3
+Author: Egbert Eich <eich@suse.de>
+Date: Sun Mar 14 08:32:27 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit efc2b386671de52b5454a336dab4afa3aeabd340
+Author: Egbert Eich <eich@suse.de>
+Date: Wed Mar 3 12:11:32 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit b7c0ec40d3045f024bb74292189f72cdf7a1cd14
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 13:35:34 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 2f5a9d8afe48466be084cea784ac73e932655f6e
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 09:22:48 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 7aea93fb6b188b32b0be32f064997aabe8d7bdda
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Tue Nov 25 19:28:16 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit 88eb8a804d05b72091309323ad2df962a1ed7b8d
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:49 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 65a2b6d50473730673749ad2facc248ea41af00a
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 15:54:39 2003 +0000
+
+ R6.6 is the Xorg base-line
diff --git a/lib/libXtst/Makefile.am b/lib/libXtst/Makefile.am
index 23a33b8ec..7e9ac8167 100644
--- a/lib/libXtst/Makefile.am
+++ b/lib/libXtst/Makefile.am
@@ -19,10 +19,22 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
-SUBDIRS = src
+SUBDIRS = src man
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xtst.pc
-EXTRA_DIST = xtst.pc.in autogen.sh
+EXTRA_DIST = xtst.pc.in ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+.PHONY: ChangeLog
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
+
+if LINT
+lint:
+ (cd src && $(MAKE) $(MFLAGS) lint)
+endif LINT
diff --git a/lib/libXtst/Makefile.in b/lib/libXtst/Makefile.in
index e2f412565..3c9a0fb89 100644
--- a/lib/libXtst/Makefile.in
+++ b/lib/libXtst/Makefile.in
@@ -102,7 +102,6 @@ am__remove_distdir = \
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
@@ -119,8 +118,10 @@ AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -208,6 +209,7 @@ build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
@@ -238,7 +240,7 @@ target_alias = @target_alias@
SUBDIRS = src man
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xtst.pc
-EXTRA_DIST = xtst.pc.in autogen.sh ChangeLog
+EXTRA_DIST = xtst.pc.in ChangeLog
MAINTAINERCLEANFILES = ChangeLog
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -704,8 +706,10 @@ uninstall-info: uninstall-info-recursive
uninstall-pkgconfigDATA
+.PHONY: ChangeLog
+
ChangeLog:
- (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+ $(CHANGELOG_CMD)
dist-hook: ChangeLog
diff --git a/lib/libXtst/README b/lib/libXtst/README
index e69de29bb..eed865209 100644
--- a/lib/libXtst/README
+++ b/lib/libXtst/README
@@ -0,0 +1,24 @@
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+Please submit bug reports to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/lib/libXtst
+
+ http://cgit.freedesktop.org/xorg/lib/libXtst
+
+For patch submission instructions, see:
+
+ http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
+
diff --git a/lib/libXtst/autogen.sh b/lib/libXtst/autogen.sh
deleted file mode 100644
index 904cd6746..000000000
--- a/lib/libXtst/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/lib/libXtst/configure b/lib/libXtst/configure
index a1d7e6ba7..22b9a0fcd 100644
--- a/lib/libXtst/configure
+++ b/lib/libXtst/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.62 for libXtst 1.0.3.
+# Generated by GNU Autoconf 2.62 for libXtst 1.1.0.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -750,8 +750,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='libXtst'
PACKAGE_TARNAME='libXtst'
-PACKAGE_VERSION='1.0.3'
-PACKAGE_STRING='libXtst 1.0.3'
+PACKAGE_VERSION='1.1.0'
+PACKAGE_STRING='libXtst 1.1.0'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
# Factoring default headers for most tests.
@@ -896,6 +896,21 @@ F77
FFLAGS
ac_ct_F77
LIBTOOL
+CWARNFLAGS
+CHANGELOG_CMD
+distcleancheck_listfiles
+APP_MAN_SUFFIX
+LIB_MAN_SUFFIX
+FILE_MAN_SUFFIX
+MISC_MAN_SUFFIX
+DRIVER_MAN_SUFFIX
+ADMIN_MAN_SUFFIX
+APP_MAN_DIR
+LIB_MAN_DIR
+FILE_MAN_DIR
+MISC_MAN_DIR
+DRIVER_MAN_DIR
+ADMIN_MAN_DIR
XMLTO
HAVE_XMLTO_TRUE
HAVE_XMLTO_FALSE
@@ -909,18 +924,6 @@ LINT_FALSE
LINTLIB
MAKE_LINT_LIB_TRUE
MAKE_LINT_LIB_FALSE
-APP_MAN_SUFFIX
-LIB_MAN_SUFFIX
-FILE_MAN_SUFFIX
-MISC_MAN_SUFFIX
-DRIVER_MAN_SUFFIX
-ADMIN_MAN_SUFFIX
-APP_MAN_DIR
-LIB_MAN_DIR
-FILE_MAN_DIR
-MISC_MAN_DIR
-DRIVER_MAN_DIR
-ADMIN_MAN_DIR
LIBOBJS
LTLIBOBJS'
ac_subst_files=''
@@ -935,10 +938,11 @@ with_gnu_ld
enable_libtool_lock
with_pic
with_tags
+enable_strict_compilation
+with_release_version
with_xmlto
with_lint
enable_lint_library
-with_release_version
'
ac_precious_vars='build_alias
host_alias
@@ -1511,7 +1515,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libXtst 1.0.3 to adapt to many kinds of systems.
+\`configure' configures libXtst 1.1.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1581,7 +1585,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libXtst 1.0.3:";;
+ short | recursive ) echo "Configuration of libXtst 1.1.0:";;
esac
cat <<\_ACEOF
@@ -1598,6 +1602,9 @@ Optional Features:
--enable-fast-install[=PKGS]
optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds)
+ --enable-strict-compilation
+ Enable all warnings from compiler and make them
+ errors (default: disabled)
--enable-lint-library Create lint library (default: disabled)
Optional Packages:
@@ -1607,12 +1614,12 @@ Optional Packages:
--with-pic try to use only PIC/non-PIC objects [default=use
both]
--with-tags[=TAGS] include additional configurations [automatic]
+ --with-release-version=STRING
+ Use release version string in package name
--with-xmlto Use xmlto to regenerate documentation (default: yes,
if installed)
--with-lint Use a lint-style source code checker (default:
disabled)
- --with-release-version=STRING
- Use release version string in package name
Some influential environment variables:
CC C compiler command
@@ -1699,7 +1706,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libXtst configure 1.0.3
+libXtst configure 1.1.0
generated by GNU Autoconf 2.62
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1713,7 +1720,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libXtst $as_me 1.0.3, which was
+It was created by libXtst $as_me 1.1.0, which was
generated by GNU Autoconf 2.62. Invocation command line was
$ $0 $@
@@ -2362,7 +2369,7 @@ fi
# Define the identity of the package.
PACKAGE='libXtst'
- VERSION='1.0.3'
+ VERSION='1.1.0'
cat >>confdefs.h <<_ACEOF
@@ -2533,6 +2540,18 @@ fi
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+
+
+
+
+
+
+
+
+
+
+
ac_config_headers="$ac_config_headers config.h"
@@ -4422,7 +4441,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4425 "configure"' > conftest.$ac_ext
+ echo '#line 4444 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7530,11 +7549,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7533: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7552: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7537: \$? = $ac_status" >&5
+ echo "$as_me:7556: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7820,11 +7839,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7823: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7842: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7827: \$? = $ac_status" >&5
+ echo "$as_me:7846: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7924,11 +7943,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7927: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7946: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7931: \$? = $ac_status" >&5
+ echo "$as_me:7950: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10324,7 +10343,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10327 "configure"
+#line 10346 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10424,7 +10443,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10427 "configure"
+#line 10446 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12833,11 +12852,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12836: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12855: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12840: \$? = $ac_status" >&5
+ echo "$as_me:12859: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -12937,11 +12956,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12940: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12959: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12944: \$? = $ac_status" >&5
+ echo "$as_me:12963: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14520,11 +14539,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14523: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14542: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14527: \$? = $ac_status" >&5
+ echo "$as_me:14546: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14624,11 +14643,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14627: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14646: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14631: \$? = $ac_status" >&5
+ echo "$as_me:14650: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16839,11 +16858,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16842: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16861: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16846: \$? = $ac_status" >&5
+ echo "$as_me:16865: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17129,11 +17148,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17132: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17151: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17136: \$? = $ac_status" >&5
+ echo "$as_me:17155: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17233,11 +17252,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17236: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17255: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17240: \$? = $ac_status" >&5
+ echo "$as_me:17259: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -19918,6 +19937,548 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ { $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C99" >&5
+$as_echo_n "checking for $CC option to accept ISO C99... " >&6; }
+if test "${ac_cv_prog_cc_c99+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_prog_cc_c99=no
+ac_save_CC=$CC
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <wchar.h>
+#include <stdio.h>
+
+// Check varargs macros. These examples are taken from C99 6.10.3.5.
+#define debug(...) fprintf (stderr, __VA_ARGS__)
+#define showlist(...) puts (#__VA_ARGS__)
+#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
+static void
+test_varargs_macros (void)
+{
+ int x = 1234;
+ int y = 5678;
+ debug ("Flag");
+ debug ("X = %d\n", x);
+ showlist (The first, second, and third items.);
+ report (x>y, "x is %d but y is %d", x, y);
+}
+
+// Check long long types.
+#define BIG64 18446744073709551615ull
+#define BIG32 4294967295ul
+#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
+#if !BIG_OK
+ your preprocessor is broken;
+#endif
+#if BIG_OK
+#else
+ your preprocessor is broken;
+#endif
+static long long int bignum = -9223372036854775807LL;
+static unsigned long long int ubignum = BIG64;
+
+struct incomplete_array
+{
+ int datasize;
+ double data[];
+};
+
+struct named_init {
+ int number;
+ const wchar_t *name;
+ double average;
+};
+
+typedef const char *ccp;
+
+static inline int
+test_restrict (ccp restrict text)
+{
+ // See if C++-style comments work.
+ // Iterate through items via the restricted pointer.
+ // Also check for declarations in for loops.
+ for (unsigned int i = 0; *(text+i) != '\0'; ++i)
+ continue;
+ return 0;
+}
+
+// Check varargs and va_copy.
+static void
+test_varargs (const char *format, ...)
+{
+ va_list args;
+ va_start (args, format);
+ va_list args_copy;
+ va_copy (args_copy, args);
+
+ const char *str;
+ int number;
+ float fnumber;
+
+ while (*format)
+ {
+ switch (*format++)
+ {
+ case 's': // string
+ str = va_arg (args_copy, const char *);
+ break;
+ case 'd': // int
+ number = va_arg (args_copy, int);
+ break;
+ case 'f': // float
+ fnumber = va_arg (args_copy, double);
+ break;
+ default:
+ break;
+ }
+ }
+ va_end (args_copy);
+ va_end (args);
+}
+
+int
+main ()
+{
+
+ // Check bool.
+ _Bool success = false;
+
+ // Check restrict.
+ if (test_restrict ("String literal") == 0)
+ success = true;
+ char *restrict newvar = "Another string";
+
+ // Check varargs.
+ test_varargs ("s, d' f .", "string", 65, 34.234);
+ test_varargs_macros ();
+
+ // Check flexible array members.
+ struct incomplete_array *ia =
+ malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
+ ia->datasize = 10;
+ for (int i = 0; i < ia->datasize; ++i)
+ ia->data[i] = i * 1.234;
+
+ // Check named initializers.
+ struct named_init ni = {
+ .number = 34,
+ .name = L"Test wide string",
+ .average = 543.34343,
+ };
+
+ ni.number = 58;
+
+ int dynamic_array[ni.number];
+ dynamic_array[ni.number - 1] = 543;
+
+ // work around unused variable warnings
+ return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x'
+ || dynamic_array[ni.number - 1] != 543);
+
+ ;
+ return 0;
+}
+_ACEOF
+for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99
+do
+ CC="$ac_save_CC $ac_arg"
+ rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_cc_c99=$ac_arg
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext
+ test "x$ac_cv_prog_cc_c99" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c99" in
+ x)
+ { $as_echo "$as_me:$LINENO: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+ xno)
+ { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+ *)
+ CC="$CC $ac_cv_prog_cc_c99"
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c99" >&5
+$as_echo "$ac_cv_prog_cc_c99" >&6; } ;;
+esac
+
+
+
+
+
+
+if test "x$GCC" = xyes ; then
+ CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
+-Wmissing-declarations -Wnested-externs -fno-strict-aliasing \
+-Wbad-function-cast"
+ case `$CC -dumpversion` in
+ 3.4.* | 4.*)
+ CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement"
+ ;;
+ esac
+else
+ { $as_echo "$as_me:$LINENO: checking whether __SUNPRO_C is declared" >&5
+$as_echo_n "checking whether __SUNPRO_C is declared... " >&6; }
+if test "${ac_cv_have_decl___SUNPRO_C+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+#ifndef __SUNPRO_C
+ (void) __SUNPRO_C;
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_have_decl___SUNPRO_C=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_have_decl___SUNPRO_C=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___SUNPRO_C" >&5
+$as_echo "$ac_cv_have_decl___SUNPRO_C" >&6; }
+if test $ac_cv_have_decl___SUNPRO_C = yes; then
+ SUNCC="yes"
+else
+ SUNCC="no"
+fi
+
+ if test "x$SUNCC" = "xyes"; then
+ CWARNFLAGS="-v"
+ fi
+fi
+
+
+
+
+
+
+
+
+# Check whether --enable-strict-compilation was given.
+if test "${enable_strict_compilation+set}" = set; then
+ enableval=$enable_strict_compilation; STRICT_COMPILE=$enableval
+else
+ STRICT_COMPILE=no
+fi
+
+if test "x$STRICT_COMPILE" = "xyes"; then
+ { $as_echo "$as_me:$LINENO: checking whether __SUNPRO_C is declared" >&5
+$as_echo_n "checking whether __SUNPRO_C is declared... " >&6; }
+if test "${ac_cv_have_decl___SUNPRO_C+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+#ifndef __SUNPRO_C
+ (void) __SUNPRO_C;
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_have_decl___SUNPRO_C=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_have_decl___SUNPRO_C=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___SUNPRO_C" >&5
+$as_echo "$ac_cv_have_decl___SUNPRO_C" >&6; }
+if test $ac_cv_have_decl___SUNPRO_C = yes; then
+ SUNCC="yes"
+else
+ SUNCC="no"
+fi
+
+ { $as_echo "$as_me:$LINENO: checking whether __INTEL_COMPILER is declared" >&5
+$as_echo_n "checking whether __INTEL_COMPILER is declared... " >&6; }
+if test "${ac_cv_have_decl___INTEL_COMPILER+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+#ifndef __INTEL_COMPILER
+ (void) __INTEL_COMPILER;
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_have_decl___INTEL_COMPILER=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_have_decl___INTEL_COMPILER=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___INTEL_COMPILER" >&5
+$as_echo "$ac_cv_have_decl___INTEL_COMPILER" >&6; }
+if test $ac_cv_have_decl___INTEL_COMPILER = yes; then
+ INTELCC="yes"
+else
+ INTELCC="no"
+fi
+
+ if test "x$GCC" = xyes ; then
+ STRICT_CFLAGS="-pedantic -Werror"
+ elif test "x$SUNCC" = "xyes"; then
+ STRICT_CFLAGS="-errwarn"
+ elif test "x$INTELCC" = "xyes"; then
+ STRICT_CFLAGS="-Werror"
+ fi
+fi
+CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS"
+
+
+
+
+# Check whether --with-release-version was given.
+if test "${with_release_version+set}" = set; then
+ withval=$with_release_version; RELEASE_VERSION="$withval"
+else
+ RELEASE_VERSION=""
+fi
+
+ if test "x$RELEASE_VERSION" != "x"; then
+ PACKAGE="$PACKAGE-$RELEASE_VERSION"
+ PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
+ { $as_echo "$as_me:$LINENO: Building with package name set to $PACKAGE" >&5
+$as_echo "$as_me: Building with package name set to $PACKAGE" >&6;}
+ fi
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
+_ACEOF
+
+ PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
+ if test "x$PVM" = "x"; then
+ PVM="0"
+ fi
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_MINOR $PVM
+_ACEOF
+
+ PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
+ if test "x$PVP" = "x"; then
+ PVP="0"
+ fi
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_PATCHLEVEL $PVP
+_ACEOF
+
+
+
+CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > .changelog.tmp && \
+mv .changelog.tmp ChangeLog) || (rm -f .changelog.tmp; touch ChangeLog; \
+echo 'git directory not found: installing possibly empty changelog.' >&2)"
+
+distcleancheck_listfiles='find . -type f ! -name ChangeLog -print'
+
+
+
+
+
+if test x$APP_MAN_SUFFIX = x ; then
+ APP_MAN_SUFFIX=1
+fi
+if test x$APP_MAN_DIR = x ; then
+ APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)'
+fi
+
+if test x$LIB_MAN_SUFFIX = x ; then
+ LIB_MAN_SUFFIX=3
+fi
+if test x$LIB_MAN_DIR = x ; then
+ LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)'
+fi
+
+if test x$FILE_MAN_SUFFIX = x ; then
+ case $host_os in
+ solaris*) FILE_MAN_SUFFIX=4 ;;
+ *) FILE_MAN_SUFFIX=5 ;;
+ esac
+fi
+if test x$FILE_MAN_DIR = x ; then
+ FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)'
+fi
+
+if test x$MISC_MAN_SUFFIX = x ; then
+ case $host_os in
+ solaris*) MISC_MAN_SUFFIX=5 ;;
+ *) MISC_MAN_SUFFIX=7 ;;
+ esac
+fi
+if test x$MISC_MAN_DIR = x ; then
+ MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)'
+fi
+
+if test x$DRIVER_MAN_SUFFIX = x ; then
+ case $host_os in
+ solaris*) DRIVER_MAN_SUFFIX=7 ;;
+ *) DRIVER_MAN_SUFFIX=4 ;;
+ esac
+fi
+if test x$DRIVER_MAN_DIR = x ; then
+ DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)'
+fi
+
+if test x$ADMIN_MAN_SUFFIX = x ; then
+ case $host_os in
+ solaris*) ADMIN_MAN_SUFFIX=1m ;;
+ *) ADMIN_MAN_SUFFIX=8 ;;
+ esac
+fi
+if test x$ADMIN_MAN_DIR = x ; then
+ ADMIN_MAN_DIR='$(mandir)/man$(ADMIN_MAN_SUFFIX)'
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
# Check for xmlto for man page conversion
# (only needed by people building tarballs)
@@ -20180,12 +20741,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_XTST_CFLAGS="$XTST_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xext recordproto xextproto inputproto\"") >&5
- ($PKG_CONFIG --exists --print-errors "x11 xext recordproto xextproto inputproto") 2>&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xext >= 1.0.99.4 xi recordproto >= 1.13.99.1 xextproto >= 7.0.99.3 inputproto\"") >&5
+ ($PKG_CONFIG --exists --print-errors "x11 xext >= 1.0.99.4 xi recordproto >= 1.13.99.1 xextproto >= 7.0.99.3 inputproto") 2>&5
ac_status=$?
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_XTST_CFLAGS=`$PKG_CONFIG --cflags "x11 xext recordproto xextproto inputproto" 2>/dev/null`
+ pkg_cv_XTST_CFLAGS=`$PKG_CONFIG --cflags "x11 xext >= 1.0.99.4 xi recordproto >= 1.13.99.1 xextproto >= 7.0.99.3 inputproto" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -20198,12 +20759,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_XTST_LIBS="$XTST_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xext recordproto xextproto inputproto\"") >&5
- ($PKG_CONFIG --exists --print-errors "x11 xext recordproto xextproto inputproto") 2>&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xext >= 1.0.99.4 xi recordproto >= 1.13.99.1 xextproto >= 7.0.99.3 inputproto\"") >&5
+ ($PKG_CONFIG --exists --print-errors "x11 xext >= 1.0.99.4 xi recordproto >= 1.13.99.1 xextproto >= 7.0.99.3 inputproto") 2>&5
ac_status=$?
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_XTST_LIBS=`$PKG_CONFIG --libs "x11 xext recordproto xextproto inputproto" 2>/dev/null`
+ pkg_cv_XTST_LIBS=`$PKG_CONFIG --libs "x11 xext >= 1.0.99.4 xi recordproto >= 1.13.99.1 xextproto >= 7.0.99.3 inputproto" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -20222,14 +20783,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- XTST_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11 xext recordproto xextproto inputproto"`
+ XTST_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11 xext >= 1.0.99.4 xi recordproto >= 1.13.99.1 xextproto >= 7.0.99.3 inputproto"`
else
- XTST_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11 xext recordproto xextproto inputproto"`
+ XTST_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11 xext >= 1.0.99.4 xi recordproto >= 1.13.99.1 xextproto >= 7.0.99.3 inputproto"`
fi
# Put the nasty error message in config.log where it belongs
echo "$XTST_PKG_ERRORS" >&5
- { { $as_echo "$as_me:$LINENO: error: Package requirements (x11 xext recordproto xextproto inputproto) were not met:
+ { { $as_echo "$as_me:$LINENO: error: Package requirements (x11 xext >= 1.0.99.4 xi recordproto >= 1.13.99.1 xextproto >= 7.0.99.3 inputproto) were not met:
$XTST_PKG_ERRORS
@@ -20240,7 +20801,7 @@ Alternatively, you may set the environment variables XTST_CFLAGS
and XTST_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
-$as_echo "$as_me: error: Package requirements (x11 xext recordproto xextproto inputproto) were not met:
+$as_echo "$as_me: error: Package requirements (x11 xext >= 1.0.99.4 xi recordproto >= 1.13.99.1 xextproto >= 7.0.99.3 inputproto) were not met:
$XTST_PKG_ERRORS
@@ -20281,6 +20842,9 @@ else
$as_echo "yes" >&6; }
:
fi
+XTST_CFLAGS="$CWARNFLAGS $XTST_CFLAGS"
+
+
@@ -20361,120 +20925,6 @@ fi
LINT_FLAGS="${LINT_FLAGS} ${XTST_CFLAGS}"
-
-
-
-
-
-
-if test x$APP_MAN_SUFFIX = x ; then
- APP_MAN_SUFFIX=1
-fi
-if test x$APP_MAN_DIR = x ; then
- APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)'
-fi
-
-if test x$LIB_MAN_SUFFIX = x ; then
- LIB_MAN_SUFFIX=3
-fi
-if test x$LIB_MAN_DIR = x ; then
- LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)'
-fi
-
-if test x$FILE_MAN_SUFFIX = x ; then
- case $host_os in
- solaris*) FILE_MAN_SUFFIX=4 ;;
- *) FILE_MAN_SUFFIX=5 ;;
- esac
-fi
-if test x$FILE_MAN_DIR = x ; then
- FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)'
-fi
-
-if test x$MISC_MAN_SUFFIX = x ; then
- case $host_os in
- solaris*) MISC_MAN_SUFFIX=5 ;;
- *) MISC_MAN_SUFFIX=7 ;;
- esac
-fi
-if test x$MISC_MAN_DIR = x ; then
- MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)'
-fi
-
-if test x$DRIVER_MAN_SUFFIX = x ; then
- case $host_os in
- solaris*) DRIVER_MAN_SUFFIX=7 ;;
- *) DRIVER_MAN_SUFFIX=4 ;;
- esac
-fi
-if test x$DRIVER_MAN_DIR = x ; then
- DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)'
-fi
-
-if test x$ADMIN_MAN_SUFFIX = x ; then
- case $host_os in
- solaris*) ADMIN_MAN_SUFFIX=1m ;;
- *) ADMIN_MAN_SUFFIX=8 ;;
- esac
-fi
-if test x$ADMIN_MAN_DIR = x ; then
- ADMIN_MAN_DIR='$(mandir)/man$(ADMIN_MAN_SUFFIX)'
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# Check whether --with-release-version was given.
-if test "${with_release_version+set}" = set; then
- withval=$with_release_version; RELEASE_VERSION="$withval"
-else
- RELEASE_VERSION=""
-fi
-
- if test "x$RELEASE_VERSION" != "x"; then
- PACKAGE="$PACKAGE-$RELEASE_VERSION"
- PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
- { $as_echo "$as_me:$LINENO: Building with package name set to $PACKAGE" >&5
-$as_echo "$as_me: Building with package name set to $PACKAGE" >&6;}
- fi
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
-_ACEOF
-
- PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
- if test "x$PVM" = "x"; then
- PVM="0"
- fi
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION_MINOR $PVM
-_ACEOF
-
- PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
- if test "x$PVP" = "x"; then
- PVP="0"
- fi
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION_PATCHLEVEL $PVP
-_ACEOF
-
-
-
ac_config_files="$ac_config_files Makefile man/Makefile src/Makefile xtst.pc"
cat >confcache <<\_ACEOF
@@ -20945,7 +21395,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libXtst $as_me 1.0.3, which was
+This file was extended by libXtst $as_me 1.1.0, which was
generated by GNU Autoconf 2.62. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20998,7 +21448,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-libXtst config.status 1.0.3
+libXtst config.status 1.1.0
configured by $0, generated by GNU Autoconf 2.62,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/lib/libXtst/configure.ac b/lib/libXtst/configure.ac
index 617f80da5..767d6b4e2 100644
--- a/lib/libXtst/configure.ac
+++ b/lib/libXtst/configure.ac
@@ -23,34 +23,35 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(libXtst, 1.0.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXtst)
+AC_INIT(libXtst, 1.1.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXtst)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
AM_CONFIG_HEADER(config.h)
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
+XORG_DEFAULT_OPTIONS
# Check for xmlto for man page conversion
# (only needed by people building tarballs)
XORG_WITH_XMLTO
# Check for dependencies
-PKG_CHECK_MODULES(XTST, x11 xext recordproto xextproto inputproto)
+PKG_CHECK_MODULES(XTST, x11 [xext >= 1.0.99.4] xi [recordproto >= 1.13.99.1] [xextproto >= 7.0.99.3] inputproto)
+XTST_CFLAGS="$CWARNFLAGS $XTST_CFLAGS"
+AC_SUBST(XTST_CFLAGS)
+AC_SUBST(XTST_LIBS)
dnl Allow checking code with lint, sparse, etc.
XORG_WITH_LINT
XORG_LINT_LIBRARY([Xtst])
LINT_FLAGS="${LINT_FLAGS} ${XTST_CFLAGS}"
-AC_SUBST(XTST_CFLAGS)
-AC_SUBST(XTST_LIBS)
-
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-
AC_OUTPUT([Makefile
man/Makefile
src/Makefile
diff --git a/lib/libXtst/include/X11/extensions/XTest.h b/lib/libXtst/include/X11/extensions/XTest.h
new file mode 100644
index 000000000..aad9420ab
--- /dev/null
+++ b/lib/libXtst/include/X11/extensions/XTest.h
@@ -0,0 +1,146 @@
+/* $Xorg: XTest.h,v 1.5 2001/02/09 02:03:24 xorgcvs Exp $ */
+/*
+
+Copyright 1992, 1998 The Open Group
+
+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.
+
+*/
+/* $XFree86: xc/include/extensions/XTest.h,v 3.3 2001/12/14 19:53:28 dawes Exp $ */
+
+#ifndef _XTEST_H_
+#define _XTEST_H_
+
+#include <X11/Xfuncproto.h>
+#include <X11/extensions/xtestconst.h>
+#include <X11/extensions/XInput.h>
+
+_XFUNCPROTOBEGIN
+
+Bool XTestQueryExtension(
+ Display* /* dpy */,
+ int* /* event_basep */,
+ int* /* error_basep */,
+ int* /* majorp */,
+ int* /* minorp */
+);
+
+Bool XTestCompareCursorWithWindow(
+ Display* /* dpy */,
+ Window /* window */,
+ Cursor /* cursor */
+);
+
+Bool XTestCompareCurrentCursorWithWindow(
+ Display* /* dpy */,
+ Window /* window */
+);
+
+extern int XTestFakeKeyEvent(
+ Display* /* dpy */,
+ unsigned int /* keycode */,
+ Bool /* is_press */,
+ unsigned long /* delay */
+);
+
+extern int XTestFakeButtonEvent(
+ Display* /* dpy */,
+ unsigned int /* button */,
+ Bool /* is_press */,
+ unsigned long /* delay */
+);
+
+extern int XTestFakeMotionEvent(
+ Display* /* dpy */,
+ int /* screen */,
+ int /* x */,
+ int /* y */,
+ unsigned long /* delay */
+);
+
+extern int XTestFakeRelativeMotionEvent(
+ Display* /* dpy */,
+ int /* x */,
+ int /* y */,
+ unsigned long /* delay */
+);
+
+extern int XTestFakeDeviceKeyEvent(
+ Display* /* dpy */,
+ XDevice* /* dev */,
+ unsigned int /* keycode */,
+ Bool /* is_press */,
+ int* /* axes */,
+ int /* n_axes */,
+ unsigned long /* delay */
+);
+
+extern int XTestFakeDeviceButtonEvent(
+ Display* /* dpy */,
+ XDevice* /* dev */,
+ unsigned int /* button */,
+ Bool /* is_press */,
+ int* /* axes */,
+ int /* n_axes */,
+ unsigned long /* delay */
+);
+
+extern int XTestFakeProximityEvent(
+ Display* /* dpy */,
+ XDevice* /* dev */,
+ Bool /* in_prox */,
+ int* /* axes */,
+ int /* n_axes */,
+ unsigned long /* delay */
+);
+
+extern int XTestFakeDeviceMotionEvent(
+ Display* /* dpy */,
+ XDevice* /* dev */,
+ Bool /* is_relative */,
+ int /* first_axis */,
+ int* /* axes */,
+ int /* n_axes */,
+ unsigned long /* delay */
+);
+
+extern int XTestGrabControl(
+ Display* /* dpy */,
+ Bool /* impervious */
+);
+
+void XTestSetGContextOfGC(
+ GC /* gc */,
+ GContext /* gid */
+);
+
+void XTestSetVisualIDOfVisual(
+ Visual* /* visual */,
+ VisualID /* visualid */
+);
+
+Status XTestDiscard(
+ Display* /* dpy */
+);
+
+_XFUNCPROTOEND
+
+#endif
diff --git a/lib/libXtst/include/X11/extensions/record.h b/lib/libXtst/include/X11/extensions/record.h
new file mode 100644
index 000000000..e82b06cca
--- /dev/null
+++ b/lib/libXtst/include/X11/extensions/record.h
@@ -0,0 +1,183 @@
+/***************************************************************************
+ * Copyright 1995 Network Computing Devices
+ *
+ * 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.
+ **************************************************************************/
+
+#ifndef _RECORD_H_
+#define _RECORD_H_
+
+#include <X11/extensions/recordconst.h>
+
+typedef unsigned long XRecordClientSpec;
+typedef unsigned long XRecordContext;
+
+typedef struct
+{
+ unsigned char first;
+ unsigned char last;
+} XRecordRange8;
+
+typedef struct
+{
+ unsigned short first;
+ unsigned short last;
+} XRecordRange16;
+
+typedef struct
+{
+ XRecordRange8 ext_major;
+ XRecordRange16 ext_minor;
+} XRecordExtRange;
+
+typedef struct
+{
+ XRecordRange8 core_requests; /* core X requests */
+ XRecordRange8 core_replies; /* core X replies */
+ XRecordExtRange ext_requests; /* extension requests */
+ XRecordExtRange ext_replies; /* extension replies */
+ XRecordRange8 delivered_events; /* delivered core and ext events */
+ XRecordRange8 device_events; /* all core and ext device events */
+ XRecordRange8 errors; /* core X and ext errors */
+ Bool client_started; /* connection setup reply */
+ Bool client_died; /* notice of client disconnect */
+} XRecordRange;
+
+typedef struct
+{
+ XRecordClientSpec client;
+ unsigned long nranges;
+ XRecordRange **ranges;
+} XRecordClientInfo;
+
+typedef struct
+{
+ Bool enabled;
+ int datum_flags;
+ unsigned long nclients;
+ XRecordClientInfo **client_info;
+} XRecordState;
+
+typedef struct
+{
+ XID id_base;
+ Time server_time;
+ unsigned long client_seq;
+ int category;
+ Bool client_swapped;
+ unsigned char *data;
+ unsigned long data_len; /* in 4-byte units */
+} XRecordInterceptData;
+
+_XFUNCPROTOBEGIN
+
+/*********************************************************
+ *
+ * Prototypes
+ *
+ */
+
+XID XRecordIdBaseMask(
+ Display *dpy
+);
+
+extern Status XRecordQueryVersion(
+ Display* /* dpy */,
+ int* /* cmajor_return */,
+ int* /* cminor_return */
+);
+
+extern XRecordContext XRecordCreateContext(
+ Display* /* dpy */,
+ int /* datum_flags */,
+ XRecordClientSpec* /* clients */,
+ int /* nclients */,
+ XRecordRange** /* ranges */,
+ int /* nranges */
+);
+
+extern XRecordRange *XRecordAllocRange(
+ void
+);
+
+extern Status XRecordRegisterClients(
+ Display* /* dpy */,
+ XRecordContext /* context */,
+ int /* datum_flags */,
+ XRecordClientSpec* /* clients */,
+ int /* nclients */,
+ XRecordRange** /* ranges */,
+ int /* nranges */
+);
+
+extern Status XRecordUnregisterClients(
+ Display* /* dpy */,
+ XRecordContext /* context */,
+ XRecordClientSpec* /* clients */,
+ int /* nclients */
+);
+
+extern Status XRecordGetContext(
+ Display* /* dpy */,
+ XRecordContext /* context */,
+ XRecordState** /* state_return */
+);
+
+extern void XRecordFreeState(
+XRecordState* /* state */
+);
+
+typedef void (*XRecordInterceptProc) (
+ XPointer /* closure */,
+ XRecordInterceptData* /* recorded_data */
+);
+
+extern Status XRecordEnableContext(
+ Display* /* dpy */,
+ XRecordContext /* context */,
+ XRecordInterceptProc /* callback */,
+ XPointer /* closure */
+);
+
+extern Status XRecordEnableContextAsync(
+ Display* /* dpy */,
+ XRecordContext /* context */,
+ XRecordInterceptProc /* callback */,
+ XPointer /* closure */
+);
+
+extern void XRecordProcessReplies(
+ Display* /* dpy */
+);
+
+extern void XRecordFreeData(
+XRecordInterceptData* /* data */
+);
+
+extern Status XRecordDisableContext(
+ Display* /* dpy */,
+ XRecordContext /* context */
+);
+
+extern Status XRecordFreeContext(
+ Display* /* dpy */,
+ XRecordContext /* context */
+);
+
+_XFUNCPROTOEND
+
+#endif
diff --git a/lib/libXtst/man/Makefile.am b/lib/libXtst/man/Makefile.am
index 845061f86..17553a490 100644
--- a/lib/libXtst/man/Makefile.am
+++ b/lib/libXtst/man/Makefile.am
@@ -28,30 +28,30 @@ libmandir = $(LIB_MAN_DIR)
LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
-libman_xml = $(srcdir)/XTest.xml
-
-XTest_manpages = \
- XTestQueryExtension \
- XTestCompareCursorWithWindow \
- XTestCompareCurrentCursorWithWindow \
- XTestFakeKeyEvent \
- XTestFakeButtonEvent \
- XTestFakeMotionEvent \
- XTestFakeRelativeMotionEvent \
- XTestGrabControl \
- XTestSetGContextOfGC \
- XTestSetVisualIDOfVisual \
- XTestDiscard
-
-libman_PRE = $(XTest_manpages:%=%.man)
-
-EXTRA_DIST = $(libman_PRE) $(libman_xml)
+libman_xml = XTest.xml
+
+libman_PRE = \
+ XTestQueryExtension.man \
+ XTestCompareCursorWithWindow.man \
+ XTestCompareCurrentCursorWithWindow.man \
+ XTestFakeKeyEvent.man \
+ XTestFakeButtonEvent.man \
+ XTestFakeMotionEvent.man \
+ XTestFakeRelativeMotionEvent.man \
+ XTestGrabControl.man \
+ XTestSetGContextOfGC.man \
+ XTestSetVisualIDOfVisual.man \
+ XTestDiscard.man
+
+EXTRA_DIST = $(libman_PRE) $(libman_xml) x.stamp
CLEANFILES = $(libman_DATA) $(BUILT_SOURCES)
MAINTAINERCLEANFILES = $(libman_PRE)
+if HAVE_XMLTO
libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@)
+endif
SED = sed
@@ -72,15 +72,25 @@ SUFFIXES = .$(LIB_MAN_SUFFIX) .man
.man.$(LIB_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
-# Generate nroff sources from DocBook/xml
-
-dist-hook: $(libman_PRE)
-
+# This is ugly, but handling of tools with multiple outputs in make is a
+# huge PITA. The commands below are taken from the automake manual:
+# http://www.gnu.org/software/automake/manual/automake.html#Multiple-Outputs
if HAVE_XMLTO
-$(libman_PRE): $(libman_xml)
- $(XMLTO) man $(libman_xml)
- for m in $(XTest_manpages); do \
- mv -f $$m.__libmansuffix__ $$m.man ; \
+x.stamp: $(libman_xml)
+ @rm -f x.tmp
+ @touch x.tmp
+ $(XMLTO) man $^
+ @for man in $(libman_PRE); do \
+ out=`echo $$man | sed 's/\.man/.__libmansuffix__/'`; \
+ echo mv -f $$out $$man; \
+ mv -f $$out $$man || exit 1; \
done
-
-endif HAVE_XMLTO
+ @mv -f x.tmp $@
+$(libman_PRE): x.stamp
+ @if test -f $@; then :; else \
+ rm -f $<; \
+ $(MAKE) $(AM_MAKEFLAGS) $<; \
+ fi
+CLEANFILES += x.tmp
+MAINTAINERCLEANFILES += x.stamp
+endif # HAVE_XMLTO
diff --git a/lib/libXtst/man/Makefile.in b/lib/libXtst/man/Makefile.in
index 707fc48e7..f9fe11bfd 100644
--- a/lib/libXtst/man/Makefile.in
+++ b/lib/libXtst/man/Makefile.in
@@ -62,6 +62,8 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
+@HAVE_XMLTO_TRUE@am__append_1 = x.tmp
+@HAVE_XMLTO_TRUE@am__append_2 = x.stamp
subdir = man
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -99,8 +101,10 @@ AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -188,6 +192,7 @@ build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
@@ -217,25 +222,24 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
libmandir = $(LIB_MAN_DIR)
LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
-libman_xml = $(srcdir)/XTest.xml
-XTest_manpages = \
- XTestQueryExtension \
- XTestCompareCursorWithWindow \
- XTestCompareCurrentCursorWithWindow \
- XTestFakeKeyEvent \
- XTestFakeButtonEvent \
- XTestFakeMotionEvent \
- XTestFakeRelativeMotionEvent \
- XTestGrabControl \
- XTestSetGContextOfGC \
- XTestSetVisualIDOfVisual \
- XTestDiscard
-
-libman_PRE = $(XTest_manpages:%=%.man)
-EXTRA_DIST = $(libman_PRE) $(libman_xml)
-CLEANFILES = $(libman_DATA) $(BUILT_SOURCES)
-MAINTAINERCLEANFILES = $(libman_PRE)
-libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@)
+libman_xml = XTest.xml
+libman_PRE = \
+ XTestQueryExtension.man \
+ XTestCompareCursorWithWindow.man \
+ XTestCompareCurrentCursorWithWindow.man \
+ XTestFakeKeyEvent.man \
+ XTestFakeButtonEvent.man \
+ XTestFakeMotionEvent.man \
+ XTestFakeRelativeMotionEvent.man \
+ XTestGrabControl.man \
+ XTestSetGContextOfGC.man \
+ XTestSetVisualIDOfVisual.man \
+ XTestDiscard.man
+
+EXTRA_DIST = $(libman_PRE) $(libman_xml) x.stamp
+CLEANFILES = $(libman_DATA) $(BUILT_SOURCES) $(am__append_1)
+MAINTAINERCLEANFILES = $(libman_PRE) $(am__append_2)
+@HAVE_XMLTO_TRUE@libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@)
# Strings to replace in man pages
XORGRELSTRING = @PACKAGE_STRING@
@@ -317,7 +321,6 @@ CTAGS:
distdir: $(DISTFILES)
- $(mkdir_p) $(distdir)/$(srcdir)
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
@@ -344,9 +347,6 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
done
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$(top_distdir)" distdir="$(distdir)" \
- dist-hook
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
@@ -427,29 +427,37 @@ ps-am:
uninstall-am: uninstall-info-am uninstall-libmanDATA
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- dist-hook distclean distclean-generic distclean-libtool \
- distdir dvi dvi-am html html-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am \
- install-libmanDATA install-man install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-info-am uninstall-libmanDATA
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-exec install-exec-am \
+ install-info install-info-am install-libmanDATA install-man \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ uninstall uninstall-am uninstall-info-am uninstall-libmanDATA
.man.$(LIB_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
-# Generate nroff sources from DocBook/xml
-
-dist-hook: $(libman_PRE)
-
-@HAVE_XMLTO_TRUE@$(libman_PRE): $(libman_xml)
-@HAVE_XMLTO_TRUE@ $(XMLTO) man $(libman_xml)
-@HAVE_XMLTO_TRUE@ for m in $(XTest_manpages); do \
-@HAVE_XMLTO_TRUE@ mv -f $$m.__libmansuffix__ $$m.man ; \
+# This is ugly, but handling of tools with multiple outputs in make is a
+# huge PITA. The commands below are taken from the automake manual:
+# http://www.gnu.org/software/automake/manual/automake.html#Multiple-Outputs
+@HAVE_XMLTO_TRUE@x.stamp: $(libman_xml)
+@HAVE_XMLTO_TRUE@ @rm -f x.tmp
+@HAVE_XMLTO_TRUE@ @touch x.tmp
+@HAVE_XMLTO_TRUE@ $(XMLTO) man $^
+@HAVE_XMLTO_TRUE@ @for man in $(libman_PRE); do \
+@HAVE_XMLTO_TRUE@ out=`echo $$man | sed 's/\.man/.__libmansuffix__/'`; \
+@HAVE_XMLTO_TRUE@ echo mv -f $$out $$man; \
+@HAVE_XMLTO_TRUE@ mv -f $$out $$man || exit 1; \
@HAVE_XMLTO_TRUE@ done
+@HAVE_XMLTO_TRUE@ @mv -f x.tmp $@
+@HAVE_XMLTO_TRUE@$(libman_PRE): x.stamp
+@HAVE_XMLTO_TRUE@ @if test -f $@; then :; else \
+@HAVE_XMLTO_TRUE@ rm -f $<; \
+@HAVE_XMLTO_TRUE@ $(MAKE) $(AM_MAKEFLAGS) $<; \
+@HAVE_XMLTO_TRUE@ fi
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/lib/libXtst/man/XTest.xml b/lib/libXtst/man/XTest.xml
index a80ab2272..bc6133799 100644
--- a/lib/libXtst/man/XTest.xml
+++ b/lib/libXtst/man/XTest.xml
@@ -80,17 +80,17 @@ cc [ flag ... ] file ... -lXtst [ library ... ]
<funcprototype>
<funcdef><function>Bool</function> XTestQueryExtension</funcdef>
<paramdef><parameter>display</parameter></paramdef>
-<paramdef><parameter>event_base</parameter></paramdef>
-<paramdef><parameter>error_base</parameter></paramdef>
-<paramdef><parameter>major_version</parameter></paramdef>
-<paramdef><parameter>minor_version</parameter></paramdef>
+<paramdef><parameter>event_base_return</parameter></paramdef>
+<paramdef><parameter>error_base_return</parameter></paramdef>
+<paramdef><parameter>major_version_return</parameter></paramdef>
+<paramdef><parameter>minor_version_return</parameter></paramdef>
</funcprototype>
<funcsynopsisinfo>
Display *display;
- int *event_base;
- int *error_base;
- int *major_version;
- int *minor_version;
+ int *event_base_return;
+ int *error_base_return;
+ int *major_version_return;
+ int *minor_version_return;
</funcsynopsisinfo>
<funcprototype>
<funcdef><function>Bool</function> XTestCompareCursorWithWindow</funcdef>
diff --git a/lib/libXtst/man/XTestQueryExtension.man b/lib/libXtst/man/XTestQueryExtension.man
index 3fe6b649e..831f29c91 100644
--- a/lib/libXtst/man/XTestQueryExtension.man
+++ b/lib/libXtst/man/XTestQueryExtension.man
@@ -1,152 +1,207 @@
-.\" ** 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.74.3 <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"
+.\" -----------------------------------------------------------------
+.\" * 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\fR\fR\fB, \fR\fB\fIerror_base\fR\fR\fB, \fR\fB\fImajor_version\fR\fR\fB, \fR\fB\fIminor_version\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;
- int *error_base;
- int *major_version;
- int *minor_version;
-\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
+ int *event_base_return;
+ int *error_base_return;
+ int *major_version_return;
+ int *minor_version_return;
+.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 +209,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/lib/libXtst/src/Makefile.am b/lib/libXtst/src/Makefile.am
index a3759b226..a2f3db070 100644
--- a/lib/libXtst/src/Makefile.am
+++ b/lib/libXtst/src/Makefile.am
@@ -5,6 +5,22 @@ libXtst_la_SOURCES = \
XTest.c
libXtst_la_LIBADD = @XTST_LIBS@
-AM_CFLAGS = @XTST_CFLAGS@
+
+AM_CFLAGS=\
+ -I$(top_srcdir)/include \
+ -I$(top_srcdir)/include/X11/extensions\
+ @XTST_CFLAGS@
libXtst_la_LDFLAGS = -version-number 6:1:0 -no-undefined
+
+libXtstincludedir = $(includedir)/X11/extensions
+libXtstinclude_HEADERS = $(top_srcdir)/include/X11/extensions/XTest.h \
+ $(top_srcdir)/include/X11/extensions/record.h
+
+if LINT
+ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS)
+
+lint:
+ $(LINT) $(ALL_LINT_FLAGS) $(libXtst_la_SOURCES) $(XTST_LIBS)
+endif LINT
diff --git a/lib/libXtst/src/Makefile.in b/lib/libXtst/src/Makefile.in
index 3a53bc7b5..881cf7eb1 100644
--- a/lib/libXtst/src/Makefile.in
+++ b/lib/libXtst/src/Makefile.in
@@ -14,6 +14,7 @@
@SET_MAKE@
+
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -37,7 +38,8 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = src
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(libXtstinclude_HEADERS) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -51,7 +53,8 @@ am__vpath_adj = case $$p in \
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(libdir)"
+am__installdirs = "$(DESTDIR)$(libdir)" \
+ "$(DESTDIR)$(libXtstincludedir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
libXtst_la_DEPENDENCIES =
@@ -70,6 +73,8 @@ LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libXtst_la_SOURCES)
DIST_SOURCES = $(libXtst_la_SOURCES)
+libXtstincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(libXtstinclude_HEADERS)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -89,8 +94,10 @@ AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -178,6 +185,7 @@ build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
@@ -211,8 +219,16 @@ libXtst_la_SOURCES = \
XTest.c
libXtst_la_LIBADD = @XTST_LIBS@
-AM_CFLAGS = @XTST_CFLAGS@
+AM_CFLAGS = \
+ -I$(top_srcdir)/include \
+ -I$(top_srcdir)/include/X11/extensions\
+ @XTST_CFLAGS@
+
libXtst_la_LDFLAGS = -version-number 6:1:0 -no-undefined
+libXtstincludedir = $(includedir)/X11/extensions
+libXtstinclude_HEADERS = $(top_srcdir)/include/X11/extensions/XTest.h \
+ $(top_srcdir)/include/X11/extensions/record.h
+
@LINT_TRUE@ALL_LINT_FLAGS = $(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@LINT_TRUE@ $(AM_CPPFLAGS) $(CPPFLAGS)
@@ -318,6 +334,23 @@ clean-libtool:
distclean-libtool:
-rm -f libtool
uninstall-info-am:
+install-libXtstincludeHEADERS: $(libXtstinclude_HEADERS)
+ @$(NORMAL_INSTALL)
+ test -z "$(libXtstincludedir)" || $(mkdir_p) "$(DESTDIR)$(libXtstincludedir)"
+ @list='$(libXtstinclude_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(libXtstincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libXtstincludedir)/$$f'"; \
+ $(libXtstincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libXtstincludedir)/$$f"; \
+ done
+
+uninstall-libXtstincludeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(libXtstinclude_HEADERS)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(libXtstincludedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(libXtstincludedir)/$$f"; \
+ done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -368,6 +401,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
+ $(mkdir_p) $(distdir)/../include/X11/extensions
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
@@ -396,9 +430,9 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
-all-am: Makefile $(LTLIBRARIES)
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
installdirs:
- for dir in "$(DESTDIR)$(libdir)"; do \
+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libXtstincludedir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
@@ -446,7 +480,7 @@ info: info-am
info-am:
-install-data-am:
+install-data-am: install-libXtstincludeHEADERS
install-exec-am: install-libLTLIBRARIES
@@ -474,7 +508,8 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
+ uninstall-libXtstincludeHEADERS
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libLTLIBRARIES clean-libtool ctags distclean \
@@ -482,12 +517,13 @@ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
distclean-tags distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-exec \
install-exec-am install-info install-info-am \
- install-libLTLIBRARIES install-man install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-info-am \
- uninstall-libLTLIBRARIES
+ install-libLTLIBRARIES install-libXtstincludeHEADERS \
+ install-man install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+ uninstall-am uninstall-info-am uninstall-libLTLIBRARIES \
+ uninstall-libXtstincludeHEADERS
@LINT_TRUE@lint:
diff --git a/lib/libXtst/src/XRecord.c b/lib/libXtst/src/XRecord.c
index 16eaeffd7..a0f7c52d9 100644
--- a/lib/libXtst/src/XRecord.c
+++ b/lib/libXtst/src/XRecord.c
@@ -59,7 +59,8 @@ from The Open Group.
#include <X11/Xlibint.h>
#include <X11/extensions/Xext.h>
#include <X11/extensions/extutil.h>
-#include <X11/extensions/recordstr.h>
+#include <X11/extensions/recordproto.h>
+#include <X11/extensions/record.h>
static XExtensionInfo _xrecord_info_data;
static XExtensionInfo *xrecord_info = &_xrecord_info_data;
@@ -74,7 +75,7 @@ static /* const */ char *xrecord_extension_name = RECORD_NAME;
* *
**************************************************************************/
-static XExtDisplayInfo *find_display();
+static XExtDisplayInfo *find_display(Display *dpy);
/*
* A reply buffer holds a reply from RecordEnableContext.
@@ -118,9 +119,9 @@ struct mem_cache_str
Bool display_closed; /* so we know when to free ourself */
};
-static int close_display(dpy, codes)
- Display *dpy;
- XExtCodes *codes; /* not used */
+static int close_display(
+ Display *dpy,
+ XExtCodes *codes) /* not used */
{
XExtDisplayInfo *info = find_display (dpy);
@@ -161,7 +162,7 @@ static int close_display(dpy, codes)
return XextRemoveDisplay(xrecord_info, dpy);
}
-static XPointer alloc_mem_cache()
+static XPointer alloc_mem_cache(void)
{
struct mem_cache_str *cache;
@@ -176,7 +177,7 @@ static XPointer alloc_mem_cache()
return (XPointer) cache;
}
-static char *xrecord_error_list[] = {
+static const char *xrecord_error_list[] = {
"XRecordBadContext (Not a defined RECORD context)",
};
@@ -208,10 +209,10 @@ static XEXT_GENERATE_FIND_DISPLAY (find_display, xrecord_info,
**************************************************************************/
static void
-SendRange(dpy, range_item, nranges)
- Display *dpy;
- XRecordRange **range_item;
- int nranges;
+SendRange(
+ Display *dpy,
+ XRecordRange **range_item,
+ int nranges)
{
int rlen = SIZEOF(xRecordRange);
while(nranges--)
@@ -251,16 +252,13 @@ SendRange(dpy, range_item, nranges)
**************************************************************************/
XID
-XRecordIdBaseMask(dpy)
- Display *dpy;
+XRecordIdBaseMask(Display *dpy)
{
return 0x1fffffff & ~dpy->resource_mask;
}
Status
-XRecordQueryVersion (dpy, cmajor_return, cminor_return)
- Display *dpy;
- int *cmajor_return, *cminor_return;
+XRecordQueryVersion(Display *dpy, int *cmajor_return, int *cminor_return)
{
XExtDisplayInfo *info = find_display (dpy);
register xRecordQueryVersionReq *req;
@@ -288,13 +286,9 @@ XRecordQueryVersion (dpy, cmajor_return, cminor_return)
}
XRecordContext
-XRecordCreateContext(dpy, datum_flags, clients, nclients, ranges, nranges)
- Display *dpy;
- int datum_flags;
- XRecordClientSpec *clients;
- int nclients;
- XRecordRange **ranges;
- int nranges;
+XRecordCreateContext(Display *dpy, int datum_flags,
+ XRecordClientSpec *clients, int nclients,
+ XRecordRange **ranges, int nranges)
{
XExtDisplayInfo *info = find_display (dpy);
register xRecordCreateContextReq *req;
@@ -322,20 +316,15 @@ XRecordCreateContext(dpy, datum_flags, clients, nclients, ranges, nranges)
}
XRecordRange *
-XRecordAllocRange()
+XRecordAllocRange(void)
{
return (XRecordRange*)Xcalloc(1, sizeof(XRecordRange));
}
Status
-XRecordRegisterClients(dpy, context, datum_flags, clients, nclients, ranges, nranges)
- Display *dpy;
- XRecordContext context;
- int datum_flags;
- XRecordClientSpec *clients;
- int nclients;
- XRecordRange **ranges;
- int nranges;
+XRecordRegisterClients(Display *dpy, XRecordContext context, int datum_flags,
+ XRecordClientSpec *clients, int nclients,
+ XRecordRange **ranges, int nranges)
{
XExtDisplayInfo *info = find_display (dpy);
register xRecordRegisterClientsReq *req;
@@ -363,11 +352,8 @@ XRecordRegisterClients(dpy, context, datum_flags, clients, nclients, ranges, nra
}
Status
-XRecordUnregisterClients(dpy, context, clients, nclients)
- Display *dpy;
- XRecordContext context;
- XRecordClientSpec *clients;
- int nclients;
+XRecordUnregisterClients(Display *dpy, XRecordContext context,
+ XRecordClientSpec *clients, int nclients)
{
XExtDisplayInfo *info = find_display (dpy);
register xRecordUnregisterClientsReq *req;
@@ -391,9 +377,9 @@ XRecordUnregisterClients(dpy, context, clients, nclients)
}
static void
-WireToLibRange(wire_range, lib_range)
- xRecordRange *wire_range;
- XRecordRange *lib_range;
+WireToLibRange(
+ xRecordRange *wire_range,
+ XRecordRange *lib_range)
{
lib_range->core_requests.first = wire_range->coreRequestsFirst;
lib_range->core_requests.last = wire_range->coreRequestsLast;
@@ -418,19 +404,17 @@ WireToLibRange(wire_range, lib_range)
}
Status
-XRecordGetContext(dpy, context, state_return)
- Display *dpy;
- XRecordContext context;
- XRecordState **state_return;
+XRecordGetContext(Display *dpy, XRecordContext context,
+ XRecordState **state_return)
{
XExtDisplayInfo *info = find_display (dpy);
register xRecordGetContextReq *req;
xRecordGetContextReply rep;
int count, i, rn;
xRecordRange xrange;
- XRecordRange *ranges;
+ XRecordRange *ranges = NULL;
xRecordClientInfo xclient_inf;
- XRecordClientInfo **client_inf, *client_inf_str;
+ XRecordClientInfo **client_inf, *client_inf_str = NULL;
XRecordState *ret;
XRecordCheckExtension (dpy, info, 0);
@@ -462,7 +446,9 @@ XRecordGetContext(dpy, context, state_return)
{
client_inf = (XRecordClientInfo **) Xcalloc(count, sizeof(XRecordClientInfo*));
ret->client_info = client_inf;
- client_inf_str = (XRecordClientInfo *) Xmalloc(count*sizeof(XRecordClientInfo));
+ if (client_inf != NULL) {
+ client_inf_str = (XRecordClientInfo *) Xmalloc(count*sizeof(XRecordClientInfo));
+ }
if (!client_inf || !client_inf_str)
{
for(i = 0; i < count; i++)
@@ -485,7 +471,10 @@ XRecordGetContext(dpy, context, state_return)
if (xclient_inf.nRanges)
{
client_inf_str[i].ranges = (XRecordRange**) Xcalloc(xclient_inf.nRanges, sizeof(XRecordRange*));
- ranges = (XRecordRange*) Xmalloc(xclient_inf.nRanges * sizeof(XRecordRange));
+ if (client_inf_str[i].ranges != NULL) {
+ ranges = (XRecordRange*)
+ Xmalloc(xclient_inf.nRanges * sizeof(XRecordRange));
+ }
if (!client_inf_str[i].ranges || !ranges) {
/* XXX eat data */
UnlockDisplay(dpy);
@@ -514,8 +503,7 @@ XRecordGetContext(dpy, context, state_return)
}
void
-XRecordFreeState(state)
- XRecordState *state;
+XRecordFreeState(XRecordState *state)
{
int i;
@@ -534,9 +522,9 @@ XRecordFreeState(state)
Xfree(state);
}
-static struct reply_buffer *alloc_reply_buffer(info, nbytes)
- XExtDisplayInfo *info;
- int nbytes;
+static struct reply_buffer *alloc_reply_buffer(
+ XExtDisplayInfo *info,
+ int nbytes)
{
struct mem_cache_str *cache = (struct mem_cache_str *)info->data;
struct reply_buffer *rbp;
@@ -582,8 +570,7 @@ static struct reply_buffer *alloc_reply_buffer(info, nbytes)
return rbp;
}
-static XRecordInterceptData *alloc_inter_data(info)
- XExtDisplayInfo *info;
+static XRecordInterceptData *alloc_inter_data(XExtDisplayInfo *info)
{
struct mem_cache_str *cache = (struct mem_cache_str *)info->data;
struct intercept_queue *iq;
@@ -604,8 +591,7 @@ static XRecordInterceptData *alloc_inter_data(info)
}
void
-XRecordFreeData(data)
- XRecordInterceptData *data;
+XRecordFreeData(XRecordInterceptData *data)
{
/* we can do this cast because that is what we really allocated */
struct intercept_queue *iq = (struct intercept_queue *)data;
@@ -728,13 +714,13 @@ XRecordFreeData(data)
enum parser_return { Continue, End, Error };
static enum parser_return
-parse_reply_call_callback(dpy, info, rep, reply, callback, closure)
- Display *dpy;
- XExtDisplayInfo *info;
- xRecordEnableContextReply *rep;
- struct reply_buffer *reply;
- XRecordInterceptProc callback;
- XPointer closure;
+parse_reply_call_callback(
+ Display *dpy,
+ XExtDisplayInfo *info,
+ xRecordEnableContextReply *rep,
+ struct reply_buffer *reply,
+ XRecordInterceptProc callback,
+ XPointer closure)
{
int current_index;
int datum_bytes = 0;
@@ -845,11 +831,8 @@ parse_reply_call_callback(dpy, info, rep, reply, callback, closure)
}
Status
-XRecordEnableContext(dpy, context, callback, closure)
- Display *dpy;
- XRecordContext context;
- XRecordInterceptProc callback;
- XPointer closure;
+XRecordEnableContext(Display *dpy, XRecordContext context,
+ XRecordInterceptProc callback, XPointer closure)
{
XExtDisplayInfo *info = find_display (dpy);
register xRecordEnableContextReq *req;
@@ -916,12 +899,12 @@ typedef struct _record_async_state
} record_async_state;
static Bool
-record_async_handler(dpy, rep, buf, len, adata)
- register Display *dpy;
- register xReply *rep;
- char *buf;
- int len;
- XPointer adata;
+record_async_handler(
+ register Display *dpy,
+ register xReply *rep,
+ char *buf,
+ int len,
+ XPointer adata)
{
register record_async_state *state = (record_async_state *)adata;
struct reply_buffer *reply;
@@ -982,11 +965,8 @@ record_async_handler(dpy, rep, buf, len, adata)
* to get the rest.
*/
Status
-XRecordEnableContextAsync(dpy, context, callback, closure)
- Display *dpy;
- XRecordContext context;
- XRecordInterceptProc callback;
- XPointer closure;
+XRecordEnableContextAsync(Display *dpy, XRecordContext context,
+ XRecordInterceptProc callback, XPointer closure)
{
XExtDisplayInfo *info = find_display (dpy);
register xRecordEnableContextReq *req;
@@ -1055,16 +1035,13 @@ XRecordEnableContextAsync(dpy, context, callback, closure)
}
void
-XRecordProcessReplies(dpy)
- Display *dpy;
+XRecordProcessReplies(Display *dpy)
{
(void) XPending(dpy);
}
Status
-XRecordDisableContext(dpy, context)
- Display *dpy;
- XRecordContext context;
+XRecordDisableContext(Display *dpy, XRecordContext context)
{
XExtDisplayInfo *info = find_display (dpy);
register xRecordDisableContextReq *req;
@@ -1082,9 +1059,7 @@ XRecordDisableContext(dpy, context)
}
Status
-XRecordFreeContext(dpy, context)
- Display *dpy;
- XRecordContext context;
+XRecordFreeContext(Display *dpy, XRecordContext context)
{
XExtDisplayInfo *info = find_display (dpy);
register xRecordFreeContextReq *req;
diff --git a/lib/libXtst/src/XTest.c b/lib/libXtst/src/XTest.c
index 2c3ae2b41..ed45e41cb 100644
--- a/lib/libXtst/src/XTest.c
+++ b/lib/libXtst/src/XTest.c
@@ -35,7 +35,7 @@ from The Open Group.
#define NEED_REPLIES
#include <X11/Xlibint.h>
#include <X11/extensions/XTest.h>
-#include <X11/extensions/xteststr.h>
+#include <X11/extensions/xtestproto.h>
#include <X11/extensions/Xext.h>
#include <X11/extensions/extutil.h>
#include <X11/extensions/XInput.h>
@@ -58,7 +58,7 @@ static /* const */ char *xtest_extension_name = XTestExtensionName;
* *
*****************************************************************************/
-static int close_display();
+static int close_display(Display *dpy, XExtCodes *codes);
static /* const */ XExtensionHooks xtest_extension_hooks = {
NULL, /* create_gc */
NULL, /* copy_gc */
@@ -74,8 +74,7 @@ static /* const */ XExtensionHooks xtest_extension_hooks = {
};
static XPointer
-get_xinput_base(dpy)
- Display *dpy;
+get_xinput_base(Display *dpy)
{
int major_opcode, first_event, first_error;
first_event = 0;
@@ -98,10 +97,9 @@ static XEXT_GENERATE_CLOSE_DISPLAY (close_display, xtest_info)
*****************************************************************************/
Bool
-XTestQueryExtension (dpy, event_basep, error_basep, majorp, minorp)
- Display *dpy;
- int *event_basep, *error_basep;
- int *majorp, *minorp;
+XTestQueryExtension (Display *dpy,
+ int *event_base_return, int *error_base_return,
+ int *major_return, int *minor_return)
{
XExtDisplayInfo *info = find_display (dpy);
register xXTestGetVersionReq *req;
@@ -121,10 +119,10 @@ XTestQueryExtension (dpy, event_basep, error_basep, majorp, minorp)
}
UnlockDisplay(dpy);
SyncHandle();
- *event_basep = info->codes->first_event;
- *error_basep = info->codes->first_error;
- *majorp = rep.majorVersion;
- *minorp = rep.minorVersion;
+ *event_base_return = info->codes->first_event;
+ *error_base_return = info->codes->first_error;
+ *major_return = rep.majorVersion;
+ *minor_return = rep.minorVersion;
return True;
} else {
return False;
@@ -132,10 +130,7 @@ XTestQueryExtension (dpy, event_basep, error_basep, majorp, minorp)
}
Bool
-XTestCompareCursorWithWindow(dpy, window, cursor)
- Display *dpy;
- Window window;
- Cursor cursor;
+XTestCompareCursorWithWindow(Display *dpy, Window window, Cursor cursor)
{
XExtDisplayInfo *info = find_display (dpy);
register xXTestCompareCursorReq *req;
@@ -160,19 +155,14 @@ XTestCompareCursorWithWindow(dpy, window, cursor)
}
Bool
-XTestCompareCurrentCursorWithWindow(dpy, window)
- Display *dpy;
- Window window;
+XTestCompareCurrentCursorWithWindow(Display *dpy, Window window)
{
return XTestCompareCursorWithWindow(dpy, window, XTestCurrentCursor);
}
int
-XTestFakeKeyEvent(dpy, keycode, is_press, delay)
- Display *dpy;
- unsigned int keycode;
- Bool is_press;
- unsigned long delay;
+XTestFakeKeyEvent(Display *dpy, unsigned int keycode,
+ Bool is_press, unsigned long delay)
{
XExtDisplayInfo *info = find_display (dpy);
register xXTestFakeInputReq *req;
@@ -192,11 +182,8 @@ XTestFakeKeyEvent(dpy, keycode, is_press, delay)
}
int
-XTestFakeButtonEvent(dpy, button, is_press, delay)
- Display *dpy;
- unsigned int button;
- Bool is_press;
- unsigned long delay;
+XTestFakeButtonEvent(Display *dpy, unsigned int button,
+ Bool is_press, unsigned long delay)
{
XExtDisplayInfo *info = find_display (dpy);
register xXTestFakeInputReq *req;
@@ -216,11 +203,7 @@ XTestFakeButtonEvent(dpy, button, is_press, delay)
}
int
-XTestFakeMotionEvent(dpy, screen, x, y, delay)
- Display *dpy;
- int screen;
- int x, y;
- unsigned long delay;
+XTestFakeMotionEvent(Display *dpy, int screen, int x, int y, unsigned long delay)
{
XExtDisplayInfo *info = find_display (dpy);
register xXTestFakeInputReq *req;
@@ -246,10 +229,7 @@ XTestFakeMotionEvent(dpy, screen, x, y, delay)
}
int
-XTestFakeRelativeMotionEvent(dpy, dx, dy, delay)
- Display *dpy;
- int dx, dy;
- unsigned long delay;
+XTestFakeRelativeMotionEvent(Display *dpy, int dx, int dy, unsigned long delay)
{
XExtDisplayInfo *info = find_display (dpy);
register xXTestFakeInputReq *req;
@@ -272,14 +252,14 @@ XTestFakeRelativeMotionEvent(dpy, dx, dy, delay)
}
static void
-send_axes(dpy, info, req, dev, first_axis, axes, n_axes)
- Display *dpy;
- XExtDisplayInfo *info;
- xXTestFakeInputReq *req;
- XDevice *dev;
- int first_axis;
- int *axes;
- int n_axes;
+send_axes(
+ Display *dpy,
+ XExtDisplayInfo *info,
+ xXTestFakeInputReq *req,
+ XDevice *dev,
+ int first_axis,
+ int *axes,
+ int n_axes)
{
deviceValuator ev;
int n;
@@ -316,14 +296,9 @@ send_axes(dpy, info, req, dev, first_axis, axes, n_axes)
}
int
-XTestFakeDeviceKeyEvent(dpy, dev, keycode, is_press, axes, n_axes, delay)
- Display *dpy;
- XDevice *dev;
- unsigned int keycode;
- Bool is_press;
- int *axes;
- int n_axes;
- unsigned long delay;
+XTestFakeDeviceKeyEvent(Display *dpy, XDevice *dev,
+ unsigned int keycode, Bool is_press,
+ int *axes, int n_axes, unsigned long delay)
{
XExtDisplayInfo *info = find_display (dpy);
register xXTestFakeInputReq *req;
@@ -347,14 +322,9 @@ XTestFakeDeviceKeyEvent(dpy, dev, keycode, is_press, axes, n_axes, delay)
}
int
-XTestFakeDeviceButtonEvent(dpy, dev, button, is_press, axes, n_axes, delay)
- Display *dpy;
- XDevice *dev;
- unsigned int button;
- Bool is_press;
- int *axes;
- int n_axes;
- unsigned long delay;
+XTestFakeDeviceButtonEvent(Display *dpy, XDevice *dev,
+ unsigned int button, Bool is_press,
+ int *axes, int n_axes, unsigned long delay)
{
XExtDisplayInfo *info = find_display (dpy);
register xXTestFakeInputReq *req;
@@ -378,13 +348,8 @@ XTestFakeDeviceButtonEvent(dpy, dev, button, is_press, axes, n_axes, delay)
}
int
-XTestFakeProximityEvent(dpy, dev, in_prox, axes, n_axes, delay)
- Display *dpy;
- XDevice *dev;
- Bool in_prox;
- int *axes;
- int n_axes;
- unsigned long delay;
+XTestFakeProximityEvent(Display *dpy, XDevice *dev, Bool in_prox,
+ int *axes, int n_axes, unsigned long delay)
{
XExtDisplayInfo *info = find_display (dpy);
register xXTestFakeInputReq *req;
@@ -407,15 +372,9 @@ XTestFakeProximityEvent(dpy, dev, in_prox, axes, n_axes, delay)
}
int
-XTestFakeDeviceMotionEvent(dpy, dev, is_relative,
- first_axis, axes, n_axes, delay)
- Display *dpy;
- XDevice *dev;
- Bool is_relative;
- int first_axis;
- int *axes;
- int n_axes;
- unsigned long delay;
+XTestFakeDeviceMotionEvent(Display *dpy, XDevice *dev,
+ Bool is_relative, int first_axis,
+ int *axes, int n_axes, unsigned long delay)
{
XExtDisplayInfo *info = find_display (dpy);
register xXTestFakeInputReq *req;
@@ -437,9 +396,7 @@ XTestFakeDeviceMotionEvent(dpy, dev, is_relative,
}
int
-XTestGrabControl(dpy, impervious)
- Display *dpy;
- Bool impervious;
+XTestGrabControl(Display *dpy, Bool impervious)
{
XExtDisplayInfo *info = find_display (dpy);
register xXTestGrabControlReq *req;
@@ -457,17 +414,13 @@ XTestGrabControl(dpy, impervious)
}
void
-XTestSetGContextOfGC(gc, gid)
- GC gc;
- GContext gid;
+XTestSetGContextOfGC(GC gc, GContext gid)
{
gc->gid = gid;
}
void
-XTestSetVisualIDOfVisual(visual, visualid)
- Visual *visual;
- VisualID visualid;
+XTestSetVisualIDOfVisual(Visual *visual, VisualID visualid)
{
visual->visualid = visualid;
}
@@ -477,8 +430,7 @@ static xReq _dummy_request = {
};
Status
-XTestDiscard(dpy)
- Display *dpy;
+XTestDiscard(Display *dpy)
{
Bool something;
register char *ptr;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 08:58:43 +0000