update to xf86-input-fpit 1.3.0

This commit is contained in:
matthieu 2009-05-03 13:40:35 +00:00
parent 42ae82de19
commit 48e632cb34
13 changed files with 5624 additions and 4247 deletions

View File

@ -1,45 +1,371 @@
2006-04-06 Adam Jackson <ajax@freedesktop.org>
commit 3cabac9b8d43269dabcd65dbe7477981a3945daa
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Feb 18 11:28:19 2009 +1000
* configure.ac:
* src/xf86Fpit.c:
Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
fpit 1.3.0
2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit f4ffa85973d2c3306994f93902d1159d8831a0d0
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Mon Feb 2 20:02:18 2009 -0200
* configure.ac:
Update package version for X11R7 release.
Janitor: make distcheck, .gitignore.
2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit 05333d30eec20f699ce6c487e9efd30a4f8e12f7
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 30 20:19:03 2009 -0800
* configure.ac:
Update package version number for final X11R7 release candidate.
Add README with pointers to mailing list, bugzilla & git repos
2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit b3cde1b14703c81ee387a125d381044b6ed0156a
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 9 16:13:25 2009 -0800
* man/Makefile.am:
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
Remove xorgconfig & xorgcfg from See Also list in man page
2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit 118466f0b94a686545ae9a8ef4da028ff406b04b
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Aug 14 15:36:15 2008 +0930
* configure.ac:
Update package version number for X11R7 RC3 release.
Fix build, xf86Version.h -> xorgVersion.h
2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit e8620e98b8dce2e5dfe6f24fedc8b3942927bff1
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon May 26 22:07:38 2008 +0930
* configure.ac:
Remove extraneous AC_MSG_RESULT.
Check for XINPUT ABI 3.
2005-11-29 Adam Jackson <ajax@freedesktop.org>
commit 95676d89c7954cc5550ed386b784b470034320cc
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jan 30 13:30:59 2008 +1030
* configure.ac:
Only build dlloader modules by default.
Set is_core_pointer to 0 by default.
2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
Server 1.4 does not do physical core devices.
* configure.ac:
Update package version number for X11R7 RC2 release.
commit 01a4da993a2ecd0f017baef49b6e57b82c05316d
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jan 14 10:50:54 2008 +1030
2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
Don't crash with xserver 1.4
* configure.ac:
Update pkgcheck dependencies to work with separate build roots.
xf86IsCorePointer() is gone.
commit 2823f7c3f3784a1a398b8d5a9157c2e5263b6285
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 8 16:00:36 2008 +0930
Revert "Don't call xf86IsCorePointer."
This reverts commit 9ea880913d5775454311b0257bbaebf773cd4285.
commit 164eb7570b10add2087ce293995319798ca3c345
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Mar 20 15:36:01 2008 -0400
fpit 1.2.0
commit f69bd251763ce59102d999c14ee751d4283a73eb
Author: Matthieu Herrb <matthieu@bluenote.herrb.net>
Date: Sat Mar 8 22:57:19 2008 +0100
Makefile.am: nuke RCS Id
commit 9ea880913d5775454311b0257bbaebf773cd4285
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com>
Date: Tue Feb 5 02:45:34 2008 -0200
Don't call xf86IsCorePointer.
Check xinput abi version to know if the function is available,
otherwise run code as if it had returned 0, what should match
the new API.
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit 47ecabff271fc1b8dfcc40656934fb70264b7a0e
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 05:52:09 2007 -0400
Add *~ to .gitignore to skip patch/emacs droppings
commit e7fc5453728fe5991bef5b55f31319b677a91ce5
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Aug 23 19:25:26 2007 -0400
Rename .cvsignore to .gitignore
commit 39a7bdaa21b792cf351fb361be0aa05a3012d620
Author: Brice Goglin <bgoglin@debian.org>
Date: Mon Aug 6 23:16:37 2007 +0200
Use PACKAGE_VERSION_MAJOR/MINOR/PATCHLEVEL in version_rec
commit cb6adfe32f929e57eedcab189e9f359fc9e970ab
Author: Justin Blanchard <justinb04@aim.com>
Date: Tue Jan 30 20:15:50 2007 -0500
update from Justin Blanchard - part 3
* Adds support for detecting/responding to screen resize and rotate events
(i.e., fixing bug 3421 for FPIT users). This corrects both cursor-related and
extended events.
* The fix is disabled unless the user adds 'Option "TrackRandR"' to the
InputDevice section. This is to avoid breaking setups where some nightmarish
workaround was already in place.
* Use of RRGetRotation may break driver under XFree86. If this is a problem I
think xf86GetRotation can be used instead.
commit 979c283a6ecb1ba718790a147b3e910a106cb473
Author: Justin Blanchard <justinb04@aim.com>
Date: Tue Jan 30 20:13:52 2007 -0500
update from Justin Blanchard - part 2
* Fix a bug that prevents active-pen users from right-clicking while hovering.
* Bug was introduced with passive pen support; fix is simple and has been
recommended in forums since Oct 2006
(http://ubuntuforums.org/showpost.php?p=1620646&postcount=15).
For some reason I don't see a bug report for the issue.
commit 4b06c8f70e8b1d6cfaeb41e1584f9efcfef83bb0
Author: Justin Blanchard <justinb04@aim.com>
Date: Tue Jan 30 20:12:07 2007 -0500
Updates from Justin Blanchard - patch 1
* Make the docs reflect more accurately what the code actually does.
* Update the docs: remove material specific to XFree86 3.x/4.0. Re-organize to
reflect the wider variety of machines that use this device. Change the link to
linuxslate.com. Expand troubleshooting section.
* Code cleanup: assorted trivial changes.
commit 5eb263e776a8193035d86a17fc3939e5fcf0c26d
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 7 17:32:14 2006 +0000
Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
commit 717318ea9f56e7875f31906afd4b5669191df3cc
Author: Kevin E Martin <kem@kem.org>
Date: Wed Dec 21 02:29:56 2005 +0000
Update package version for X11R7 release.
commit befa71531a1c7870d81ae748b8c3cfcf833a033e
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Dec 19 16:25:50 2005 +0000
Stub COPYING files
commit d7b4d51674ad4b168180e38343306701c0a926f9
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Dec 19 09:07:49 2005 +0000
Typo fixes, mailing list & url updates, and other changes to prepare for
X11R6.9 & 7.0 releases.
commit 0f86389792ca4249548e21546fbb7fa3a6bf4e39
Author: Kevin E Martin <kem@kem.org>
Date: Thu Dec 15 00:24:14 2005 +0000
Update package version number for final X11R7 release candidate.
commit d831f3931d9da9ad3afbf0b00f27ab49f1f6b27e
Author: Kevin E Martin <kem@kem.org>
Date: Tue Dec 6 22:48:29 2005 +0000
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
commit a3a2ab78dbfd1e0f08da6891dbb1c08a6eece8a5
Author: Kevin E Martin <kem@kem.org>
Date: Sat Dec 3 05:49:30 2005 +0000
Update package version number for X11R7 RC3 release.
commit 417800aea164e837ea95a8dd02e706dc50fe820d
Author: Kevin E Martin <kem@kem.org>
Date: Fri Dec 2 02:16:05 2005 +0000
Remove extraneous AC_MSG_RESULT.
commit eff2a9e33c7a34f8ab180f6a191a0e9f16998c18
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Nov 29 23:29:55 2005 +0000
Only build dlloader modules by default.
commit 19a3f95a129ea51d3cadcbe6eb8fcf079aa582b9
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Nov 28 22:04:06 2005 +0000
Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
commit 68d8dcce160b4d4938bf0b0108c858b9daa75b06
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Nov 21 10:49:03 2005 +0000
Add .cvsignores for drivers.
commit b872507476e8469cefa151067f106c3e0a097d3d
Author: Kevin E Martin <kem@kem.org>
Date: Wed Nov 9 21:15:11 2005 +0000
Update package version number for X11R7 RC2 release.
commit 1df2fab075a5bec86b57a10909c1df71db60f579
Author: Kevin E Martin <kem@kem.org>
Date: Tue Nov 1 15:08:50 2005 +0000
Update pkgcheck depedencies to work with separate build roots.
commit d8bd9a9edf93f337b6359e671cb1bb6e69083bea
Author: Kevin E Martin <kem@kem.org>
Date: Wed Oct 19 02:48:00 2005 +0000
Update package version number for RC1 release.
commit e4df0542bfbba112ce0df38dfeba19350ad370ff
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Oct 18 00:01:51 2005 +0000
Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro
substitutions to work better with BSD make
commit ad8d71d6b8b81aaac51425bef24cc65801749ffb
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Oct 17 22:57:27 2005 +0000
More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead
of indirectly
commit de780dd318c07b71df98f7409da74f5d5d46743c
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Oct 17 00:08:55 2005 +0000
Use sed & cpp to substitute variables in driver man pages
commit 699531cf87ad64107ceaa59208ca071a74501f2c
Author: Kevin E Martin <kem@kem.org>
Date: Wed Oct 5 02:54:07 2005 +0000
Add readme.txt to EXTRA_DIST
commit 64f6e8d6197030627533c6fab93af9818c816c74
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 18 09:03:38 2005 +0000
Update autogen.sh to one that does objdir != srcdir.
commit 3691cd67b2880ceab3f7ff22caf6cf1eaff0ee4f
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Aug 10 14:07:23 2005 +0000
Don\'t lose existing CFLAGS in all the input drivers and some of the video
drivers
commit c0a5f83b6d7ddf630b5d389fa38264de4dc7121a
Author: Kevin E Martin <kem@kem.org>
Date: Fri Jul 29 21:22:40 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 ad8d1c474ca4e3211b2ebde287aa08f4cf03f59e
Author: Kevin E Martin <kem@kem.org>
Date: Wed Jul 13 20:03:21 2005 +0000
Make the module dir configurable
commit e9375c5e27068e39a60a59f74c22ec8183631499
Author: Kevin E Martin <kem@kem.org>
Date: Wed Jul 13 02:20:59 2005 +0000
Update all input drivers to pass distcheck
commit 638054c0ab5f13821f77db7a58e78215cfda9f61
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Jul 12 06:15:08 2005 +0000
Build skeletons for input drivers. Should basically work.
commit 4f36fab598723200ae39b4e1e2d7577302aa24b2
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Jul 11 02:37:59 2005 +0000
Prep input drivers for modularizing by adding guarded #include "config.h"
commit a9d50047f11215eedc7b2da4263e5ff1839d16d0
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Jun 27 18:32:54 2005 +0000
Various input drivers set their InputDriverRec to be static when doing a
loadable build, and the same symbol can't be both static and _X_EXPORT.
Pointed out by Alan Coopersmith.
commit 53077bd40c9cc93819a8851d6408c76dd37f0c7f
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jun 25 21:17:01 2005 +0000
Bug #3626: _X_EXPORT tags for video and input drivers.
commit ff4e6c2efd7460eee7c73120dca2656ba13ebbac
Author: Alex Deucher <agd5f@yahoo.com>
Date: Sat Feb 5 17:37:53 2005 +0000
-Add passive pen support to the fpit driver (David M. Clay), bug 2440
commit 825269b37ecd67b5062c2a2f7dcbc3fd951937ec
Author: Egbert Eich <eich@suse.de>
Date: Fri Apr 23 19:54:03 2004 +0000
Merging XORG-CURRENT into trunk
commit 3e0303798c108226a2856a5e32f36cb3f55224c2
Author: Egbert Eich <eich@suse.de>
Date: Sun Mar 14 08:33:51 2004 +0000
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
commit aacf28f7dece252d25a8f4bafd7659b28fa15c9c
Author: Egbert Eich <eich@suse.de>
Date: Wed Mar 3 12:12:33 2004 +0000
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
commit 8a885e69a39e6547c28475c37fed11cdc1f1a060
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 13:36:00 2004 +0000
readding XFree86's cvs IDs
commit 0551d757750966c7cae04c1015ca6647c9f7ae01
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 09:23:34 2004 +0000
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
commit 1054c6379ef3bff6a55281e01b6109caea863fae
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Tue Nov 25 19:28:48 2003 +0000
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
commit b4945314d930385662db5e0d008cb9ae3bbabd72
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Nov 14 16:48:56 2003 +0000
XFree86 4.3.0.1
commit c2b9298a935089f40c06d1061f4b300afd6a80fe
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Nov 14 16:48:56 2003 +0000
Initial revision

View File

@ -22,3 +22,11 @@ AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
EXTRA_DIST = readme.txt
MAINTAINERCLEANFILES = ChangeLog
.PHONY: ChangeLog
ChangeLog:
$(CHANGELOG_CMD)
dist-hook: ChangeLog

View File

@ -55,7 +55,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure COPYING ChangeLog config.guess \
config.sub depcomp install-sh ltmain.sh missing
@ -90,7 +90,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@
@ -107,8 +106,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@
@ -130,6 +131,7 @@ F77 = @F77@
FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -166,15 +168,9 @@ STRIP = @STRIP@
VERSION = @VERSION@
XORG_CFLAGS = @XORG_CFLAGS@
XORG_LIBS = @XORG_LIBS@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@ -191,24 +187,32 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
distcleancheck_listfiles = @distcleancheck_listfiles@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
inputdir = @inputdir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
@ -216,6 +220,7 @@ target_alias = @target_alias@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
EXTRA_DIST = readme.txt
MAINTAINERCLEANFILES = ChangeLog
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@ -457,6 +462,9 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
done
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$(top_distdir)" distdir="$(distdir)" \
dist-hook
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
@ -583,6 +591,7 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
clean: clean-recursive
clean-am: clean-generic clean-libtool mostlyclean-am
@ -638,7 +647,7 @@ uninstall-info: uninstall-info-recursive
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
check-am clean clean-generic clean-libtool clean-recursive \
ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
dist-shar dist-tarZ dist-zip distcheck distclean \
dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
distclean-generic distclean-hdr distclean-libtool \
distclean-recursive distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
@ -650,6 +659,13 @@ uninstall-info: uninstall-info-recursive
mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
tags tags-recursive uninstall uninstall-am uninstall-info-am
.PHONY: ChangeLog
ChangeLog:
$(CHANGELOG_CMD)
dist-hook: ChangeLog
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

View File

@ -0,0 +1,20 @@
xf86-input-fpit - Fujitsu Stylistic Tablet PC input driver for the Xorg X server
Please submit bugs & patches to the Xorg bugzilla:
https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
All questions regarding this software should be directed at the
Xorg mailing list:
http://lists.freedesktop.org/mailman/listinfo/xorg
The master development code repository can be found at:
git://anongit.freedesktop.org/git/xorg/driver/xf86-input-fpit
http://cgit.freedesktop.org/xorg/driver/xf86-input-fpit
For more information on the git code manager, see:
http://wiki.x.org/wiki/GitPage

View File

@ -7631,6 +7631,7 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
dnl xorg-macros.m4. Generated from xorg-macros.m4.in:xorgversion.m4 by configure.
dnl
dnl Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved.
dnl
@ -7678,7 +7679,7 @@ AC_DEFUN([XORG_MACROS_VERSION],[
XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
[XORG_MACROS_version=1.1.6
[XORG_MACROS_version=1.2.1
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
@ -7712,6 +7713,10 @@ else
if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
RAWCPPFLAGS=-undef
AC_MSG_RESULT([yes])
# under Cygwin unix is still defined even with -undef
elif test `${RAWCPP} -undef -ansi < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
RAWCPPFLAGS="-undef -ansi"
AC_MSG_RESULT([yes, with -ansi])
else
AC_MSG_ERROR([${RAWCPP} defines unix with or without -undef. I don't know what to do.])
fi
@ -7824,7 +7829,9 @@ AC_SUBST([ADMIN_MAN_DIR])
# Whether or not the necessary tools and files are found can be checked
# with the AM_CONDITIONAL "BUILD_LINUXDOC"
AC_DEFUN([XORG_CHECK_LINUXDOC],[
XORG_SGML_PATH=$prefix/share/sgml
if test x$XORG_SGML_PATH = x ; then
XORG_SGML_PATH=$prefix/share/sgml
fi
HAVE_DEFS_ENT=
if test x"$cross_compiling" = x"yes" ; then
@ -7880,7 +7887,9 @@ AC_SUBST(MAKE_HTML)
# indicates whether the necessary tools and files are found and, if set,
# $(MAKE_XXX) blah.sgml will produce blah.xxx.
AC_DEFUN([XORG_CHECK_DOCBOOK],[
XORG_SGML_PATH=$prefix/share/sgml
if test x$XORG_SGML_PATH = x ; then
XORG_SGML_PATH=$prefix/share/sgml
fi
HAVE_DEFS_ENT=
BUILDTXTDOC=no
BUILDPDFDOC=no
@ -8057,55 +8066,31 @@ AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno])
]) # XORG_LINT_LIBRARY
dnl Copyright 2005 Red Hat, Inc
dnl
dnl Permission to use, copy, modify, distribute, and sell this software and its
dnl documentation for any purpose is hereby granted without fee, provided that
dnl the above copyright notice appear in all copies and that both that
dnl copyright notice and this permission notice appear in supporting
dnl documentation.
dnl
dnl The above copyright notice and this permission notice shall be included
dnl in all copies or substantial portions of the Software.
dnl
dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
dnl OTHER DEALINGS IN THE SOFTWARE.
dnl
dnl Except as contained in this notice, the name of the copyright holders shall
dnl not be used in advertising or otherwise to promote the sale, use or
dnl other dealings in this Software without prior written authorization
dnl from the copyright holders.
dnl
# XORG_DRIVER_CHECK_EXT()
# --------------------------
# Checks for the $1 define in xorg-server.h (from the sdk). If it
# is defined, then add $1 to $REQUIRED_MODULES.
AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include "xorg-server.h"
#if !defined $1
#error $1 not defined
#endif
]])],
[_EXT_CHECK=yes],
[_EXT_CHECK=no])
CFLAGS="$SAVE_CFLAGS"
AC_MSG_CHECKING([if $1 is defined])
AC_MSG_RESULT([$_EXT_CHECK])
if test "$_EXT_CHECK" != no; then
REQUIRED_MODULES="$REQUIRED_MODULES $2"
fi
])
# XORG_CWARNFLAGS
# ---------------
# Minimum version: 1.2.0
#
# Defines CWARNFLAGS to enable C compiler warnings.
#
AC_DEFUN([XORG_CWARNFLAGS], [
AC_REQUIRE([AC_PROG_CC])
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 `gcc -dumpversion` in
3.4.* | 4.*)
CWARNFLAGS+=" -Wold-style-definition -Wdeclaration-after-statement"
;;
esac
else
AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
if test "x$SUNCC" = "xyes"; then
CWARNFLAGS="-v"
fi
fi
AC_SUBST(CWARNFLAGS)
]) # XORG_CWARNFLAGS
dnl Copyright 2005 Red Hat, Inc
dnl
dnl Permission to use, copy, modify, distribute, and sell this software and its
@ -8168,3 +8153,69 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
[Patch version of this package])
])
# XORG_CHANGELOG()
# ----------------
# Minimum version: 1.2.0
#
# Defines the variable CHANGELOG_CMD as the command to generate
# ChangeLog from git.
#
# Arrange that distcleancheck ignores ChangeLog left over by distclean.
#
AC_DEFUN([XORG_CHANGELOG], [
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)"
AC_SUBST([CHANGELOG_CMD])
AC_SUBST([distcleancheck_listfiles], ['find . -type f ! -name ChangeLog -print'])
]) # XORG_CHANGELOG
dnl Copyright 2005 Red Hat, Inc
dnl
dnl Permission to use, copy, modify, distribute, and sell this software and its
dnl documentation for any purpose is hereby granted without fee, provided that
dnl the above copyright notice appear in all copies and that both that
dnl copyright notice and this permission notice appear in supporting
dnl documentation.
dnl
dnl The above copyright notice and this permission notice shall be included
dnl in all copies or substantial portions of the Software.
dnl
dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
dnl OTHER DEALINGS IN THE SOFTWARE.
dnl
dnl Except as contained in this notice, the name of the copyright holders shall
dnl not be used in advertising or otherwise to promote the sale, use or
dnl other dealings in this Software without prior written authorization
dnl from the copyright holders.
dnl
# XORG_DRIVER_CHECK_EXT()
# --------------------------
# Checks for the $1 define in xorg-server.h (from the sdk). If it
# is defined, then add $1 to $REQUIRED_MODULES.
AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include "xorg-server.h"
#if !defined $1
#error $1 not defined
#endif
]])],
[_EXT_CHECK=yes],
[_EXT_CHECK=no])
CFLAGS="$SAVE_CFLAGS"
AC_MSG_CHECKING([if $1 is defined])
AC_MSG_RESULT([$_EXT_CHECK])
if test "$_EXT_CHECK" != no; then
REQUIRED_MODULES="$REQUIRED_MODULES $2"
fi
])

File diff suppressed because it is too large Load Diff

View File

@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-fpit],
1.2.0,
1.3.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-fpit)
@ -32,15 +32,16 @@ AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
DRIVER_NAME=fpit
AC_SUBST([DRIVER_NAME])
# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.2)
AM_CONFIG_HEADER([config.h])
# Checks for programs.
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AC_PROG_CC
XORG_CWARNFLAGS
AH_TOP([#include "xorg-server.h"])
@ -77,16 +78,18 @@ XORG_DRIVER_CHECK_EXT(XINPUT, inputproto)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto $REQUIRED_MODULES)
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
AC_SUBST([CFLAGS])
XORG_CFLAGS="$CWARNFLAGS $XORG_CFLAGS"
# Checks for libraries.
# Checks for header files.
AC_HEADER_STDC
DRIVER_NAME=fpit
AC_SUBST([DRIVER_NAME])
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
XORG_CHANGELOG
AC_OUTPUT([Makefile src/Makefile man/Makefile])

View File

@ -2127,17 +2127,6 @@ EOF
;;
esac
for pass in $passes; do
# The preopen pass in lib mode reverses $deplibs; put it back here
# so that -L comes before libs that need it for instance...
if test "$linkmode,$pass" = "lib,link"; then
## FIXME: Find the place where the list is rebuilt in the wrong
## order, and fix it there properly
tmp_deplibs=
for deplib in $deplibs; do
tmp_deplibs="$deplib $tmp_deplibs"
done
deplibs="$tmp_deplibs"
fi
if test "$linkmode,$pass" = "lib,link" ||
test "$linkmode,$pass" = "prog,scan"; then
libs="$deplibs"

View File

@ -99,8 +99,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@
@ -122,6 +124,7 @@ F77 = @F77@
FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -158,15 +161,9 @@ STRIP = @STRIP@
VERSION = @VERSION@
XORG_CFLAGS = @XORG_CFLAGS@
XORG_LIBS = @XORG_LIBS@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@ -183,24 +180,32 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
distcleancheck_listfiles = @distcleancheck_listfiles@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
inputdir = @inputdir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@

View File

@ -151,7 +151,7 @@ For Stylistic 3400:
.fi
.SH "SEE ALSO"
__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__).
__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__).
.SH AUTHORS
Original FPIT port:
Rob Tsuk <rob@tsuk.com> and John Apfelbaum <johnapf@linuxslate.com>

View File

@ -24,6 +24,8 @@
# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
AM_CFLAGS = $(XORG_CFLAGS)
@DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
@DRIVER_NAME@_drv_ladir = @inputdir@

View File

@ -109,8 +109,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@
@ -132,6 +134,7 @@ F77 = @F77@
FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -168,15 +171,9 @@ STRIP = @STRIP@
VERSION = @VERSION@
XORG_CFLAGS = @XORG_CFLAGS@
XORG_LIBS = @XORG_LIBS@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@ -193,24 +190,32 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
distcleancheck_listfiles = @distcleancheck_listfiles@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
inputdir = @inputdir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
@ -221,6 +226,7 @@ target_alias = @target_alias@
# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
AM_CFLAGS = $(XORG_CFLAGS)
@DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
@DRIVER_NAME@_drv_ladir = @inputdir@

View File

@ -55,7 +55,7 @@
#include "config.h"
#endif
#include <xf86Version.h>
#include <xorgVersion.h>
#include <unistd.h>
#include <errno.h>
@ -231,6 +231,7 @@ static void xf86FpitReadInput(LocalDevicePtr local)
{
FpitPrivatePtr priv = (FpitPrivatePtr) local->private;
int len, loop;
int is_core_pointer = 0;
int x, y, buttons, prox;
DeviceIntPtr device;
int conv_x, conv_y;
@ -318,18 +319,17 @@ static void xf86FpitReadInput(LocalDevicePtr local)
prox = (priv->fpitData[loop] & PROXIMITY_BIT) ? 0 : 1;
buttons = (priv->fpitData[loop] & BUTTON_BITS);
device = local->dev;
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
is_core_pointer = xf86IsCorePointer(device);
#endif
xf86FpitConvert(local, 0, 2, x, y, 0, 0, 0, 0, &conv_x, &conv_y);
xf86XInputSetScreen(local, priv->screen_no, conv_x, conv_y);
/* coordinates are ready we can send events */
if (prox!=priv->fpitOldProximity) { /* proximity changed */
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
if (xf86IsCorePointer(device) == 0)
#endif
xf86PostProximityEvent(device, prox, 0, 2, x, y);
}
if (prox!=priv->fpitOldProximity) /* proximity changed */
if (!is_core_pointer) xf86PostProximityEvent(device, prox, 0, 2, x, y);
if (priv->fpitOldX != x || priv->fpitOldY != y) /* position changed */
xf86PostMotionEvent(device, 1, 0, 2, x, y);
@ -434,7 +434,11 @@ static Bool xf86FpitControl(DeviceIntPtr dev, int mode)
ErrorF("Unable to allocate PtrFeedBackClassDeviceStruct\n");
}
if (InitValuatorClassDeviceStruct(dev, 2, xf86GetMotionEvents, local->history_size, Absolute) == FALSE) {
if (InitValuatorClassDeviceStruct(dev, 2,
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
xf86GetMotionEvents,
#endif
local->history_size, Absolute) == FALSE) {
ErrorF("Unable to allocate Fpit touchscreen ValuatorClassDeviceStruct\n");
return !Success;
}