Hello community, here is the log from the commit of package xorg-x11-driver-input for openSUSE:Factory checked in at Thu Feb 26 15:48:03 CET 2009. -------- --- xorg-x11-driver-input/xorg-x11-driver-input.changes 2009-01-14 19:21:03.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-input/xorg-x11-driver-input.changes 2009-02-26 12:38:49.280250088 +0100 @@ -1,0 +2,22 @@ +Thu Feb 26 12:34:21 CET 2009 - sndirsch@suse.de + +- xf86-input-acecad 1.3.0 +- xf86-input-aiptek 1.2.0 +- xf86-input-elographics 1.2.3 +- xf86-input-fpit 1.3.0 +- xf86-input-joystick-1.4.0 +- xf86-input-keyboard 1.3.2 + * obsoletes zap_warning_kbd.diff +- xf86-input-penmount 1.4.0 +- xf86-input-synaptics 1.0.0 + * obsoletes commit-3097bb3.diff +- xf86-input-vmmouse 12.6.3 +- xf86-input-void 1.2.0 + +------------------------------------------------------------------- +Tue Feb 24 16:02:44 CET 2009 - sndirsch@suse.de + +- added synaptics driver; added provides/obsolete for + x11-input-synaptics + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xf86-input-acecad-1.2.2.tar.bz2 xf86-input-aiptek-1.2.tar.gz xf86-input-aiptek-X11R7.1-1.0.1.tar.bz2 xf86-input-elographics-1.2.2-commit-bf0e1bf.diff xf86-input-elographics-1.2.2.tar.bz2 xf86-input-fpit-1.2.0_e8620e9.tar.bz2 xf86-input-joystick-1.3.3.tar.bz2 xf86-input-keyboard-1.3.1.tar.bz2 xf86-input-penmount-1.3.0.tar.bz2 xf86-input-vmmouse-12.6.2.tar.bz2 xf86-input-void-1.1.1.tar.bz2 zap_warning_kbd.diff New: ---- wait.diff xf86-input-acecad-1.3.0.tar.bz2 xf86-input-aiptek-1.2.0.tar.bz2 xf86-input-elographics-1.2.3.tar.bz2 xf86-input-fpit-1.3.0.tar.bz2 xf86-input-joystick-1.4.0.tar.bz2 xf86-input-keyboard-1.3.2.tar.bz2 xf86-input-penmount-1.4.0.tar.bz2 xf86-input-synaptics-1.0.0.tar.bz2 xf86-input-vmmouse-12.6.3.tar.bz2 xf86-input-void-1.2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-input.spec ++++++ --- /var/tmp/diff_new_pack.B18477/_old 2009-02-26 15:47:37.000000000 +0100 +++ /var/tmp/diff_new_pack.B18477/_new 2009-02-26 15:47:37.000000000 +0100 @@ -23,58 +23,57 @@ BuildRequires: Mesa-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 14 +Release: 16 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 -Provides: xorg-x11-server:/usr/X11R6/%{_lib}/modules/input/mouse_drv.so +Provides: xorg-x11-server:/usr/X11R6/%{_lib}/modules/input/mouse_drv.so x11-input-synaptics +Obsoletes: x11-input-synaptics Summary: X.Org input drivers ExcludeArch: s390 s390x -Source0: xf86-input-acecad-1.2.2.tar.bz2 -Source1: xf86-input-aiptek-X11R7.1-1.0.1.tar.bz2 +Source0: xf86-input-acecad-1.3.0.tar.bz2 +Source1: xf86-input-aiptek-1.2.0.tar.bz2 Source2: xf86-input-calcomp-1.1.2.tar.bz2 Source3: xf86-input-citron-2.2.1.tar.bz2 Source4: xf86-input-digitaledge-1.1.1.tar.bz2 Source5: xf86-input-dmc-1.1.2.tar.bz2 Source6: xf86-input-dynapro-1.1.2.tar.bz2 Source7: xf86-input-elo2300-1.1.2.tar.bz2 -Source8: xf86-input-elographics-1.2.2.tar.bz2 +Source8: xf86-input-elographics-1.2.3.tar.bz2 Source9: xf86-input-evdev-1.1.5.tar.bz2 -Source10: xf86-input-fpit-1.2.0_e8620e9.tar.bz2 +Source10: xf86-input-fpit-1.3.0.tar.bz2 Source11: xf86-input-hyperpen-1.2.0.tar.bz2 Source12: xf86-input-jamstudio-1.2.0.tar.bz2 -Source13: xf86-input-joystick-1.3.3.tar.bz2 -Source14: xf86-input-keyboard-1.3.1.tar.bz2 +Source13: xf86-input-joystick-1.4.0.tar.bz2 +Source14: xf86-input-keyboard-1.3.2.tar.bz2 Source15: xf86-input-magellan-1.2.0.tar.bz2 Source16: xf86-input-magictouch-7f90f6a.tar.bz2 Source17: xf86-input-microtouch-1.2.0.tar.bz2 Source18: xf86-input-mouse-1.3.0.tar.bz2 Source19: xf86-input-mutouch-1.2.1.tar.bz2 Source20: xf86-input-palmax-1.2.0.tar.bz2 -Source21: xf86-input-penmount-1.3.0.tar.bz2 +Source21: xf86-input-penmount-1.4.0.tar.bz2 Source22: xf86-input-spaceorb-1.1.1.tar.bz2 Source23: xf86-input-summa-1.2.0.tar.bz2 Source24: xf86-input-tek4957-1.2.0.tar.bz2 Source25: xf86-input-ur98-X11R7.1-1.1.0.tar.bz2 -Source26: xf86-input-vmmouse-12.6.2.tar.bz2 -Source27: xf86-input-void-1.1.1.tar.bz2 +Source26: xf86-input-vmmouse-12.6.3.tar.bz2 +Source27: xf86-input-void-1.2.0.tar.bz2 Source28: xf86-input-diamondtouch-0.3.0.tar.bz2 -# extra sources -Source100: xf86-input-aiptek-1.2.tar.gz +Source29: xf86-input-synaptics-1.0.0.tar.bz2 Patch2: xf86-input-jamstudio.diff Patch3: p_mouse_misc.diff Patch5: evdev-overflow.diff Patch6: xf86-input-evdev.diff Patch7: xf86-input-evdev-commit-eeb3727.diff Patch11: xf86-input-evdev-max_fixes.diff -Patch12: zap_warning_kbd.diff Patch15: xf86-input-evdev-sig11-bug416043.diff Patch16: xf86-input-evdev-xf86DeleteInput.diff Patch17: xf86-input-elo2300-1.1.2-commit-cc77936.diff -Patch18: xf86-input-elographics-1.2.2-commit-bf0e1bf.diff Patch19: xf86-input-microtouch-1.2.0-commit-81435d3.diff Patch20: xf86-input-evdev-btn-touch.diff Patch21: xf86-input-evdev-sig11-bug437651.diff +Patch23: wait.diff %description This package contains X.Org input drivers. @@ -84,7 +83,7 @@ %prep %setup -q -c -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 %setup -q -D -T -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -%setup -q -D -T -a21 -a22 -a23 -a24 -a25 -a26 -a27 -a28 +%setup -q -D -T -a21 -a22 -a23 -a24 -a25 -a26 -a27 -a28 -a29 #for i in $RPM_SOURCE_DIR/*.tar.bz2; do tar xjf $i; done pushd xf86-input-jamstudio-* %patch2 @@ -92,9 +91,6 @@ pushd xf86-input-mouse-*/src %patch3 -p6 popd -pushd xf86-input-keyboard-*/src -%patch12 -p2 -popd pushd xf86-input-evdev-* %patch5 -p0 %patch6 -p1 @@ -105,18 +101,15 @@ %patch20 -p1 %patch21 -p1 popd -pushd xf86-input-aiptek-*/src -tar xzf %{S:100} -popd pushd xf86-input-elo2300-* %patch17 -p1 popd -pushd xf86-input-elographics-* -%patch18 -p1 -popd pushd xf86-input-microtouch-* %patch19 -p1 popd +pushd xf86-input-synaptics-* +%patch23 -p0 +popd %build %ifarch %ix86 x86_64 @@ -154,8 +147,15 @@ %files %defattr(-,root,root) +/usr/include/xorg/joystick-properties.h +/usr/include/xorg/synaptics-properties.h +/usr/include/xorg/synaptics.h +/usr/%{_lib}/pkgconfig/xorg-joystick.pc +/usr/%{_lib}/pkgconfig/xorg-synaptics.pc /usr/%{_lib}/xorg/modules/input/ +%{_mandir}/man1/* %{_mandir}/man4/* +/usr/bin/syn* %ifarch %ix86 x86_64 %exclude /usr/bin/vmmouse_detect %exclude /usr/%{_lib}/hal/hal-probe-vmmouse @@ -164,6 +164,22 @@ %endif %changelog +* Thu Feb 26 2009 sndirsch@suse.de +- xf86-input-acecad 1.3.0 +- xf86-input-aiptek 1.2.0 +- xf86-input-elographics 1.2.3 +- xf86-input-fpit 1.3.0 +- xf86-input-joystick-1.4.0 +- xf86-input-keyboard 1.3.2 + * obsoletes zap_warning_kbd.diff +- xf86-input-penmount 1.4.0 +- xf86-input-synaptics 1.0.0 + * obsoletes commit-3097bb3.diff +- xf86-input-vmmouse 12.6.3 +- xf86-input-void 1.2.0 +* Tue Feb 24 2009 sndirsch@suse.de +- added synaptics driver; added provides/obsolete for + x11-input-synaptics * Wed Jan 14 2009 mhopf@suse.de - xf86-input-evdev-sig11-bug437651.diff Fix evdev segfault (bnc #437651) ++++++ wait.diff ++++++ --- src/eventcomm.c.orig 2008-09-08 01:33:28.000000000 +0000 +++ src/eventcomm.c 2008-09-08 02:07:53.000000000 +0000 @@ -313,7 +313,10 @@ EventAutoDevProbe(LocalDevicePtr local) int i; Bool touchpad_found = FALSE; struct dirent **namelist; + int wait = 0; + const int max_wait = 2000; + while (wait <= max_wait && !touchpad_found) { i = scandir(DEV_INPUT_EVENT, &namelist, EventDevOnly, alphasort); if (i < 0) { ErrorF("Couldn't open %s\n", DEV_INPUT_EVENT); @@ -338,8 +341,8 @@ EventAutoDevProbe(LocalDevicePtr local) if (event_query_is_touchpad(fd)) { touchpad_found = TRUE; - xf86Msg(X_PROBED, "%s auto-dev sets device to %s\n", - local->name, fname); + xf86Msg(X_PROBED, "%s auto-dev sets device to %s (waited %d msec)\n", + local->name, fname, wait); local->options = xf86ReplaceStrOption(local->options, "Device", fname); event_query_axis_ranges(fd, local); @@ -347,6 +350,13 @@ EventAutoDevProbe(LocalDevicePtr local) } free(namelist[i]); } + if (!touchpad_found) { + ErrorF("%s waiting 100 msec to become devices ready\n", local->name); + usleep(100*1000); + wait += 100; + ErrorF("%s waiting time total: %d\n", local->name, wait); + } + } /* while (wait <= max_wait && !touchpad_found) */ free(namelist); if (!touchpad_found) { ++++++ xf86-input-acecad-1.2.2.tar.bz2 -> xf86-input-acecad-1.3.0.tar.bz2 ++++++ ++++ 15367 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-acecad-1.2.2/autogen.sh new/xf86-input-acecad-1.3.0/autogen.sh --- old/xf86-input-acecad-1.2.2/autogen.sh 2007-04-26 15:33:31.000000000 +0200 +++ new/xf86-input-acecad-1.3.0/autogen.sh 1970-01-01 01:00:00.000000000 +0100 @@ -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 -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-acecad-1.2.2/ChangeLog new/xf86-input-acecad-1.3.0/ChangeLog --- old/xf86-input-acecad-1.2.2/ChangeLog 2008-02-10 08:55:12.000000000 +0100 +++ new/xf86-input-acecad-1.3.0/ChangeLog 2009-02-24 04:26:43.000000000 +0100 @@ -1,3 +1,62 @@ +commit 1685d3b518cf5fe4cc6a8fb3e3c28beb9b3ddb82 +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Tue Feb 24 13:22:46 2009 +1000 + + acecad 1.3.0 + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +commit 61ad1d4470491bd49484de0b6e4eb65a7a51c799 +Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> +Date: Mon Feb 2 18:02:43 2009 -0200 + + Janitor: Correct make distcheck and minor configure.ac cleanup. + +commit 482471e4fe445da6d5307d3a16e53de6afa143e8 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Thu Jan 29 15:09:23 2009 -0800 + + Add README with pointers to mailing list, bugzilla & git repos + +commit ef3446502993c8492149fd319a49f6bd894efb7a +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Fri Jan 9 16:09:43 2009 -0800 + + Remove xorgconfig & xorgcfg from See Also list in man page + +commit b9497ba77692f2d44a9a1339ae2d0ff436abed70 +Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> +Date: Fri Nov 28 04:48:50 2008 -0200 + + Correct wrong check for Linux libsysfs. + + This patch was the original one, and the previous test was a wrong + attempt to simplify the change. + Triggered by tinderbox build. + +commit 36675d65ddc1ed35190f5fdbb18d5b460c7ba972 +Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> +Date: Fri Nov 28 01:45:54 2008 -0200 + + Dont dlopen libsysfs.so, instead, link with it when available. + +commit 791cbbf9df621d9712731990271bf3b53076673a +Author: Peter Hutterer <peter@cs.unisa.edu.au> +Date: Mon May 26 22:00:23 2008 +0930 + + Check for XINPUT ABI 3. + +commit 33e64334db17ed3d2307e3ac465450c5c9b39ad9 +Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> +Date: Sun Mar 16 03:01:23 2008 -0300 + + Compile warning fixes. + + Don't call xf86usleep, just call usleep directly. + Remove unused variables. + + Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au> + commit 60270d38257797a82eff74a56d1561068a6c348e Author: Giuseppe Bilotta <giuseppe.bilotta@gmail.com> Date: Sun Feb 10 08:52:46 2008 +0100 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-acecad-1.2.2/configure.ac new/xf86-input-acecad-1.3.0/configure.ac --- old/xf86-input-acecad-1.2.2/configure.ac 2008-02-10 08:51:37.000000000 +0100 +++ new/xf86-input-acecad-1.3.0/configure.ac 2009-02-24 04:22:42.000000000 +0100 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-acecad], - 1.2.2, + 1.3.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-acecad) @@ -32,15 +32,16 @@ AM_MAINTAINER_MODE -DRIVER_NAME=acecad -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,9 +78,7 @@ # 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. @@ -88,11 +87,17 @@ AC_HEADER_CHECK([linux/input.h], [AC_DEFINE([LINUX_INPUT], [1], [Using the Linux input subsystem])] ) -AC_HEADER_CHECK([sysfs/libsysfs.h], - [AC_DEFINE([LINUX_SYSFS], [1], [Using sysfs to probe devices])] - ) +AC_CHECK_HEADER(sysfs/libsysfs.h, HAVE_LIBSYSFS=yes, HAVE_LIBSYSFS=no) +if test x$HAVE_LIBSYSFS = xyes; then + AC_DEFINE(LINUX_SYSFS, 1, [Using sysfs to probe devices]) +fi +AM_CONDITIONAL(HAVE_LIBSYSFS, test x$HAVE_LIBSYSFS = xyes) + +DRIVER_NAME=acecad +AC_SUBST([DRIVER_NAME]) XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile src/Makefile man/Makefile]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-acecad-1.2.2/Makefile.am new/xf86-input-acecad-1.3.0/Makefile.am --- old/xf86-input-acecad-1.2.2/Makefile.am 2007-04-27 12:23:30.000000000 +0200 +++ new/xf86-input-acecad-1.3.0/Makefile.am 2009-02-18 12:02:04.000000000 +0100 @@ -20,14 +20,12 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = src man - -EXTRA_DIST = autogen.sh ChangeLog - -CLEANFILES = ChangeLog +EXTRA_DIST = ChangeLog +MAINTAINERCLEANFILES = ChangeLog .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 -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-acecad-1.2.2/man/acecad.man new/xf86-input-acecad-1.3.0/man/acecad.man --- old/xf86-input-acecad-1.2.2/man/acecad.man 2007-04-26 15:33:31.000000000 +0200 +++ new/xf86-input-acecad-1.3.0/man/acecad.man 2009-02-18 12:02:04.000000000 +0100 @@ -33,7 +33,7 @@ .PP Config details... .SH "SEE ALSO" -__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__). +__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__). .SH AUTHORS Authors include... Edouard TISSERANT diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-acecad-1.2.2/README new/xf86-input-acecad-1.3.0/README --- old/xf86-input-acecad-1.2.2/README 1970-01-01 01:00:00.000000000 +0100 +++ new/xf86-input-acecad-1.3.0/README 2009-02-18 12:02:04.000000000 +0100 @@ -0,0 +1,20 @@ +xf86-input-acecad - Acecad Flair 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-acecad + + http://cgit.freedesktop.org/xorg/driver/xf86-input-acecad + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-acecad-1.2.2/src/acecad.c new/xf86-input-acecad-1.3.0/src/acecad.c --- old/xf86-input-acecad-1.2.2/src/acecad.c 2008-02-09 22:30:01.000000000 +0100 +++ new/xf86-input-acecad-1.3.0/src/acecad.c 2009-02-18 12:02:04.000000000 +0100 @@ -245,54 +245,48 @@ char *link = NULL; struct dlist *devs = NULL; struct dlist *links = NULL; - unsigned int major = 0, minor = 0; - void *libsysfs = NULL; - if (libsysfs = dlopen("libsysfs.so", RTLD_NOW | RTLD_GLOBAL)) { - xf86MsgVerb(X_INFO, verb, "%s: querying sysfs for Acecad tablets\n", local->name); - usb_bus = sysfs_open_bus(usb_bus_name); - if (usb_bus) { - xf86MsgVerb(X_PROBED, 4, "%s: usb bus opened\n", local->name); - acecad_driver = sysfs_get_bus_driver(usb_bus, acecad_driver_name); - if (acecad_driver) { - xf86MsgVerb(X_PROBED, 4, "%s: usb_acecad driver opened\n", local->name); - devs = sysfs_get_driver_devices(acecad_driver); - if (devs) { - xf86MsgVerb(X_PROBED, 4, "%s: usb_acecad devices retrieved\n", local->name); - dlist_for_each_data(devs, candidate, struct sysfs_device) { - xf86MsgVerb(X_PROBED, 4, "%s: device %s at %s\n", local->name, candidate->name, candidate->path); - links = sysfs_open_link_list(candidate->path); - dlist_for_each_data(links, link, char) { - if (sscanf(link, "input:event%d", &i) == 1) { - xf86MsgVerb(X_PROBED, 4, "%s: device %s at %s: %s\n", local->name, candidate->name, candidate->path, link); - break; - } - } - sysfs_close_list(links); - if (i > 0) /* We found something */ - break; - } - } else - xf86MsgVerb(X_WARNING, 4, "%s: no usb_acecad devices found\n", local->name); - } else - xf86MsgVerb(X_WARNING, 4, "%s: usb_acecad driver not found\n", local->name); - } else - xf86MsgVerb(X_WARNING, 4, "%s: usb bus not found\n", local->name); - sysfs_close_bus(usb_bus); - dlclose(libsysfs); - - if (i > 0) { - /* We found something */ - np = SET_EVENT_NUM(fname, i); - if (np < 0 || np >= EV_DEV_NAME_MAXLEN) { - xf86MsgVerb(X_WARNING, verb, "%s: unable to manage event device %d\n", local->name, i); - } else { - goto ProbeFound; - } - } else - xf86MsgVerb(X_WARNING, verb, "%s: no Acecad devices found via sysfs\n", local->name); + xf86MsgVerb(X_INFO, verb, "%s: querying sysfs for Acecad tablets\n", local->name); + usb_bus = sysfs_open_bus(usb_bus_name); + if (usb_bus) { + xf86MsgVerb(X_PROBED, 4, "%s: usb bus opened\n", local->name); + acecad_driver = sysfs_get_bus_driver(usb_bus, acecad_driver_name); + if (acecad_driver) { + xf86MsgVerb(X_PROBED, 4, "%s: usb_acecad driver opened\n", local->name); + devs = sysfs_get_driver_devices(acecad_driver); + if (devs) { + xf86MsgVerb(X_PROBED, 4, "%s: usb_acecad devices retrieved\n", local->name); + dlist_for_each_data(devs, candidate, struct sysfs_device) { + xf86MsgVerb(X_PROBED, 4, "%s: device %s at %s\n", local->name, candidate->name, candidate->path); + links = sysfs_open_link_list(candidate->path); + dlist_for_each_data(links, link, char) { + if (sscanf(link, "input:event%d", &i) == 1) { + xf86MsgVerb(X_PROBED, 4, "%s: device %s at %s: %s\n", local->name, candidate->name, candidate->path, link); + break; + } + } + sysfs_close_list(links); + if (i > 0) /* We found something */ + break; + } + } else + xf86MsgVerb(X_WARNING, 4, "%s: no usb_acecad devices found\n", local->name); + } else + xf86MsgVerb(X_WARNING, 4, "%s: usb_acecad driver not found\n", local->name); + } else + xf86MsgVerb(X_WARNING, 4, "%s: usb bus not found\n", local->name); + sysfs_close_bus(usb_bus); + + if (i > 0) { + /* We found something */ + np = SET_EVENT_NUM(fname, i); + if (np < 0 || np >= EV_DEV_NAME_MAXLEN) { + xf86MsgVerb(X_WARNING, verb, "%s: unable to manage event device %d\n", local->name, i); + } else { + goto ProbeFound; + } } else - xf86MsgVerb(X_WARNING, 4, "%s: libsysfs not found\n", local->name); + xf86MsgVerb(X_WARNING, verb, "%s: no Acecad devices found via sysfs\n", local->name); #endif @@ -658,7 +652,10 @@ /* 3 axes */ - if (InitValuatorClassDeviceStruct (dev, 3, xf86GetMotionEvents, + if (InitValuatorClassDeviceStruct (dev, 3, +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 + xf86GetMotionEvents, +#endif local->history_size, ((priv->flags & ABSOLUTE_FLAG)? Absolute: Relative)|OutOfProximity) == FALSE) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-acecad-1.2.2/src/acecad.h new/xf86-input-acecad-1.3.0/src/acecad.h --- old/xf86-input-acecad-1.2.2/src/acecad.h 2008-01-20 14:52:54.000000000 +0100 +++ new/xf86-input-acecad-1.3.0/src/acecad.h 2008-05-27 04:14:59.000000000 +0200 @@ -63,7 +63,7 @@ #define NOTAVAIL ((errno == ENODEV) || (errno == ENXIO) || (errno == ENOENT)) -#define milisleep(ms) xf86usleep (ms * 1000) +#define milisleep(ms) usleep (ms * 1000) #define SYSCALL(call) while(((call) == -1) && (errno == EINTR)) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-acecad-1.2.2/src/Makefile.am new/xf86-input-acecad-1.3.0/src/Makefile.am --- old/xf86-input-acecad-1.2.2/src/Makefile.am 2008-01-20 14:52:54.000000000 +0100 +++ new/xf86-input-acecad-1.3.0/src/Makefile.am 2009-02-18 12:02:04.000000000 +0100 @@ -24,8 +24,15 @@ # -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 + +if HAVE_LIBSYSFS +@DRIVER_NAME@_drv_la_LIBADD = -lsysfs +endif + @DRIVER_NAME@_drv_ladir = @inputdir@ @DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.c @DRIVER_NAME@.h ++++++ xf86-input-aiptek-X11R7.1-1.0.1.tar.bz2 -> xf86-input-aiptek-1.2.0.tar.bz2 ++++++ ++++ 26564 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-aiptek-X11R7.1-1.0.1/ChangeLog new/xf86-input-aiptek-1.2.0/ChangeLog --- old/xf86-input-aiptek-X11R7.1-1.0.1/ChangeLog 2006-04-07 18:50:49.000000000 +0200 +++ new/xf86-input-aiptek-1.2.0/ChangeLog 2009-02-24 04:46:29.000000000 +0100 @@ -1,46 +1,388 @@ -2006-04-06 Adam Jackson <ajax@freedesktop.org> +commit b4dfb51ee61f5c54134e5731e0581f9f74bc6829 +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Tue Feb 24 13:44:25 2009 +1000 - * configure.ac: - * src/xf86Aiptek.c: - * src/xf86Aiptek.h: - Unlibcwrap. Bump server version requirement. Bump to 1.1.0. + aiptek 1.2.0 + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> -2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit acfbb985d63861cf414f568001a4bce89b75b0d9 +Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> +Date: Mon Feb 2 18:13:44 2009 -0200 - * configure.ac: - Update package version for X11R7 release. + Janitor: rework make distcheck + + Don't use a static ChangeLog, and distribute the generated one. + Use only one .gitignore file. + Minor cleanup on configure.ac, aiming as similar as possible + drivers configure.ac's. -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 3c0327e190e134a4435b4c22238749fed12a6709 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Thu Jan 29 15:11:26 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 8d05f481f0219dafed821b7cc89784afe73a5e24 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Fri Jan 9 16:10:14 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 9caf1a8372b5c9bae4032d256bb6065d8dbf26ba +Author: Peter Hutterer <peter.hutterer@redhat.com> +Date: Thu Aug 14 15:01:28 2008 +0930 - * configure.ac: - Update package version number for X11R7 RC3 release. + Fix build, xf86Version.h has been superseeded by xorgVersion.h -2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 87a3bd344129c06e4f4f90b10d13347b77f2be93 +Author: Julien Cristau <jcristau@debian.org> +Date: Thu Jul 17 18:25:05 2008 +0200 - * configure.ac: - Remove extraneous AC_MSG_RESULT. + Link against -lm for sqrt() -2005-11-29 Adam Jackson <ajax@freedesktop.org> +commit 056b2a86085fd68f6408c53eb148284e2b506e77 +Author: Peter Hutterer <peter@cs.unisa.edu.au> +Date: Mon May 26 22:01:29 2008 +0930 - * configure.ac: - Only build dlloader modules by default. + Check for XINPUT ABI 3. -2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit a92bf3b53a277928c94aa87f245ccf301c1e7a2d +Author: René van Paassen <Rene.vanPaassen@gmail.com> +Date: Tue Jan 29 22:42:40 2008 +0100 - * configure.ac: - Update package version number for X11R7 RC2 release. + Bumped the version to 1.1.1 + + This version is actually being tested/used by someone with a tablet (me) -2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 4a8945d179f3ca9c6ca3553d36ce9840228cf84f +Author: René van Paassen <repa@pascua.localdomain> +Date: Tue Jan 29 22:32:04 2008 +0100 - * configure.ac: - Update pkgcheck depedencies to work with separate build roots. + added #if to handle MiPointer{Current|Get}Screen cases + +commit 28269504679fd705f5666c450dbf862f91c8ca84 +Author: René van Paassen <repa@pascua.localdomain> +Date: Tue Jan 29 22:29:41 2008 +0100 + + moved xf86AiptekClose after RemoveEnabled.., fixes crash VT switch + +commit a23587a1eef2c256ae9d4184405efb74135e13d5 +Author: René van Paassen <repa@pascua.localdomain> +Date: Tue Jan 29 22:24:34 2008 +0100 + + Converted xf86msg into debug messages, to prevent filling the log + +commit 51a90b36853a98f6ec5f04c54a9d76fddcfa8ad6 +Author: Peter Hutterer <peter@cs.unisa.edu.au> +Date: Thu Jan 17 17:21:38 2008 +1030 + + Don't worry about being core pointer if XInput API is > 0. + + Server 1.4 and above let all devices be XI devices and the core devices are + virtual. So we don't have to worry about it in the driver. + + This should make the code compatible with both 1.3 and 1.4. + +commit f424235dd26fa22bc3830cf9d884d7643abf3568 +Author: Peter Hutterer <peter@cs.unisa.edu.au> +Date: Thu Jan 17 13:24:46 2008 +1030 + + Revert "Driver's don't have to worry about being core pointers anymore." + There's a better way of doing things. See next commit. + + This reverts commit 66e0fbb24377ac14b9cf8a80a55253cff13d7913. + +commit e34bc8e774d92bd81dcefbcd341ab3f040a7f144 +Author: Peter Hutterer <peter@cs.unisa.edu.au> +Date: Thu Jan 10 11:27:39 2008 +1030 + + Remove redefinition of NEED_XF86_TYPES. + +commit a88dafb63b0e0f3e4557ae75a3ee9a377ea4ef68 +Author: Peter Hutterer <peter@cs.unisa.edu.au> +Date: Thu Jan 10 11:26:49 2008 +1030 + + miPointerCurrentScreen is deprecated, miPointerGetScreen is all the rage now. + + Untested due to lack of device. + +commit 66e0fbb24377ac14b9cf8a80a55253cff13d7913 +Author: Peter Hutterer <peter@cs.unisa.edu.au> +Date: Thu Jan 10 11:25:58 2008 +1030 + + Driver's don't have to worry about being core pointers anymore. + + The DDX will do the right job, no matter what events we post, so we don't need + in-driver checks for whether to post proximity events or not. + + Untested due to a lack of device. + +commit 3cb825cb4a633132de10df77e792fcbadf082385 +Author: Rene van Paassen <rene.vanpaassen@gmail.com> +Date: Thu Jan 10 11:23:06 2008 +1030 + + Patch with a load of fixes, backported from aiptektablet.sourceforge.net + + Tested with re-branded aiptek 12000U + +commit afedccae164668128c6228542585cc27d241b7e6 +Author: James Cloos <cloos@jhcloos.com> +Date: Mon Sep 3 05:52:01 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit 432145c8c4ec06710f139112aeee96fdc19c5f92 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Aug 23 19:25:19 2007 -0400 + + Rename .cvsignore to .gitignore + +commit 1733fc06082f982b0f0d57bac9632f3ece8f4c34 +Author: Brice Goglin <bgoglin@debian.org> +Date: Mon Aug 6 19:32:29 2007 +0200 + + Use PACKAGE_VERSION_MAJOR/MINOR/PATCHLEVEL in xf86AiptekVersionRec + +commit c0f5a94625ed8e7ab326b3b604e8f7461921c027 +Author: Brice Goglin <bgoglin@debian.org> +Date: Mon Aug 6 19:32:26 2007 +0200 + + Fix 1.1.0 version in configure.ac + +commit e65a8abb1da2058a5fefa60950054ed01ae2f467 +Author: Adam Jackson <ajax@nwnk.net> +Date: Fri Apr 7 16:50:50 2006 +0000 + + Unlibcwrap. Bump server version requirement. Bump to 1.1.0. + +commit 10f7f22a718f2242bda8d378795d3061767cbc4b +Author: Kevin E Martin <kem@kem.org> +Date: Wed Dec 21 02:29:55 2005 +0000 + + Update package version for X11R7 release. + +commit 4331da985ae9d6a7b5d21eb0307827fb64aea1d1 +Author: Adam Jackson <ajax@nwnk.net> +Date: Mon Dec 19 16:25:49 2005 +0000 + + Stub COPYING files + +commit eaa1babb65d3db249f58526c26f78c98a4921a14 +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 c49c2d18eb645a863ca824bd898a512221ae6a0f +Author: Kevin E Martin <kem@kem.org> +Date: Thu Dec 15 00:24:13 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 9faf2cecf235ef95c9e2700d3b2bd42633dc2b69 +Author: Kevin E Martin <kem@kem.org> +Date: Tue Dec 6 22:48:27 2005 +0000 + + Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + +commit 5914bf9f7767403d884c86b9157f8280a4eb8bc1 +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 05:49:29 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit 6b51e42175b57bf88ded3f66e1354d7c1dbe281b +Author: Kevin E Martin <kem@kem.org> +Date: Fri Dec 2 02:16:04 2005 +0000 + + Remove extraneous AC_MSG_RESULT. + +commit 8c4ba228719a927a1a409fef1d59b5f1ae6320a3 +Author: Adam Jackson <ajax@nwnk.net> +Date: Tue Nov 29 23:29:54 2005 +0000 + + Only build dlloader modules by default. + +commit 9ca454714cd4643f4dd5568124bbdd1e704f9ea0 +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Mon Nov 28 22:04:05 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 7cebf35a1a62dd986f05f94ef075f748e6771b35 +Author: Eric Anholt <anholt@freebsd.org> +Date: Mon Nov 21 10:49:00 2005 +0000 + + Add .cvsignores for drivers. + +commit 09d0e1f5174d9379a6a62f6fcd421e40acb49600 +Author: Kevin E Martin <kem@kem.org> +Date: Wed Nov 9 21:15:10 2005 +0000 + + Update package version number for X11R7 RC2 release. + +commit d514546c3203b78ee5925e1f081353971f2c492d +Author: Kevin E Martin <kem@kem.org> +Date: Tue Nov 1 15:08:48 2005 +0000 + + Update pkgcheck depedencies to work with separate build roots. + +commit 97fd7aa3dc51fb0e3b7a6b27c3c73eb06cfbcbdd +Author: Kevin E Martin <kem@kem.org> +Date: Wed Oct 19 02:47:59 2005 +0000 + + Update package version number for RC1 release. + +commit 9204bcbe32e91f7880b90a7a33f7372f3240fef6 +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Tue Oct 18 00:01:50 2005 +0000 + + Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro + substitutions to work better with BSD make + +commit a6934ae32c03ee0cbb7df9ce86176862ae579be3 +Author: Adam Jackson <ajax@nwnk.net> +Date: Mon Oct 17 22:57:25 2005 +0000 + + More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead + of indirectly + +commit 06c97358d8fbc15458a229ed6d6e5f3ee328201f +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Mon Oct 17 00:08:53 2005 +0000 + + Use sed & cpp to substitute variables in driver man pages + +commit a58366783c50bd424e7ac36691e5b914d30771e4 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Thu Aug 18 09:03:37 2005 +0000 + + Update autogen.sh to one that does objdir != srcdir. + +commit 9ee61601ca5b5f51f94a252676240031695f6678 +Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> +Date: Wed Aug 10 14:07:22 2005 +0000 + + Don\'t lose existing CFLAGS in all the input drivers and some of the video + drivers + +commit 28ae25b20902189d5f7ad4a6f2d0932aa18be7b1 +Author: Kevin E Martin <kem@kem.org> +Date: Fri Jul 29 21:22:39 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 a0bc41b3458c985aff5fc745dd8ff10e04310c20 +Author: Kevin E Martin <kem@kem.org> +Date: Wed Jul 13 20:03:20 2005 +0000 + + Make the module dir configurable + +commit f9627bd4e6cb2a88c46fa7799def0bd1b99b186d +Author: Kevin E Martin <kem@kem.org> +Date: Wed Jul 13 02:20:57 2005 +0000 + + Update all input drivers to pass distcheck + +commit b00537ba24d2ffc713faa71383e009518d2b5e42 +Author: Kevin E Martin <kem@kem.org> +Date: Wed Jul 13 02:18:12 2005 +0000 + + Change input drivers to get keysym's from <X11/keysym.h>. + +commit da137dba6b2601717e3ff760e885eed7755c5a9a +Author: Adam Jackson <ajax@nwnk.net> +Date: Tue Jul 12 06:15:07 2005 +0000 + + Build skeletons for input drivers. Should basically work. + +commit 4733f1c8fd451306b09c017bd7741a4e0fe337e4 +Author: Adam Jackson <ajax@nwnk.net> +Date: Mon Jul 11 02:37:58 2005 +0000 + + Prep input drivers for modularizing by adding guarded #include "config.h" + +commit 46d19bbd14e3a09222979cee955991e74458e668 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Fri Jul 1 22:43:22 2005 +0000 + + Change all misc.h and os.h references to <X11/foo.h>. + +commit 58696f4a73aac4d0c43094e20d59477ff1da8031 +Author: Adam Jackson <ajax@nwnk.net> +Date: Mon Jun 27 18:32:53 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 d6531729f026d500516a9740c22b2b7800917a5e +Author: Adam Jackson <ajax@nwnk.net> +Date: Sat Jun 25 21:17:00 2005 +0000 + + Bug #3626: _X_EXPORT tags for video and input drivers. + +commit 71b8c6c2fcc8dcb899c641e405d60434d0add0c0 +Author: Egbert Eich <eich@suse.de> +Date: Fri Apr 23 19:54:02 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit 1d4b40f72f30d327e7bd8728e17779e1bbd683fa +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 f6478217d3b9ad9d36e6f83a7704338f17b0a5f3 +Author: Egbert Eich <eich@suse.de> +Date: Wed Mar 3 12:12:30 2004 +0000 + + Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 + +commit 58ee10b7d9fe3d1f3dc8063de302de33d1438002 +Author: Egbert Eich <eich@suse.de> +Date: Thu Feb 26 13:36:00 2004 +0000 + + readding XFree86's cvs IDs + +commit 376ac8a52977f29d59d42a723a567d6babba56f6 +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 cec2b7afe6e877d2a83bfdfc991aad605ae081e8 +Author: Egbert Eich <eich@suse.de> +Date: Thu Jan 29 08:08:45 2004 +0000 + + Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004 + +commit dcc03ba32debfb3bf1dcc7da024ad8199bd71d50 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Dec 19 20:55:25 2003 +0000 + + XFree86 4.3.99.902 (RC 2) + +commit 5d8fba55f40bef3e4e8aa70a86ed0bfd001145c7 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Tue Nov 25 19:28:46 2003 +0000 + + XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks + +commit 4b1ef06b77c87bb5bd943a607130e556042bd61c +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Tue Nov 25 19:28:46 2003 +0000 + + Initial revision diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-aiptek-X11R7.1-1.0.1/config.h.in new/xf86-input-aiptek-1.2.0/config.h.in --- old/xf86-input-aiptek-X11R7.1-1.0.1/config.h.in 2006-05-23 05:12:23.000000000 +0200 +++ new/xf86-input-aiptek-1.2.0/config.h.in 2009-02-24 04:44:13.000000000 +0100 @@ -50,6 +50,15 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION +/* Major version of this package */ +#undef PACKAGE_VERSION_MAJOR + +/* Minor version of this package */ +#undef PACKAGE_VERSION_MINOR + +/* Patch version of this package */ +#undef PACKAGE_VERSION_PATCHLEVEL + /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-aiptek-X11R7.1-1.0.1/configure.ac new/xf86-input-aiptek-1.2.0/configure.ac --- old/xf86-input-aiptek-X11R7.1-1.0.1/configure.ac 2006-04-07 18:50:49.000000000 +0200 +++ new/xf86-input-aiptek-1.2.0/configure.ac 2009-02-24 04:43:57.000000000 +0100 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-aiptek], - 1.0.1, + 1.2.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-aiptek) @@ -32,15 +32,16 @@ AM_MAINTAINER_MODE -DRIVER_NAME=aiptek -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 @@ # 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=aiptek +AC_SUBST([DRIVER_NAME]) + XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile src/Makefile man/Makefile]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-aiptek-X11R7.1-1.0.1/Makefile.am new/xf86-input-aiptek-1.2.0/Makefile.am --- old/xf86-input-aiptek-X11R7.1-1.0.1/Makefile.am 2005-07-12 08:15:07.000000000 +0200 +++ new/xf86-input-aiptek-1.2.0/Makefile.am 2009-02-04 01:45:10.000000000 +0100 @@ -20,3 +20,12 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = src man +EXTRA_DIST = ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-aiptek-X11R7.1-1.0.1/man/aiptek.man new/xf86-input-aiptek-1.2.0/man/aiptek.man --- old/xf86-input-aiptek-X11R7.1-1.0.1/man/aiptek.man 2005-12-19 10:07:49.000000000 +0100 +++ new/xf86-input-aiptek-1.2.0/man/aiptek.man 2009-02-04 01:45:10.000000000 +0100 @@ -150,7 +150,7 @@ This driver is currently Linux specific. .PP .SH "SEE ALSO" -__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__), hyperpen(__drivermansuffix__). +__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__), hyperpen(__drivermansuffix__). .SH AUTHORS Bryan W. Headley <bheadley@earthlink.net> .SH PROJECT PAGE diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-aiptek-X11R7.1-1.0.1/man/Makefile.am new/xf86-input-aiptek-1.2.0/man/Makefile.am --- old/xf86-input-aiptek-X11R7.1-1.0.1/man/Makefile.am 2005-12-06 23:48:27.000000000 +0100 +++ new/xf86-input-aiptek-1.2.0/man/Makefile.am 2008-04-16 08:20:14.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.6 2005/11/28 22:04:05 alanc Exp $ +# $Id$ # # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-aiptek-X11R7.1-1.0.1/missing new/xf86-input-aiptek-1.2.0/missing --- old/xf86-input-aiptek-X11R7.1-1.0.1/missing 2006-05-23 05:12:25.000000000 +0200 +++ new/xf86-input-aiptek-1.2.0/missing 2008-04-16 08:20:20.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2006-05-10.23 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. @@ -33,6 +33,8 @@ fi run=: +sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' +sed_minuso='s/.* -o \([^ ]*\).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -44,7 +46,7 @@ msg="missing on your system" -case "$1" in +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -77,6 +79,7 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -106,7 +109,7 @@ # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect # the program). -case "$1" in +case $1 in lex|yacc) # Not GNU programs, they don't have --version. ;; @@ -135,7 +138,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case "$1" in +case $1 in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -164,7 +167,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -192,8 +195,8 @@ You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -214,25 +217,25 @@ in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; @@ -244,18 +247,18 @@ in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; @@ -267,11 +270,9 @@ \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file @@ -289,11 +290,17 @@ DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` + file=`sed -n ' + /^@setfilename/{ + s/.* \([^ ]*\) *$/\1/ + p + q + }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi @@ -317,13 +324,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-aiptek-X11R7.1-1.0.1/README new/xf86-input-aiptek-1.2.0/README --- old/xf86-input-aiptek-X11R7.1-1.0.1/README 1970-01-01 01:00:00.000000000 +0100 +++ new/xf86-input-aiptek-1.2.0/README 2009-02-04 01:45:10.000000000 +0100 @@ -0,0 +1,20 @@ +xf86-input-aiptek - Aiptek USB Digital Tablet Input Driver for Linux + +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-aiptek + + http://cgit.freedesktop.org/xorg/driver/xf86-input-aiptek + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-aiptek-X11R7.1-1.0.1/src/Makefile.am new/xf86-input-aiptek-1.2.0/src/Makefile.am --- old/xf86-input-aiptek-X11R7.1-1.0.1/src/Makefile.am 2005-07-13 04:20:57.000000000 +0200 +++ new/xf86-input-aiptek-1.2.0/src/Makefile.am 2009-02-04 01:45:10.000000000 +0100 @@ -24,10 +24,11 @@ # -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) -DLINUX_INPUT + @DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la @DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version @DRIVER_NAME@_drv_ladir = @inputdir@ +@DRIVER_NAME@_drv_la_LIBADD = -lm @DRIVER_NAME@_drv_la_SOURCES = xf86Aiptek.c xf86Aiptek.h - -AM_CFLAGS = -DLINUX_INPUT diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-aiptek-X11R7.1-1.0.1/src/xf86Aiptek.c new/xf86-input-aiptek-1.2.0/src/xf86Aiptek.c --- old/xf86-input-aiptek-X11R7.1-1.0.1/src/xf86Aiptek.c 2006-04-07 18:50:50.000000000 +0200 +++ new/xf86-input-aiptek-1.2.0/src/xf86Aiptek.c 2008-05-26 14:31:20.000000000 +0200 @@ -4,6 +4,24 @@ * This driver assumes Linux USB/HID support, available for USB devices. * * Version 0.0, 1-Jan-2003, Bryan W. Headley + * + * Version 1.0 10-jan-2008, Rene van Paassen + * * This version is based on the Xorg driver 1.0.1 version, with + * fixes based on the version developed at aiptektablet.sourceforge.net + * fixes include - correction of the button status calculation + * (buttons were never released) + * - use stylus as default, because reading the + * tablet before X start gives no hint as to what device + * it is producing + * - correction of the proximity bit detection + * - although tablet may produce relative (x, y), the z and + * tilt values are always absolute, corrected that + * - relative x and y may be negative sometimes! removed + * clipping there + * - filtering out events only if ALL values are equal to + * the, previous not when only one or more is equal + + * combined filtering with threshold. + * * * Copyright 2003 by Bryan W. Headley. <bwheadley@earthlink.net> * @@ -203,11 +221,23 @@ AiptekDevicePtr device = (AiptekDevicePtr) local->private; int xSize, ySize; int width, height; +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 + ScreenPtr pScreen = miPointerCurrentScreen(); +#else + ScreenPtr pScreen = miPointerGetScreen(local->dev); +#endif - DBG(6, ErrorF("xf86AiptekConvert\n")); - xf86Msg(X_CONFIG, " xf86AiptekConvert(), with: first=%d, num=%d, v0=%d, " - "v1=%d, v2=%d, v3=%d,, v4=%d, v5=%d, x=%d, y=%d\n", - first, num, v0, v1, v2, v3, v4, v5, *x, *y); + DBG(15, ErrorF(" xf86AiptekConvert(), with: first=%d, num=%d, v0=%d, " + "v1=%d, v2=%d, v3=%d,, v4=%d, v5=%d, x=%d, y=%d\n", + first, num, v0, v1, v2, v3, v4, v5, *x, *y)); + + /* Change the screen number if it differs from that which + * the pointer is currently on + */ + if (pScreen->myNum != device->screenNo) + { + device->screenNo = pScreen->myNum; + } if (first != 0 || num == 1) { @@ -256,8 +286,8 @@ { xf86XInputSetScreen(local, device->screenNo, *x, *y); } - xf86Msg(X_CONFIG, ": xf86AiptekConvert() exits, with: x=%d, y=%d\n", - *x, *y); + DBG(15, ErrorF("xf86AiptekConvert() exits, with: x=%d, y=%d\n", + *x, *y)); return TRUE; } @@ -275,9 +305,9 @@ AiptekDevicePtr device = (AiptekDevicePtr) local->private; int xSize, ySize; - xf86Msg(X_CONFIG, ": xf86AiptekReverseConvert(), with: x=%d, y=%d, " - "valuators[0]=%d, valuators[1]=%d\n", - x, y, valuators[0], valuators[1] ); + DBG(15, ErrorF("xf86AiptekReverseConvert(), with: x=%d, y=%d, " + "valuators[0]=%d, valuators[1]=%d\n", + x, y, valuators[0], valuators[1] )); /* * Adjust by tablet ratio @@ -288,16 +318,16 @@ valuators[0] = (x*xSize) / screenInfo.screens[device->screenNo]->width; valuators[1] = (y*ySize) / screenInfo.screens[device->screenNo]->height; - DBG(6, ErrorF("converted x,y (%d, %d) to (%d, %d)\n", + DBG(15, ErrorF("converted x,y (%d, %d) to (%d, %d)\n", x, y, valuators[0], valuators[1] )); if (device->screenNo != 0) { xf86XInputSetScreen(local,device->screenNo,valuators[0], valuators[1]); } - xf86Msg(X_CONFIG, ": xf86AiptekReverseConvert() exits, with: " - "valuators[0]=%d, valuators[1]=%d\n", - valuators[0], valuators[1] ); + DBG(15, ErrorF(": xf86AiptekReverseConvert() exits, with: " + "valuators[0]=%d, valuators[1]=%d\n", + valuators[0], valuators[1] )); return TRUE; } @@ -312,7 +342,7 @@ AiptekDevicePtr device = (AiptekDevicePtr) local->private; AiptekCommonPtr common = device->common; - int bCorePointer, bAbsolute; + int bCorePointer = FALSE, bAbsolute; int x, y, z, xTilt, yTilt; if ((DEVICE_ID(device->flags) != common->currentValues.eventType)) @@ -323,7 +353,9 @@ } bAbsolute = (device->flags & ABSOLUTE_FLAG); +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 bCorePointer = xf86IsCorePointer(local->dev); +#endif /* * Normalize X and Y coordinates. This includes dealing @@ -333,46 +365,54 @@ { x = common->currentValues.x; y = common->currentValues.y; - z = r_z; - xTilt = common->currentValues.xTilt; - yTilt = common->currentValues.yTilt; - } - else - { - x = common->currentValues.x - common->previousValues.x; - y = common->currentValues.y - common->previousValues.y; - z = r_z - common->previousValues.z; - xTilt = common->currentValues.xTilt - common->previousValues.xTilt; - yTilt = common->currentValues.yTilt - common->previousValues.yTilt; - } - /* Translate coordinates according to Top and Bottom points. - */ - if (x > device->xBottom) { - x = device->xBottom; - } + /* Translate coordinates according to Top and Bottom points. + */ + if (x > device->xBottom) { + x = device->xBottom; + } - if (y > device->yBottom) { - y = device->yBottom; - } + if (y > device->yBottom) { + y = device->yBottom; + } - if (device->xTop > 0) { - DBG(10, ErrorF("Adjusting x, with xTop=%d\n", device->xTop)); - x -= device->xTop; - } + if (device->xTop > 0) { + DBG(10, ErrorF("Adjusting x, with xTop=%d\n", device->xTop)); + x -= device->xTop; + } + + if (device->yTop > 0) { + DBG(10, ErrorF("Adjusting y, with yTop=%d\n", device->yTop)); + y -= device->yTop; + } + + if (x < 0) { + x = 0; + } + if (y < 0) { + y = 0; + } - if (device->yTop > 0) { - DBG(10, ErrorF("Adjusting y, with yTop=%d\n", device->yTop)); - y -= device->yTop; } - - if (x < 0) { - x = 0; - } - if (y < 0) { - y = 0; + else + { + if (common->previousValues.proximity != 0) + { + x = common->currentValues.x - common->previousValues.x; + y = common->currentValues.y - common->previousValues.y; + } + else + { + x = 0; + y = 0; + } } + z = r_z; + xTilt = common->currentValues.xTilt; + yTilt = common->currentValues.yTilt; + + /* Deal with pressure min..max, which differs from threshold. */ if (z < device->zMin) { z = 0; @@ -594,7 +634,7 @@ */ ++eventsInMessage; common->currentValues.proximity = - (event->value > 0 ? 1 : 0); + PROXIMITY(event->value) ? 1 : 0; } break; } @@ -649,7 +689,7 @@ */ ++eventsInMessage; common->currentValues.proximity = - (event->value > 0 ? 1 : 0); + PROXIMITY (event->value) ? 1 : 0; } break; } @@ -711,24 +751,36 @@ case BTN_TOUCH: { ++eventsInMessage; - common->currentValues.button |= - (event->value > 0 ? 1 : 0) * BUTTONS_EVENT_TOUCH; + if (event->value) + common->currentValues.button |= + BUTTONS_EVENT_TOUCH; + else + common->currentValues.button &= + ~BUTTONS_EVENT_TOUCH; } break; case BTN_STYLUS: { ++eventsInMessage; - common->currentValues.button |= - (event->value > 0 ? 1 : 0) * BUTTONS_EVENT_STYLUS; + if (event->value) + common->currentValues.button |= + BUTTONS_EVENT_STYLUS; + else + common->currentValues.button &= + ~BUTTONS_EVENT_STYLUS; } break; case BTN_STYLUS2: { ++eventsInMessage; - common->currentValues.button |= - (event->value > 0 ? 1 : 0) * BUTTONS_EVENT_STYLUS2; + if (event->value) + common->currentValues.button |= + BUTTONS_EVENT_STYLUS2; + else + common->currentValues.button &= + ~BUTTONS_EVENT_STYLUS2; } break; @@ -742,40 +794,60 @@ case BTN_LEFT: { ++eventsInMessage; - common->currentValues.button |= - (event->value > 0 ? 1 : 0) * BUTTONS_EVENT_MOUSE_LEFT; + if (event->value) + common->currentValues.button |= + BUTTONS_EVENT_MOUSE_LEFT; + else + common->currentValues.button &= + ~BUTTONS_EVENT_MOUSE_LEFT; } break; case BTN_MIDDLE: { ++eventsInMessage; - common->currentValues.button |= - (event->value > 0 ? 1 : 0) * BUTTONS_EVENT_MOUSE_MIDDLE; + if (event->value) + common->currentValues.button |= + BUTTONS_EVENT_MOUSE_MIDDLE; + else + common->currentValues.button &= + ~BUTTONS_EVENT_MOUSE_MIDDLE; } break; case BTN_RIGHT: { ++eventsInMessage; - common->currentValues.button |= - (event->value > 0 ? 1 : 0) * BUTTONS_EVENT_MOUSE_RIGHT; + if (event->value) + common->currentValues.button |= + BUTTONS_EVENT_MOUSE_RIGHT; + else + common->currentValues.button &= + ~BUTTONS_EVENT_MOUSE_RIGHT; } break; case BTN_SIDE: { ++eventsInMessage; - common->currentValues.button |= - (event->value > 0 ? 1 : 0) * BUTTONS_EVENT_SIDE_BTN; + if (event->value) + common->currentValues.button |= + BUTTONS_EVENT_SIDE_BTN; + else + common->currentValues.button &= + ~BUTTONS_EVENT_SIDE_BTN; } break; case BTN_EXTRA: { ++eventsInMessage; - common->currentValues.button |= - (event->value > 0 ? 1 : 0) * BUTTONS_EVENT_EXTRA_BTN; + if (event->value) + common->currentValues.button |= + BUTTONS_EVENT_EXTRA_BTN; + else + common->currentValues.button &= + ~BUTTONS_EVENT_EXTRA_BTN; } break; @@ -842,45 +914,28 @@ * Also, we only do the comparison IFF a threshold has been set * for that given dimension. */ - if ((device->xThreshold > 1 && - ABS(common->currentValues.x - common->previousValues.x) - <= device->xThreshold) || - (device->yThreshold > 1 && - ABS(common->currentValues.y - common->previousValues.y) - <= device->yThreshold) || - (device->zThreshold > 1 && - ABS(common->currentValues.z - common->previousValues.z) - <= device->zThreshold) || - (device->xTiltThreshold > 1 && - ABS(common->currentValues.xTilt - common->previousValues.xTilt) - <= device->xTiltThreshold) || - (device->yTiltThreshold > 1 && - ABS(common->currentValues.yTilt - common->previousValues.yTilt) - <= device->yTiltThreshold)) + if (ABS(common->currentValues.x - common->previousValues.x) + <= device->xThreshold && + ABS(common->currentValues.y - common->previousValues.y) + <= device->yThreshold && + ABS(common->currentValues.z - common->previousValues.z) + <= device->zThreshold && + ABS(common->currentValues.xTilt - common->previousValues.xTilt) + <= device->xTiltThreshold && + ABS(common->currentValues.yTilt - common->previousValues.yTilt) + <= device->yTiltThreshold && + common->currentValues.proximity == + common->previousValues.proximity && + common->currentValues.button == + common->previousValues.button && + common->currentValues.macroKey == + common->previousValues.macroKey) { DBG(10, ErrorF("Event Filtered Out by Thresholds\n")); continue; } /* - * If this report somehow has exactly the same readings as the - * previous report for all dimensions, throw the report out. - */ - if ((common->currentValues.x == common->previousValues.x) && - (common->currentValues.y == common->previousValues.y) && - (common->currentValues.z == common->previousValues.z) && - (common->currentValues.proximity == - common->previousValues.proximity) && - (common->currentValues.button == - common->previousValues.button) && - (common->currentValues.macroKey == - common->previousValues.macroKey)) - { - DBG(10, ErrorF("Event Filtered Out\n")); - continue; - } - - /* * We have three different methods by which we report pressure, Z. * One is to use linear values from 0 to common->zCapacity. The * other two, SOFT_SMOOTH and HARD_SMOOTH, use different @@ -1556,7 +1611,9 @@ if (InitValuatorClassDeviceStruct(pAiptek, numAxes, +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 xf86GetMotionEvents, +#endif local->history_size, ((device->flags & ABSOLUTE_FLAG) ? Absolute : Relative) | OutOfProximity ) == FALSE) @@ -1591,12 +1648,11 @@ case DEVICE_OFF: { - DBG(1, ErrorF("xf86AiptekProc request=%s\n", - (requestCode == DEVICE_CLOSE) ? "CLOSE" : "OFF")); + DBG(1, ErrorF("xf86AiptekProc request=OFF\n")); if (local->fd >= 0) { - xf86AiptekClose(local); xf86RemoveEnabledDevice(local); + xf86AiptekClose(local); } pAiptek->public.on = FALSE; } @@ -1604,8 +1660,7 @@ case DEVICE_CLOSE: { - DBG(1, ErrorF("xf86AiptekProc request=%s\n", - (requestCode == DEVICE_CLOSE) ? "CLOSE" : "OFF")); + DBG(1, ErrorF("xf86AiptekProc request=CLOSE\n")); xf86AiptekClose(local); } break; @@ -1809,8 +1864,10 @@ device->common = common; /* Common info pointer */ /* Record of the event currently being read of the queue */ - common->currentValues.eventType = 0; /* Device event is for, e.g., */ - /* STYLUS, RUBBER, CURSOR */ + common->currentValues.eventType = STYLUS_ID; + /* Device event is for, e.g., */ + /* STYLUS, RUBBER, CURSOR */ + /* Starting with stylus as default */ common->currentValues.x = 0; /* X coordinate */ common->currentValues.y = 0; /* Y coordinate */ common->currentValues.z = 0; /* Z (pressure) */ @@ -2443,7 +2500,7 @@ MODINFOSTRING1, MODINFOSTRING2, XORG_VERSION_CURRENT, - 1, 1, 0, + PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL, ABI_CLASS_XINPUT, ABI_XINPUT_VERSION, MOD_CLASS_XINPUT, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-aiptek-X11R7.1-1.0.1/src/xf86Aiptek.h new/xf86-input-aiptek-1.2.0/src/xf86Aiptek.h --- old/xf86-input-aiptek-X11R7.1-1.0.1/src/xf86Aiptek.h 2006-04-07 18:50:50.000000000 +0200 +++ new/xf86-input-aiptek-1.2.0/src/xf86Aiptek.h 2009-02-04 01:45:10.000000000 +0100 @@ -34,7 +34,7 @@ * TORTIOUS ACTIONS, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XdotOrg: driver/xf86-input-aiptek/src/xf86Aiptek.h,v 1.5 2006/04/07 16:50:50 ajax Exp $ */ +/* $XdotOrg: driver/xf86-input-aiptek/src/xf86Aiptek.h,v 1.4 2005/07/13 02:18:12 kem Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/input/aiptek/xf86Aiptek.h,v 1.2 2003/11/03 05:36:32 tsi Exp $ */ #ifndef _AIPTEK_H_ @@ -56,7 +56,7 @@ # endif #endif -#include <xf86Version.h> +#include <xorgVersion.h> #ifndef XFree86LOADER # include <unistd.h> @@ -66,8 +66,6 @@ #include <misc.h> #include <xf86.h> -#define NEED_XF86_TYPES - #if !defined(DGUX) # include <xisb.h> #endif @@ -98,6 +96,12 @@ #define XI_CURSOR "CURSOR" /* X device name for the cursor */ #define XI_ERASER "ERASER" /* X device name for the eraser */ +/*********************************************************************** + * We ship the proximity bit through EV_MISC, ORed with information + * as to whether report came from the stylus or tablet mouse. + */ +#define PROXIMITY(flags) ((flags) & 0x0F) + /* macro from counts/inch to counts/meter */ #define LPI2CPM(res) (res * 1000 / 25.4) ++++++ xf86-input-elographics-1.2.2.tar.bz2 -> xf86-input-elographics-1.2.3.tar.bz2 ++++++ ++++ 5005 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-elographics-1.2.2/ChangeLog new/xf86-input-elographics-1.2.3/ChangeLog --- old/xf86-input-elographics-1.2.2/ChangeLog 2008-06-10 22:03:04.000000000 +0200 +++ new/xf86-input-elographics-1.2.3/ChangeLog 2008-10-21 07:09:40.000000000 +0200 @@ -1,3 +1,86 @@ +commit 37cd09e99c7f5fa4ce7511b8ed171a3ae130300f +Author: Peter Hutterer <peter.hutterer@redhat.com> +Date: Tue Oct 21 15:33:43 2008 +1030 + + elographics 1.2.3 + +commit 117a54598043df6497fbc1ae4f047cc248441072 +Author: Peter Hutterer <peter.hutterer@redhat.com> +Date: Tue Oct 14 10:22:29 2008 +1030 + + Add special handling for Sunit dSeries. RH #445193 + + This model does not reply to queries about touchscreen identification. After + opening the fd, we can skip right to enabling the device. + + Red Hat Bug <https://bugzilla.redhat.com/show_bug.cgi?id=445193> + +commit d0aa1083c0130861a2c78509b72847fc3f7ee5f3 +Author: Peter Hutterer <peter.hutterer@redhat.com> +Date: Tue Oct 14 10:11:11 2008 +1030 + + Add Option "Model" to supported list of options. + + Some touchscreens supported by this driver need special handling, hence the + explicit specification of the model. Note that this commit does not actually + do anything with the information, it just sets some internal state. + + Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com> + +commit bf0e1bf915cb679bd425712300f5dc5c80ed190a +Author: Peter Hutterer <peter.hutterer@redhat.com> +Date: Thu Aug 14 15:34:51 2008 +0930 + + Fix build, xf86Version.h -> xorgVersion.h + +commit 038798931482575adb411129f016e207034e2dee +Author: William Brack <wbrack@mmm.com.hk> +Date: Wed Jun 18 13:42:44 2008 +0930 + + Don't convert coordinates for servers 1.4 and above. + + These servers do the coordinate conversion themselves, so no need to do it in + the driver. + + Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au> + +commit c73c44d8f68448737695a112b2e9d15b785ade2f +Author: Peter Hutterer <peter@cs.unisa.edu.au> +Date: Tue Jun 17 14:11:58 2008 +0930 + + Remove RCS tags. + +commit a932fd4174ae4bf511e1418055f1470ba2860b43 +Author: Peter Hutterer <peter@cs.unisa.edu.au> +Date: Tue Jun 17 14:18:31 2008 +0930 + + Remove XFREE_V4 define and all code that expects it to be unset. + + If you're still not running something more recent than X11 3, then you have + other issues anyway. + +commit b489fb3c176f9f0c3a98e3145b72fd0d9a6587b6 +Author: Peter Hutterer <peter@cs.unisa.edu.au> +Date: Thu Jun 12 21:56:04 2008 +0930 + + Remove trailing whitespaces. + +commit 086e9d2056c8fbb5138b54b95f4559acf8f0f158 +Author: William M. Brack <wbrack@mmm.com.hk> +Date: Tue Jun 17 09:00:32 2008 +0930 + + WaitForInput before trying to xf86EloGetPacket. #14109 + + Followup to 72408c2404246b9cb4698bd45be439be8ced3c23. + + This patch isn't perfect yet, usage of O_NONBLOCK would be preferred and some + better error handling for incomplete packages, but at least it's less broken + than without this patch. + + Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au> + + X.Org Bug 14109 <http://bugs.freedesktop.org/show_bug.cgi?id=14109> + commit 929b72352110b8d5dcdf74bec21694d8de9f948c Author: Julien Cristau <jcristau@debian.org> Date: Tue Jun 10 22:01:08 2008 +0200 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-elographics-1.2.2/configure.ac new/xf86-input-elographics-1.2.3/configure.ac --- old/xf86-input-elographics-1.2.2/configure.ac 2008-06-10 22:01:01.000000000 +0200 +++ new/xf86-input-elographics-1.2.3/configure.ac 2008-10-21 07:03:37.000000000 +0200 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-elographics], - 1.2.2, + 1.2.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-elographics) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-elographics-1.2.2/man/elographics.man new/xf86-input-elographics-1.2.3/man/elographics.man --- old/xf86-input-elographics-1.2.2/man/elographics.man 2007-01-29 14:33:04.000000000 +0100 +++ new/xf86-input-elographics-1.2.3/man/elographics.man 2008-10-14 01:47:31.000000000 +0200 @@ -1,4 +1,3 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/elographics/elographics.man,v 1.1 2001/01/24 00:06:36 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH elographics __drivermansuffix__ __vendorversion__ @@ -72,6 +71,9 @@ .TP .BI "Option \*qReportDelay\*q \*q" integer \*q Delay between report packets. Default: 1 (10ms). +.TP +.BI "Option \*qModel\*q \*q" string \*q +The touchscreen model. Default: unset. Supported models: "Sunit dSeries". .SH "SEE ALSO" __xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__). .SH AUTHORS diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-elographics-1.2.2/src/xf86Elo.c new/xf86-input-elographics-1.2.3/src/xf86Elo.c --- old/xf86-input-elographics-1.2.2/src/xf86Elo.c 2008-06-10 21:47:13.000000000 +0200 +++ new/xf86-input-elographics-1.2.3/src/xf86Elo.c 2008-10-14 01:52:10.000000000 +0200 @@ -1,7 +1,6 @@ -/* $XConsortium: xf86Elo.c /main/13 1996/10/25 14:11:31 kaleb $ */ /* * Copyright 1995, 1999 by Patrick Lecoanet, France. <lecoanet@cena.dgac.fr> - * + * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that * the above copyright notice appear in all copies and that both that @@ -10,8 +9,8 @@ * advertising or publicity pertaining to distribution of the software without * specific, written prior permission. Patrick Lecoanet makes no * representations about the suitability of this software for any purpose. It - * is provided "as is" without express or implied warranty. - * + * is provided "as is" without express or implied warranty. + * * PATRICK LECOANET DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO * EVENT SHALL PATRICK LECOANET BE LIABLE FOR ANY SPECIAL, INDIRECT OR @@ -22,8 +21,6 @@ * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/elographics/xf86Elo.c,v 1.13 2001/04/01 14:00:13 tsi Exp $ */ - /* ******************************************************************************* ******************************************************************************* @@ -34,7 +31,7 @@ * SUPPORT FOR E281-2310 and compatible controllers added with help of: * 1996/01/17 Juergen P. Meier (jpm@mailserv.rz.fh-muenchen.de) and * 1998/03/25 G.Felkel@edelmann.de - * + * * The E281-2310 is a somewhat lobotomized 2210. * It does not support the c,g,h,k,l,p,q,s and t commands. * Especially the P command, which is used to check the baud rate. @@ -50,12 +47,8 @@ #include "config.h" #endif -#include "xf86Version.h" -#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(3,9,0,0,0) -#define XFREE86_V4 -#endif +#include "xorgVersion.h" -#ifdef XFREE86_V4 #ifndef XFree86LOADER #include <unistd.h> @@ -72,134 +65,22 @@ #include "xf86Module.h" #endif -#else /* XFREE86_V4 */ - -#include <X11/Xos.h> -#include <signal.h> -#include <stdio.h> - -#define NEED_EVENTS -#include <X11/X.h> -#include <X11/Xproto.h> -#include "inputstr.h" -#include "scrnintstr.h" -#include <X11/extensions/XI.h> -#include <X11/extensions/XIproto.h> - -#if defined(sun) && !defined(i386) -#include <errno.h> -#include <termio.h> -#include <fcntl.h> -#include <ctype.h> - -#include "extio.h" -#else /* defined(sun) && !defined(i386) */ -#include "compiler.h" - -#include "xf86.h" -#include "xf86Procs.h" -#include "xf86_OSlib.h" -#include "xf86_Config.h" -#include "xf86Xinput.h" -#endif /* defined(sun) && !defined(i386) */ - -#if !defined(sun) || defined(i386) -#include "os.h" -#include "osdep.h" -#include "exevents.h" - -#include "extnsionst.h" -#include "extinit.h" -#endif /* !defined(sun) || defined(i386) */ - -#endif /* XFREE86_V4 */ - - -#ifndef XFREE86_V4 -#if !defined(sun) || defined(i386) -/* - *************************************************************************** - * - * Configuration descriptor. - * - *************************************************************************** +/** + * models to be treated specially. */ +#define MODEL_UNKNOWN -1 +#define MODEL_SUNIT_D 1 -#define PORT 1 -#define ELO_DEVICE_NAME 2 -#define SCREEN_NO 3 -#define UNTOUCH_DELAY 4 -#define REPORT_DELAY 5 -#define MAXX 6 -#define MAXY 7 -#define MINX 8 -#define MINY 9 -#define DEBUG_LEVEL 10 -#define HISTORY_SIZE 11 -#define LINK_SPEED 12 -#define ALWAYS_CORE 13 -#define SWAP_AXES 14 -#define PORTRAIT_MODE 15 - -static SymTabRec EloTab[] = { - { ENDSUBSECTION, "endsubsection" }, - { PORT, "port" }, - { ELO_DEVICE_NAME, "devicename" }, - { SCREEN_NO, "screenno" }, - { UNTOUCH_DELAY, "untouchdelay" }, - { REPORT_DELAY, "reportdelay"}, - { MAXX, "maximumxposition" }, - { MAXY, "maximumyposition" }, - { MINX, "minimumxposition" }, - { MINY, "minimumyposition" }, - { DEBUG_LEVEL, "debuglevel" }, - { HISTORY_SIZE, "historysize" }, - { LINK_SPEED, "linkspeed" }, - { ALWAYS_CORE, "alwayscore" }, - { SWAP_AXES, "swapxy" }, - { PORTRAIT_MODE, "portraitmode" }, - { -1, "" }, -}; - -#define LS300 1 -#define LS1200 2 -#define LS2400 3 -#define LS9600 4 -#define LS19200 5 - -static SymTabRec LinkSpeedTab[] = { - { LS300, "b300" }, - { LS1200, "b1200" }, - { LS2400, "b2400" }, - { LS9600, "b9600" }, - { LS19200, "b19200" } -}; -#endif /* !defined(sun) || defined(i386) */ - -/* - * This struct connects a line speed with - * a compatible motion packet delay. The - * driver will attempt to enforce a correct - * delay (according to this table) in order to - * avoid losing data in the touchscreen controller. - * LinkSpeedValues should be kept in sync with - * LinkSpeedTab. - */ typedef struct { - int speed; - int delay; -} LinkParameterStruct; - -static LinkParameterStruct LinkSpeedValues[] = { - { B300, 32 }, - { B1200, 8 }, - { B2400, 4 }, - { B9600, 1 }, - { B19200, 0 } -}; -#endif /* XFREE86_V4 */ - + int type; + char *name; +} Model; +static Model SupportedModels[] = +{ + {MODEL_SUNIT_D, "Sunit dSeries"}, /* sunit dSeries models don't reply to queries */ + {MODEL_UNKNOWN, NULL} +}; /* *************************************************************************** * @@ -287,7 +168,6 @@ #define DBG(lvl, f) #endif -#ifdef XFREE86_V4 #undef SYSCALL #undef read #undef write @@ -296,7 +176,6 @@ #define read(fd, ptr, num) xf86ReadSerial(fd, ptr, num) #define write(fd, ptr, num) xf86WriteSerial(fd, ptr, num) #define close(fd) xf86CloseSerial(fd) -#endif /* @@ -314,9 +193,6 @@ int max_y; /* Maximum y */ int untouch_delay; /* Delay before reporting an untouch (in ms) */ int report_delay; /* Delay between touch report packets */ -#ifndef XFREE86_V4 - int link_speed; /* Speed of the RS232 link connecting the ts. */ -#endif int screen_no; /* Screen associated with the device */ int screen_width; /* Width of the associated X screen */ int screen_height; /* Height of the screen */ @@ -326,264 +202,9 @@ int packet_buf_p; /* Assembly buffer pointer */ int swap_axes; /* Swap X an Y axes if != 0 */ unsigned char packet_buf[ELO_PACKET_SIZE]; /* Assembly buffer */ + int model; /* one of MODEL_... */ } EloPrivateRec, *EloPrivatePtr; - -#ifndef XFREE86_V4 -#if !defined(sun) || defined(i386) -/* - *************************************************************************** - * - * xf86EloConfig -- - * Configure the driver from the configuration data. - * - *************************************************************************** - */ -static Bool -xf86EloConfig(LocalDevicePtr *array, - int inx, - int max, - LexPtr val) -{ - LocalDevicePtr local = array[inx]; - EloPrivatePtr priv = (EloPrivatePtr)(local->private); - int token; - int portrait=0; - - while ((token = xf86GetToken(EloTab)) != ENDSUBSECTION) { - switch(token) { - - case PORT: - if (xf86GetToken(NULL) != STRING) { - xf86ConfigError("Elographics input port expected"); - } - priv->input_dev = strdup(val->str); - if (xf86Verbose) { - ErrorF("%s Elographics input port: %s\n", - XCONFIG_GIVEN, priv->input_dev); - } - break; - - case ELO_DEVICE_NAME: - if (xf86GetToken(NULL) != STRING) { - xf86ConfigError("Elographics device name expected"); - } - local->name = strdup(val->str); - if (xf86Verbose) { - ErrorF("%s Elographics X device name: %s\n", - XCONFIG_GIVEN, local->name); - } - break; - - case SCREEN_NO: - if (xf86GetToken(NULL) != NUMBER) { - xf86ConfigError("Elographics screen number expected"); - } - priv->screen_no = val->num; - if (xf86Verbose) { - ErrorF("%s Elographics associated screen: %d\n", - XCONFIG_GIVEN, priv->screen_no); - } - break; - - case UNTOUCH_DELAY: - if (xf86GetToken(NULL) != NUMBER) { - xf86ConfigError("Elographics untouch delay expected"); - } - priv->untouch_delay = val->num; - if (xf86Verbose) { - ErrorF("%s Elographics untouch delay: %d ms\n", - XCONFIG_GIVEN, priv->untouch_delay*10); - } - break; - - case REPORT_DELAY: - if (xf86GetToken(NULL) != NUMBER) { - xf86ConfigError("Elographics report delay expected"); - } - priv->report_delay = val->num; - if (xf86Verbose) { - ErrorF("%s Elographics report delay: %d ms\n", - XCONFIG_GIVEN, priv->report_delay*10); - } - break; - - case LINK_SPEED: - { - int ltoken = xf86GetToken(LinkSpeedTab); - if (ltoken == EOF || - ltoken == STRING || - ltoken == NUMBER) { - xf86ConfigError("Elographics link speed expected"); - } - priv->link_speed = LinkSpeedValues[ltoken-1].speed; - if (xf86Verbose) { - ErrorF("%s Elographics link speed: %s bps\n", - XCONFIG_GIVEN, (LinkSpeedTab[ltoken-1].name)+1); - } - } - break; - - case MAXX: - if (xf86GetToken(NULL) != NUMBER) { - xf86ConfigError("Elographics maximum x position expected"); - } - priv->max_x = val->num; - if (xf86Verbose) { - ErrorF("%s Elographics maximum x position: %d\n", - XCONFIG_GIVEN, priv->max_x); - } - break; - - case MAXY: - if (xf86GetToken(NULL) != NUMBER) { - xf86ConfigError("Elographics maximum y position expected"); - } - priv->max_y = val->num; - if (xf86Verbose) { - ErrorF("%s Elographics maximum y position: %d\n", - XCONFIG_GIVEN, priv->max_y); - } - break; - - case MINX: - if (xf86GetToken(NULL) != NUMBER) { - xf86ConfigError("Elographics minimum x position expected"); - } - priv->min_x = val->num; - if (xf86Verbose) { - ErrorF("%s Elographics minimum x position: %d\n", - XCONFIG_GIVEN, priv->min_x); - } - break; - - case MINY: - if (xf86GetToken(NULL) != NUMBER) { - xf86ConfigError("Elographics minimum y position expected"); - } - priv->min_y = val->num; - if (xf86Verbose) { - ErrorF("%s Elographics minimum y position: %d\n", - XCONFIG_GIVEN, priv->min_y); - } - break; - - case DEBUG_LEVEL: - if (xf86GetToken(NULL) != NUMBER) { - xf86ConfigError("Elographics driver debug level expected"); - } - debug_level = val->num; - if (xf86Verbose) { -#if DEBUG - ErrorF("%s Elographics debug level sets to %d\n", XCONFIG_GIVEN, - debug_level); -#else - ErrorF("%s Elographics debug not available\n", - XCONFIG_GIVEN, debug_level); -#endif - } - break; - - case HISTORY_SIZE: - if (xf86GetToken(NULL) != NUMBER) { - xf86ConfigError("Elographics motion history size expected"); - } - local->history_size = val->num; - if (xf86Verbose) { - ErrorF("%s EloGraphics motion history size is %d\n", XCONFIG_GIVEN, - local->history_size); - } - break; - - case ALWAYS_CORE: - xf86AlwaysCore(local, TRUE); - if (xf86Verbose) { - ErrorF("%s Elographics device will always stays core pointer\n", - XCONFIG_GIVEN); - } - break; - - case SWAP_AXES: - priv->swap_axes = 1; - if (xf86Verbose) { - ErrorF("%s Elographics device will work with X and Y axes swapped\n", - XCONFIG_GIVEN); - } - break; - - case PORTRAIT_MODE: - if (xf86GetToken(NULL) != STRING) { - portrait_mode_err: - xf86ConfigError("Elographics portrait mode should be: Portrait, Landscape or PortraitCCW"); - } - if (strcmp(val->str, "portrait") == 0) { - portrait = 1; - } - else if (strcmp(val->str, "portraitccw") == 0) { - portrait = -1; - } - else if (strcmp(val->str, "landscape") != 0) { - goto portrait_mode_err; - } - if (xf86Verbose) { - ErrorF("%s Elographics device will work in %s mode\n", - XCONFIG_GIVEN, val->str); - } - break; - - case EOF: - FatalError("Unexpected EOF (missing EndSubSection)"); - break; - - default: - xf86ConfigError("Elographics subsection keyword expected"); - break; - } - } - - if (priv->max_x - priv->min_x <= 0) { - ErrorF("%s Elographics: reverse x mode (minimum x position >= maximum x position)\n", - XCONFIG_GIVEN); - } - if (priv->max_y - priv->min_y <= 0) { - ErrorF("%s Elographics: reverse y mode (minimum y position >= maximum y position)\n", - XCONFIG_GIVEN); - } - /* - * The portrait adjustments need to be done after axis reversing - * and axes swap. This way the driver can cope with deffective - * hardware and still do the correct processing depending on the - * actual display orientation. - */ - if (portrait == 1) { - /* - * Portrait Clockwise: reverse Y axis and exchange X and Y. - */ - int tmp; - tmp = priv->min_y; - priv->min_y = priv->max_y; - priv->max_y = tmp; - priv->swap_axes = (priv->swap_axes==0) ? 1 : 0; - } - else if (portrait == -1) { - /* - * Portrait Counter Clockwise: reverse X axis and exchange X and Y. - */ - int tmp; - tmp = priv->min_x; - priv->min_x = priv->max_x; - priv->max_x = tmp; - priv->swap_axes = (priv->swap_axes==0) ? 1 : 0; - } - - DBG(2, ErrorF("xf86EloConfig port name=%s\n", priv->input_dev)) - - return Success; -} -#endif -#endif - - /* *************************************************************************** * @@ -620,7 +241,7 @@ DBG(4, ErrorF("Entering xf86EloGetPacket with checksum == %d and buffer_p == %d\n", *checksum, *buffer_p)); - + /* * Try to read enough bytes to fill up the packet buffer. */ @@ -638,7 +259,7 @@ return !Success; } DBG(4, ErrorF("Read %d bytes\n", num_bytes)); - + while (num_bytes) { /* * Sync with the start of a packet. @@ -678,7 +299,7 @@ ErrorF("Checksum error on Elographics touchscreen link\n"); return !Success; } - + /* * Valid packet received report it. */ @@ -716,7 +337,7 @@ int width = priv->max_x - priv->min_x; int height = priv->max_y - priv->min_y; int input_x, input_y; - + if (first != 0 || num != 2) { return FALSE; } @@ -738,21 +359,19 @@ *y = (priv->screen_height - (priv->screen_height * (input_y - priv->min_y)) / height); - /* + /* * MHALAS: Based on the description in xf86XInputSetScreen * this code must be called from ReadInput BEFORE any events * are posted but this method is called FROM xf86PostMotionEvent * Therefore I have moved this method into xf86EloReadInput */ -#ifdef XFREE86_V4 /* * Need to check if still on the correct screen. * This call is here so that this work can be done after * calib and before posting the event. */ /* xf86XInputSetScreen(local, priv->screen_no, *x, *y); */ -#endif - + DBG(3, ErrorF("EloConvert: Screen(%d) - x(%d), y(%d)\n", priv->screen_no, *x, *y)); return TRUE; @@ -790,7 +409,7 @@ EloPrivatePtr priv = (EloPrivatePtr)(local->private); int cur_x, cur_y; int state; -#ifdef XFREE86_V4 +#if GET_ABI_MAJOR(XINPUT_ABI) == 0 int first = 0; /* since convert is expecting 0 */ int num = 2; /* since convert is expecting 0 */ int v0 = 0; /* = cur_x - based on the debug output this is what v0 is */ @@ -799,18 +418,19 @@ int v3 = 0; /* not used in convert */ int v4 = 0; /* not used in convert */ int v5 = 0; /* not used in convert */ - int x; /* output */ - int y; /* output */ #endif DBG(4, ErrorF("Entering ReadInput\n")); /* * Try to get a packet. */ - while (xf86EloGetPacket(priv->packet_buf, + while (xf86WaitForInput(local->fd, ELO_MAX_WAIT/100) > 0) { + if(xf86EloGetPacket(priv->packet_buf, &priv->packet_buf_p, &priv->checksum, - local->fd) == Success) { + local->fd) != Success) + break; + /* * Process only ELO_TOUCHs here. */ @@ -821,31 +441,30 @@ cur_x = WORD_ASSEMBLY(priv->packet_buf[3], priv->packet_buf[4]); cur_y = WORD_ASSEMBLY(priv->packet_buf[5], priv->packet_buf[6]); state = priv->packet_buf[2] & 0x07; - - /* +#if GET_ABI_MAJOR(XINPUT_ABI) == 0 + /* * MHALAS: Based on the description in xf86XInputSetScreen * this code must be called from ReadInput BEFORE any events * are posted but this method is called FROM xf86PostMotionEvent * Therefore I have moved this method into xf86EloReadInput */ -#ifdef XFREE86_V4 /* * Need to check if still on the correct screen. * This call is here so that this work can be done after * calib and before posting the event. */ - DBG(3, ErrorF("EloConvert Before Fix: Screen(%d) - x(%d), y(%d)\n", priv->screen_no, x, y)); + DBG(3, ErrorF("EloConvert Before Fix: Screen(%d) - x(%d), y(%d)\n", priv->screen_no, cur_x, cur_y)); v0 = cur_x; /* based on the debug output this is what v0 is */ - v1 = cur_y; /* based on the debug output this is what v0 is */ - /* + v1 = cur_y; /* based on the debug output this is what v1 is */ + /* * Use the conversion method to send correct coordinates * since it contains all necessary logic */ - xf86EloConvert(local, first, num, v0, v1, v2, v3, v4, v5, &x, &y); - DBG(3, ErrorF("EloConvert During Fix: Screen(%d) - x(%d), y(%d)\n", priv->screen_no, x, y)); - xf86XInputSetScreen(local, priv->screen_no, x, y); - DBG(3, ErrorF("EloConvert After Fix: Screen(%d) - x(%d), y(%d)\n", priv->screen_no, x, y)); + xf86EloConvert(local, first, num, v0, v1, v2, v3, v4, v5, &cur_x, &cur_y); + DBG(3, ErrorF("EloConvert During Fix: Screen(%d) - x(%d), y(%d)\n", priv->screen_no, cur_x, cur_y)); + xf86XInputSetScreen(local, priv->screen_no, cur_x, cur_y); + DBG(3, ErrorF("EloConvert After Fix: Screen(%d) - x(%d), y(%d)\n", priv->screen_no, cur_x, cur_y)); #endif /* @@ -855,13 +474,13 @@ * location has changed as DIX assumes this. This is why we always * emit a motion, regardless of the kind of packet processed. */ - xf86PostMotionEvent(local->dev, TRUE, 0, 2, x, y); + xf86PostMotionEvent(local->dev, TRUE, 0, 2, cur_x, cur_y); /* * Emit a button press or release. */ if (state == ELO_PRESS || state == ELO_RELEASE) { - xf86PostButtonEvent(local->dev, TRUE, 1, state == ELO_PRESS, 0, 2, x, y); + xf86PostButtonEvent(local->dev, TRUE, 1, state == ELO_PRESS, 0, 2, cur_x, cur_y); } DBG(3, ErrorF("TouchScreen: x(%d), y(%d), %s\n", @@ -925,24 +544,6 @@ * *************************************************************************** */ -#ifndef XFREE86_V4 -static int -xf86WaitForInput(int fd, - int timeout) -{ - fd_set readfds; - struct timeval to; - int r; - - FD_ZERO(&readfds); - FD_SET(fd, &readfds); - to.tv_sec = 0; - to.tv_usec = timeout; - - SYSCALL(r = select(FD_SETSIZE, &readfds, NULL, NULL, &to)); - return r; -} -#endif static Bool xf86EloWaitReply(unsigned char type, @@ -958,7 +559,7 @@ i = ELO_MAX_TRIALS; do { ok = !Success; - + /* * Wait half a second for the reply. The fuse counts down each * timeout and each wrong packet. @@ -979,7 +580,7 @@ else { DBG(3, ErrorF("No answer from link : %d\n", result)); } - + if (result == 0) { i--; } @@ -1041,7 +642,7 @@ int fd) { Bool ok; - + if (xf86EloSendPacket(request, fd) == Success) { ok = xf86EloWaitReply(toupper(request[1]), reply, fd); if (ok == Success) { @@ -1090,7 +691,6 @@ xf86EloPrintIdent(unsigned char *packet, EloPrivatePtr priv) { -#ifdef XFREE86_V4 xf86Msg(X_PROBED, "Elographics touchscreen is a "); switch(packet[2]) { case '0': @@ -1128,7 +728,7 @@ xf86Msg(X_NONE, "E271-2200"); } xf86Msg(X_NONE, ", firmware revision %d.%d.\n", packet[6], packet[5]); - + if (packet[4]) { xf86Msg(X_PROBED, " Additional features:\n"); if (packet[4] & 0x10) { @@ -1145,62 +745,6 @@ } xf86Msg(X_NONE, "\n"); } -#else - ErrorF("%s Elographics touchscreen is a ", XCONFIG_PROBED); - switch(packet[2]) { - case '0': - ErrorF("AccuTouch"); - break; - case '1': - ErrorF("DuraTouch"); - break; - case '2': - ErrorF("Intellitouch"); - break; - } - ErrorF(", connected through a "); - switch(packet[3]) { - case '0': - ErrorF("serial link.\n"); - break; - case '1': - ErrorF("PC-Bus port.\n"); - break; - case '2': - ErrorF("Micro Channel port.\n"); - break; - } - ErrorF("%s The controller is a model ", XCONFIG_PROBED); - if (packet[8] & 1) { - if (priv->is_a_2310) { - ErrorF("E281-2310"); - } - else { - ErrorF("E271-2210"); - } - } - else { - ErrorF("E271-2200"); - } - ErrorF(", firmware revision %d.%d.\n", packet[6], packet[5]); - - if (packet[4]) { - ErrorF("%s Additional features:\n", XCONFIG_PROBED); - if (packet[4] & 0x10) { - ErrorF("%s External A/D converter\n", XCONFIG_PROBED); - } - if (packet[4] & 0x20) { - ErrorF("%s 32Ko RAM\n", XCONFIG_PROBED); - } - if (packet[4] & 0x40) { - ErrorF("%s RAM onboard\n", XCONFIG_PROBED); - } - if (packet[4] & 0x80) { - ErrorF("%s Z axis active\n", XCONFIG_PROBED); - } - ErrorF("\n"); - } -#endif } @@ -1241,75 +785,8 @@ case DEVICE_INIT: { -#if defined(sun) && !defined(i386) && !defined(XFREE86_V4) - char *name = (char *) getenv("ELO_DEV"); - char *calib = (char *) getenv("ELO_CALIB"); - char *speed = (char *) getenv("ELO_SPEED"); - char *delays = (char *) getenv("ELO_DELAYS"); -#endif - DBG(2, ErrorF("Elographics touchscreen init...\n")); -#if defined(sun) && !defined(i386) && !defined(XFREE86_V4) - if (name) { - priv->input_dev = strdup(name); - ErrorF("Elographics touchscreen port changed to '%s'\n", - priv->input_dev); - } - if (calib) { - if (sscanf(calib, "%d %d %d %d", - &priv->min_x, &priv->max_x, - &priv->min_y, &priv->max_y) != 4) { - ErrorF("Incorrect syntax in ELO_CALIB\n"); - return !Success; - } - else if (priv->max_x <= priv->min_x || - priv->max_y <= priv->min_y) { - ErrorF("Bogus calibration data in ELO_CALIB\n"); - return !Success; - } - else { - ErrorF("Calibration will be done with:\n"); - ErrorF("x_min=%d, x_max=%d, y_min=%d, y_max=%d\n", - priv->min_x, priv->max_x, priv->min_y, priv->max_y); - } - } - if (speed) { - /* These tests should be kept in sync with the LinkSpeedValues - * array. */ - if (strcmp(speed, "B9600") == 0) { - priv->link_speed = B9600; - } - else if (strcmp(speed, "B19200") == 0) { - priv->link_speed = B19200; - } - else if (strcmp(speed, "B2400") == 0) { - priv->link_speed = B2400; - } - else if (strcmp(speed, "B1200") == 0) { - priv->link_speed = B1200; - } - else if (strcmp(speed, "B300") == 0) { - priv->link_speed = B300; - } - else { - ErrorF("Bogus speed value in ELO_SPEED\n"); - return !Success; - } - } - if (delays) { - if (sscanf(delays, "%d %d", - &priv->untouch_delay, - &priv->report_delay) != 2) { - ErrorF("Bogus delays data in ELO_DELAYS\n"); - } - else { - ErrorF("Untouch delay will be: %d\n", priv->untouch_delay); - ErrorF("Report delay will be: %d\n", priv->report_delay); - } - } -#endif - if (priv->screen_no >= screenInfo.numScreens || priv->screen_no < 0) { priv->screen_no = 0; @@ -1324,7 +801,7 @@ ErrorF("Unable to allocate Elographics touchscreen ButtonClassDeviceStruct\n"); return !Success; } - + if (InitFocusClassDeviceStruct(dev) == FALSE) { ErrorF("Unable to allocate Elographics touchscreen FocusClassDeviceStruct\n"); return !Success; @@ -1332,7 +809,7 @@ if (InitPtrFeedbackClassDeviceStruct(dev, xf86EloPtrControl) == FALSE) { ErrorF("unable to init ptr feedback\n"); return !Success; - } + } /* * Device reports motions on 2 axes in absolute coordinates. * Axes min and max values are reported in raw coordinates. @@ -1363,134 +840,91 @@ if (InitFocusClassDeviceStruct(dev) == FALSE) { ErrorF("Unable to allocate Elographics touchscreen FocusClassDeviceStruct\n"); } - + /* * Allocate the motion events buffer. */ xf86MotionHistoryAllocate(local); - - /* - * This once has caused the server to crash after doing an xalloc & strcpy ?? - */ -#ifndef XFREE86_V4 - AssignTypeAndName(dev, local->atom, local->name); -#endif - + + DBG(2, ErrorF("Done.\n")); return Success; } - + case DEVICE_ON: DBG(2, ErrorF("Elographics touchscreen on...\n")); if (local->fd < 0) { -#ifndef XFREE86_V4 - struct termios termios_tty; - int i, result; -#endif - + DBG(2, ErrorF("Elographics touchscreen opening : %s\n", priv->input_dev)); -#ifdef XFREE86_V4 local->fd = xf86OpenSerial(local->options); if (local->fd < 0) { Error("Unable to open Elographics touchscreen device"); return !Success; } -#else - SYSCALL(local->fd = open(priv->input_dev, O_RDWR|O_NDELAY, 0)); - if (local->fd < 0) { - Error("Unable to open Elographics touchscreen device"); - return !Success; - } - DBG(3, ErrorF("Try to see if the link is at the specified rate\n")); - memset(&termios_tty, 0, sizeof(termios_tty)); - termios_tty.c_cflag = priv->link_speed | CS8 | CREAD | CLOCAL; - termios_tty.c_cc[VMIN] = 1; - SYSCALL(result = tcsetattr(local->fd, TCSANOW, &termios_tty)); - if (result < 0) { - Error("Unable to configure Elographics touchscreen port"); - goto not_success; - } -#endif - /* - * Try to see if the link is at the specified rate and - * ask the controller to report various infos. - */ - memset(req, 0, ELO_PACKET_SIZE); - req[1] = tolower(ELO_PARAMETER); - if (xf86EloSendQuery(req, reply, local->fd) != Success) { - priv->is_a_2310 = 1; - ErrorF("Not at the specified rate or model 2310, will continue\n"); - } + if (priv->model != MODEL_SUNIT_D) + { + /* + * Try to see if the link is at the specified rate and + * ask the controller to report various infos. + */ + memset(req, 0, ELO_PACKET_SIZE); + req[1] = tolower(ELO_PARAMETER); + if (xf86EloSendQuery(req, reply, local->fd) != Success) { + priv->is_a_2310 = 1; + ErrorF("Not at the specified rate or model 2310, will continue\n"); + } - /* - * Ask the controller to report various infos. - */ - memset(req, 0, ELO_PACKET_SIZE); - req[1] = tolower(ELO_ID); - if (xf86EloSendQuery(req, reply, local->fd) == Success) { - xf86EloPrintIdent(reply, priv); - } - else { - ErrorF("Unable to ask Elographics touchscreen identification\n"); - goto not_success; - } - - /* - * Set the operating mode: Stream, no scaling, no calibration, - * no range checking, no trim, tracking enabled. - */ - memset(req, 0, ELO_PACKET_SIZE); - req[1] = ELO_MODE; - req[3] = ELO_TOUCH_MODE | ELO_STREAM_MODE | ELO_UNTOUCH_MODE; - req[4] = ELO_TRACKING_MODE; - if (xf86EloSendControl(req, local->fd) != Success) { - ErrorF("Unable to change Elographics touchscreen operating mode\n"); - goto not_success; - } + /* + * Ask the controller to report various infos. + */ + memset(req, 0, ELO_PACKET_SIZE); + req[1] = tolower(ELO_ID); + if (xf86EloSendQuery(req, reply, local->fd) == Success) { + xf86EloPrintIdent(reply, priv); + } + else { + ErrorF("Unable to ask Elographics touchscreen identification\n"); + goto not_success; + } -#ifndef XFREE86_V4 - /* - * Check if the report delay is compatible with the selected - * link speed and reset it otherwise. - */ - for (i = 0; i < sizeof(LinkSpeedValues)/sizeof(LinkParameterStruct); i++) { - if (LinkSpeedValues[i].speed == priv->link_speed) { - if (LinkSpeedValues[i].delay > priv->report_delay) { - ErrorF("Changing report delay from %d ms to %d ms to comply with link speed\n", - priv->report_delay*10, LinkSpeedValues[i].delay*10); - priv->report_delay = LinkSpeedValues[i].delay; - } - } - } -#endif - /* - * Set the touch reports timings from configuration data. - */ - memset(req, 0, ELO_PACKET_SIZE); - req[1] = ELO_REPORT; - req[2] = priv->untouch_delay; - req[3] = priv->report_delay; - if (xf86EloSendControl(req, local->fd) != Success) { - ErrorF("Unable to change Elographics touchscreen reports timings\n"); - - not_success: - SYSCALL(close(local->fd)); - local->fd = -1; - return !Success; + /* + * Set the operating mode: Stream, no scaling, no calibration, + * no range checking, no trim, tracking enabled. + */ + memset(req, 0, ELO_PACKET_SIZE); + req[1] = ELO_MODE; + req[3] = ELO_TOUCH_MODE | ELO_STREAM_MODE | ELO_UNTOUCH_MODE; + req[4] = ELO_TRACKING_MODE; + if (xf86EloSendControl(req, local->fd) != Success) { + ErrorF("Unable to change Elographics touchscreen operating mode\n"); + goto not_success; + } + + /* + * Set the touch reports timings from configuration data. + */ + memset(req, 0, ELO_PACKET_SIZE); + req[1] = ELO_REPORT; + req[2] = priv->untouch_delay; + req[3] = priv->report_delay; + if (xf86EloSendControl(req, local->fd) != Success) { + ErrorF("Unable to change Elographics touchscreen reports timings\n"); + +not_success: + SYSCALL(close(local->fd)); + local->fd = -1; + return !Success; + } } -#ifdef XFREE86_V4 xf86AddEnabledDevice(local); -#else - AddEnabledDevice(local->fd); -#endif - dev->public.on = TRUE; + dev->public.on = TRUE; } - + DBG(2, ErrorF("Done\n")); return Success; - + /* * Deactivate the device. After this, the device will not emit * events until a subsequent DEVICE_ON. Thus, we can momentarily @@ -1500,17 +934,13 @@ DBG(2, ErrorF("Elographics touchscreen off...\n")); dev->public.on = FALSE; if (local->fd >= 0) { -#ifdef XFREE86_V4 xf86RemoveEnabledDevice(local); -#else - RemoveEnabledDevice(local->fd); -#endif } SYSCALL(close(local->fd)); local->fd = -1; DBG(2, ErrorF("Done\n")); return Success; - + /* * Final close before server exit. This is used during server shutdown. * Close the port and free all the resources. @@ -1519,11 +949,7 @@ DBG(2, ErrorF("Elographics touchscreen close...\n")); dev->public.on = FALSE; if (local->fd >= 0) { -#ifdef XFREE86_V4 xf86RemoveEnabledDevice(local); -#else - RemoveEnabledDevice(local->fd); -#endif } SYSCALL(close(local->fd)); local->fd = -1; @@ -1544,11 +970,7 @@ *************************************************************************** */ static LocalDevicePtr -#ifndef XFREE86_V4 -xf86EloAllocate(void) -#else -xf86EloAllocate(InputDriverPtr drv) -#endif +xf86EloAllocate(InputDriverPtr drv) { LocalDevicePtr local; EloPrivatePtr priv; @@ -1557,23 +979,14 @@ if (!priv) return NULL; -#ifndef XFREE86_V4 - local = (LocalDevicePtr) xalloc(sizeof(LocalDeviceRec)); -#else local = xf86AllocateInput(drv, 0); -#endif if (!local) { xfree(priv); return NULL; } - -#ifdef XFREE86_V4 + priv->input_dev = strdup(ELO_PORT); -#else - priv->input_dev = ELO_PORT; - priv->link_speed = ELO_LINK_SPEED; -#endif priv->min_x = 0; priv->max_x = 3000; priv->min_y = 0; @@ -1591,11 +1004,6 @@ local->name = XI_TOUCHSCREEN; local->flags = 0 /* XI86_NO_OPEN_ON_INIT */; -#ifndef XFREE86_V4 -#if !defined(sun) || defined(i386) - local->device_config = xf86EloConfig; -#endif -#endif local->device_control = xf86EloControl; local->read_input = xf86EloReadInput; local->control_proc = NULL; @@ -1609,52 +1017,10 @@ local->private = priv; local->type_name = "Elographics TouchScreen"; local->history_size = 0; - - return local; -} - -#ifndef XFREE86_V4 -/* - *************************************************************************** - * - * Elographics device association -- - * - *************************************************************************** - */ -DeviceAssocRec elographics_assoc = -{ - "elographics", /* config_section_name */ - xf86EloAllocate /* device_allocate */ -}; - -#ifdef DYNAMIC_MODULE -/* - *************************************************************************** - * - * entry point of dynamic loading - * - *************************************************************************** - */ -int -#ifndef DLSYM_BUG -init_module(unsigned long server_version) -#else -init_xf86Elo(unsigned long server_version) -#endif -{ - xf86AddDeviceAssoc(&elographics_assoc); - if (server_version != XF86_VERSION_CURRENT) { - ErrorF("Warning: Elographics module compiled for version%s\n", XF86_VERSION); - return 0; - } - else { - return 1; - } + return local; } -#endif -#else /* XFREE86_V4 */ static void xf86EloUninit(InputDriverPtr drv, @@ -1662,7 +1028,7 @@ int flags) { EloPrivatePtr priv = (EloPrivatePtr) local->private; - + xf86EloControl(local->dev, DEVICE_OFF); xfree(priv->input_dev); @@ -1694,14 +1060,17 @@ char *str; int portrait = 0; int height, width; - + char *opt_model; + Model* model; + + local = xf86EloAllocate(drv); if (!local) { return NULL; } priv = local->private; local->conf_idev = dev; - + xf86CollectInputOptions(local, default_options, NULL); /* Process the common options. */ xf86ProcessCommonOptions(local, local->options); @@ -1720,10 +1089,23 @@ } priv->input_dev = strdup(str); + opt_model = xf86SetStrOption(local->options, "Model", NULL); + model = SupportedModels; + priv->model = MODEL_UNKNOWN; + while(model->type != MODEL_UNKNOWN && opt_model) + { + if (!strcmp(model->name, opt_model)) + { + priv->model = model->type; + break; + } + model++; + } + local->name = xf86SetStrOption(local->options, "DeviceName", XI_TOUCHSCREEN); - xf86Msg(X_CONFIG, "Elographics X device name: %s\n", local->name); + xf86Msg(X_CONFIG, "Elographics X device name: %s\n", local->name); priv->screen_no = xf86SetIntOption(local->options, "ScreenNo", 0); - xf86Msg(X_CONFIG, "Elographics associated screen: %d\n", priv->screen_no); + xf86Msg(X_CONFIG, "Elographics associated screen: %d\n", priv->screen_no); priv->untouch_delay = xf86SetIntOption(local->options, "UntouchDelay", ELO_UNTOUCH_DELAY); xf86Msg(X_CONFIG, "Elographics untouch delay: %d ms\n", priv->untouch_delay*10); priv->report_delay = xf86SetIntOption(local->options, "ReportDelay", ELO_REPORT_DELAY); @@ -1743,9 +1125,9 @@ debug_level = xf86SetIntOption(local->options, "DebugLevel", 0); if (debug_level) { #if DEBUG - xf86Msg(X_CONFIG, "Elographics debug level sets to %d\n", debug_level); + xf86Msg(X_CONFIG, "Elographics debug level sets to %d\n", debug_level); #else - xf86Msg(X_INFO, "Elographics debug not available\n"); + xf86Msg(X_INFO, "Elographics debug not available\n"); #endif } str = xf86SetStrOption(local->options, "PortraitMode", "Landscape"); @@ -1759,7 +1141,7 @@ xf86Msg(X_ERROR, "Elographics portrait mode should be: Portrait, Landscape or PortraitCCW"); str = "Landscape"; } - xf86Msg(X_CONFIG, "Elographics device will work in %s mode\n", str); + xf86Msg(X_CONFIG, "Elographics device will work in %s mode\n", str); width = priv->max_x - priv->min_x; height = priv->max_y - priv->min_y; @@ -1853,4 +1235,3 @@ _X_EXPORT XF86ModuleData elographicsModuleData = { &version_rec, Plug, Unplug }; #endif -#endif /* XFREE86_V4 */ ++++++ xf86-input-fpit-1.2.0_e8620e9.tar.bz2 -> xf86-input-fpit-1.3.0.tar.bz2 ++++++ ++++ 5571 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-fpit-1.2.0/ChangeLog new/xf86-input-fpit-1.3.0/ChangeLog --- old/xf86-input-fpit-1.2.0/ChangeLog 2008-04-21 17:10:01.000000000 +0200 +++ new/xf86-input-fpit-1.3.0/ChangeLog 2009-02-18 02:30:46.000000000 +0100 @@ -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. + + Server 1.4 does not do physical core devices. -2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 01a4da993a2ecd0f017baef49b6e57b82c05316d +Author: Julien Cristau <jcristau@debian.org> +Date: Mon Jan 14 10:50:54 2008 +1030 - * configure.ac: - Update package version number for X11R7 RC2 release. + Don't crash with xserver 1.4 + + xf86IsCorePointer() is gone. -2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 2823f7c3f3784a1a398b8d5a9157c2e5263b6285 +Author: Peter Hutterer <peter@cs.unisa.edu.au> +Date: Tue Apr 8 16:00:36 2008 +0930 - * configure.ac: - Update pkgcheck dependencies to work with separate build roots. + 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 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-fpit-1.2.0/configure.ac new/xf86-input-fpit-1.3.0/configure.ac --- old/xf86-input-fpit-1.2.0/configure.ac 2008-04-21 17:10:01.000000000 +0200 +++ new/xf86-input-fpit-1.3.0/configure.ac 2009-02-18 02:28:14.000000000 +0100 @@ -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_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 @@ # 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]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-fpit-1.2.0/Makefile.am new/xf86-input-fpit-1.3.0/Makefile.am --- old/xf86-input-fpit-1.2.0/Makefile.am 2008-04-21 17:10:01.000000000 +0200 +++ new/xf86-input-fpit-1.3.0/Makefile.am 2009-02-18 02:25:41.000000000 +0100 @@ -22,3 +22,11 @@ SUBDIRS = src man EXTRA_DIST = readme.txt +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-fpit-1.2.0/man/fpit.man new/xf86-input-fpit-1.3.0/man/fpit.man --- old/xf86-input-fpit-1.2.0/man/fpit.man 2008-04-21 17:10:01.000000000 +0200 +++ new/xf86-input-fpit-1.3.0/man/fpit.man 2009-02-18 02:25:41.000000000 +0100 @@ -151,7 +151,7 @@ .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> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-fpit-1.2.0/README new/xf86-input-fpit-1.3.0/README --- old/xf86-input-fpit-1.2.0/README 1970-01-01 01:00:00.000000000 +0100 +++ new/xf86-input-fpit-1.3.0/README 2009-02-18 02:25:41.000000000 +0100 @@ -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 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-fpit-1.2.0/src/Makefile.am new/xf86-input-fpit-1.3.0/src/Makefile.am --- old/xf86-input-fpit-1.2.0/src/Makefile.am 2008-04-21 17:10:01.000000000 +0200 +++ new/xf86-input-fpit-1.3.0/src/Makefile.am 2009-02-18 02:25:41.000000000 +0100 @@ -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@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-fpit-1.2.0/src/xf86Fpit.c new/xf86-input-fpit-1.3.0/src/xf86Fpit.c --- old/xf86-input-fpit-1.2.0/src/xf86Fpit.c 2008-08-04 11:40:11.000000000 +0200 +++ new/xf86-input-fpit-1.3.0/src/xf86Fpit.c 2008-12-01 00:59:15.000000000 +0100 @@ -55,7 +55,7 @@ #include "config.h" #endif -#include <xf86Version.h> +#include <xorgVersion.h> #include <unistd.h> #include <errno.h> ++++++ xf86-input-joystick-1.3.3.tar.bz2 -> xf86-input-joystick-1.4.0.tar.bz2 ++++++ ++++ 6977 lines of diff (skipped) ++++++ xf86-input-keyboard-1.3.1.tar.bz2 -> xf86-input-keyboard-1.3.2.tar.bz2 ++++++ ++++ 13996 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-keyboard-1.3.1/ChangeLog new/xf86-input-keyboard-1.3.2/ChangeLog --- old/xf86-input-keyboard-1.3.1/ChangeLog 2008-03-20 19:55:18.000000000 +0100 +++ new/xf86-input-keyboard-1.3.2/ChangeLog 2009-01-07 18:09:58.000000000 +0100 @@ -1,51 +1,663 @@ -2006-04-06 Adam Jackson <ajax@freedesktop.org> +commit 708ecbf8557d9e676e3bb07c1f83170f6d9f7cd7 +Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> +Date: Wed Jan 7 15:09:01 2009 -0200 - * configure.ac: - * src/kbd.c: - Unlibcwrap. Bump server version requirement. Bump to 1.1.0. + Update for servers newer then 1.5 or git master. + + The atKeynames.h header was moved to the kbd driver sources as + well as the xf86CommonSpecialKey() function. This problem probably + got unnoticed for quite sometime, mainly because most people doing + regular builds should either not have been building the kbd driver, + or had atKeynames.h in /usr/include/xorg from a previous install. -2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 9294caab68d58d13f429b7c0b23541b99f2b0dae +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Tue Nov 18 18:40:58 2008 -0800 - * configure.ac: - Update package version for X11R7 release. + Renamed subdir .cvsignore files to .gitignore -2005-12-19 Alan Coopersmith <alan.coopersmith@sun.com> +commit 74b6461c5362e3401fdcf5a080bf71e6f7908e09 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Tue Nov 11 17:35:55 2008 -0800 - * man/kbd.man: - * man/keyboard.man: - Correct documentation of XKB default settings - -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> + sun_kbd.c: Don't try to repeat shutdown actions on already closed keyboard - * configure.ac: - Update package version number for final X11R7 release candidate. +commit 3e28d68b50d291938734e9684b8296ca864f3892 +Author: Luc Verhaegen <libv@skynet.be> +Date: Mon Oct 13 15:22:32 2008 +0200 -2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org> + Set TERMINATE_FALLBACK to 0. + + This stops the keyboard driver from sending 2 extra ctrl-alt-backspace + events to the server. - * man/Makefile.am: - Change *man_SOURCES ==> *man_PRE to fix autotools warnings. +commit eecfd24481b5768692409666b16b666e71ec97f8 +Author: Adam Jackson <ajax@redhat.com> +Date: Tue Aug 19 15:28:02 2008 -0400 -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> + Remove useless call to xf86AddModuleInfo - * configure.ac: - Update package version number for X11R7 RC3 release. +commit 574442b906fa8ff600d2fd32fdb2bf953b3bb5fa +Author: Adam Jackson <ajax@redhat.com> +Date: Tue Aug 19 10:20:47 2008 -0400 -2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org> + Remove XFree86-Misc leftovers. - * configure.ac: - Remove extraneous AC_MSG_RESULT. +commit 80b04aa649f5e65294439264b6bbb0dc90c22a7c +Author: Kristian Høgsberg <krh@redhat.com> +Date: Thu Jul 24 16:39:02 2008 -0400 -2005-11-29 Adam Jackson <ajax@freedesktop.org> + Move atKeynames.h and xf86CommonSpecialKey() here. - * configure.ac: - Only build dlloader modules by default. +commit ef7873db2861a9aa103eaabbe84b4396e64ff3a1 +Author: Adam Jackson <ajax@redhat.com> +Date: Wed May 21 15:39:59 2008 -0400 -2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org> + keyboard 1.3.1 - * configure.ac: - Update package version number for X11R7 RC2 release. +commit a1866e2e73f0b401cd8e92fc9ee8db1791585936 +Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> +Date: Wed Apr 9 14:36:58 2008 -0300 -2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org> + Don't send events in DEVICE_INIT, only after DEVICE_ON. + + See http://bugs.freedesktop.org/show_bug.cgi?id=2243#c15 for a description of + the problem fixed in this patch. + + Now only the driver leds state is synched with virtual console state, and if + required, events are post in DEVICE_ON. + This also defines an internal INITFLAG state to know when DEVICE_ON is called + after DEVICE_INIT, otherwise, it will only send events for leds that changed + state while the device was in "DEVICE_OFF state". + + Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au> - * configure.ac: - Update pkgcheck dependencies to work with separate build roots. +commit 86b16003ef1134a2471cd3f7ac217db574fa714c +Author: Adam Jackson <ajax@redhat.com> +Date: Thu Mar 20 16:05:05 2008 -0400 + + keyboard 1.3.0 + +commit af3adb8e24c03fcd86ad63208ce525cd4db876ac +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Mon Mar 17 19:19:45 2008 -0700 + + Correct COPYING file and note which notices apply to which code/OS'es + +commit 49bf7022f85886d06ba4991364e6e28f17d78f2b +Author: Daniel Drake <ddrake@brontes3d.com> +Date: Mon May 21 13:53:01 2007 -0800 + + Bug 11026: xf86-input-keyboard COPYING file + + X.Org Bugzilla #11026 <https://bugs.freedesktop.org/show_bug.cgi?id=11026> + +commit 0382ed1c0c29ee19cfa8bff213ee32a7d0c06da9 +Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> +Date: Fri Feb 8 19:00:57 2008 -0200 + + Alternate patch to preserve NumLock & CapsLock leds at X Server startup. + + This patch requires reverting commits: + 7148a0c3e04668b7608295ebdf94579f6acfa544 and + 0f3716db01681876cc385727beeb842af5b950d3 + Also, it is assumed that the os specific GetLeds will properly + use bit 0 for caps lock and bit 1 for num lock. + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> + +commit 382ad4ef28b8393b385ac1d2426c5b22076ea165 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Mon Mar 17 18:48:47 2008 -0700 + + Revert previous attempts to sync lock state & LEDs + + See next commit for improved fix + +commit 0c8220690c726d61a250ad5aec9171009f523043 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Mon Mar 17 18:46:15 2008 -0700 + + Use $(XKBPATH) for xkb file path in man page + +commit e32e610b719c7dc7a78a1b991b12521863877e51 +Author: Matej Kosik <kosik@fiit.stuba.sk> +Date: Fri Feb 15 08:53:48 2008 -0800 + + Add information & example of XKB options to man page + +commit ea46dd17058f6a880ed38102d1fde1dcba1f8215 +Author: Matthieu Herrb <matthieu@bluenote.herrb.net> +Date: Sat Mar 8 23:04:13 2008 +0100 + + Makefile.am: nuke RCS Id + +commit 0f3716db01681876cc385727beeb842af5b950d3 +Author: Samuel Thibault <samuel.thibault@ens-lyon.org> +Date: Wed Jan 16 10:18:59 2008 +1030 + + lnx: Automatically inherit the vt's numlock and capslock status (Bug #2243) + + X.Org Bug #2243 <https://bugs.freedesktop.org/show_bug.cgi?id=2243> + +commit 882b28a452db6ebe1499d9558d0028cebb0e032f +Author: Matthieu Herrb <matthieu@bluenote.herrb.com> +Date: Wed Dec 12 22:43:04 2007 +0100 + + Fix parameters order for printWsType(). + +commit b139da4553e71896689e8f522e5cff58f5bb7674 +Author: Adam Jackson <ajax@redhat.com> +Date: Mon Dec 3 11:57:40 2007 -0500 + + Don't sleep(1) on VT entry. + +commit ec247cd91cf147a8d1e79b0746680b049269798f +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Thu Oct 11 16:42:33 2007 -0700 + + Update kbd man page to say it has replaced keyboard driver now. + +commit 278c7d8f44ba7393a95ab1a4a557d6f385044022 +Author: David Marx <david.marx@sun.com> +Date: Wed Oct 10 16:18:12 2007 -0700 + + Sun bug #6425775 Xserver is blocked when a program rings keyboard-bell + + Use KIOCMKTONE ioctl instead on Solaris versions that have it + <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6425775> + +commit 10792dc1eebf9f718e0cad0b425a8b8307a7ebc7 +Author: Julien Cristau <jcristau@debian.org> +Date: Thu Sep 6 18:41:28 2007 +0200 + + Remove the legacy keyboard driver's manpage + +commit 3d88a17403df55d28e85ebc445b798cdce23e581 +Author: Eric Anholt <eric@anholt.net> +Date: Wed Sep 5 09:09:06 2007 -0700 + + Bump version to 1.2.2 for release. + +commit 3b87c8e164a5a4e79900b70e38e09c85bc99ce25 +Author: Eric Anholt <eric@anholt.net> +Date: Mon Aug 20 15:36:37 2007 -0700 + + Bug #9748: Include GPL license by Rik Faith for some lnx_kbd.c contents. + + The code in question was clearly copy-and-pasted from the kbdrate.c.c file. + +commit 095c59f70b58b87e627b3150f3a4694d66b75746 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Wed Jul 18 18:32:59 2007 -0700 + + Remove unused variables + +commit 7148a0c3e04668b7608295ebdf94579f6acfa544 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Wed Jul 18 17:29:16 2007 -0700 + + Sun bug 6312042: Preserve NumLock & CapsLock state on Xorg startup + + If either the NumLock or CapsLock leds on the keyboard are on at startup, + generate fake NumLock/CapsLock keypresses to set the server state to match. + <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6312042> + + Based on earlier Xsun fix for Sun bug #4185550 + <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=4185550> + +commit db0254abb0ba68c6dfb2443d1170d9d1e895021d +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Wed Jul 18 16:30:35 2007 -0700 + + Remove old wrappers used for sharing code between keyboard & kbd drivers + +commit 256da8cc284a3a66a4a41ec7708b0b467c30b369 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Wed Jul 18 11:07:12 2007 -0700 + + Update key mappings before we walk them looking for modifiers, not after + +commit 8fe8b62ab3fcc8c51d61dcc2e658e6733da3edfb +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Tue Jul 17 20:11:17 2007 -0700 + + renamed: .cvsignore -> .gitignore + +commit 7e412914fc1e2372890c2af46263f4cefab8cbfe +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Tue Jul 17 20:10:50 2007 -0700 + + Update Solaris port to work with os layer move into kbd driver + + Also remove old code only needed for obsolete "keyboard" driver + Fix default keysym map on Solaris to work correctly when XKB fails + +commit 36cf953910002a00a3694033d49c6c38319b0283 +Author: Julien Cristau <jcristau@debian.org> +Date: Wed Jun 13 23:02:58 2007 +1000 + + Keep module version up-to-date using PACKAGE_VERSION_* + +commit 05dd89ef03cee6853e7c2db518b6b22785cc3e7c +Author: Samuel Thibault <samuel.thibault@ens-lyon.org> +Date: Mon Feb 5 14:29:54 2007 -0800 + + Fix key led update + + Cf: https://bugs.freedesktop.org/show_bug.cgi?id=313 + https://bugs.freedesktop.org/attachment.cgi?id=8396&action=view + + ------- Comment #8 From Samuel Thibault 2007-01-14 14:28:16 [reply] ------- + + Created an attachment (id=8396) [details] + fix key led update + + Ok, found the problem: when XKB is used (!pKbd->noXkb), pKbd->keyLeds is not + updated, so that UpdateLeds(), even if it called at the right places, actually + just clears all LEDs. Here is a patch. + +commit caeb0f364c1a95a9ad3e64dd722c8ddc88077a86 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Fri Dec 8 09:09:24 2006 +0200 + + don't release keys on newer servers + On newer servers, we take care of the key release over VT switch already, + so don't do it twice; that will lead to hilarious results. + +commit fd51e4d27d7a31ed9d4a075c3814b36320af4612 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Tue Nov 7 00:10:54 2006 +0200 + + add xf86Keymap.h, fix _SOURCES -> _SRCS in Makefile.am + +commit 976e12d85920d5bd09f6d0ba005835f733b296b7 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Sat Nov 4 21:01:55 2006 +0200 + + bump to 1.2.1 + +commit 08aa290b0125eb681f872ef821ecffd5818caeb6 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Sat Nov 4 21:01:49 2006 +0200 + + add xf86OSKbd.h to build system, _SOURCES -> _SRCS + Add xf86OSKbd.h to the build system, and change _SOURCES use to _SRCS, + except when explicitly referring to a target. This keeps automake 1.10 + happy. + +commit 95e5d2521fc39a661e13b313e5aa2514ddac9a5e +Author: Daniel Stone <daniel@fooishbar.org> +Date: Thu Nov 2 00:24:24 2006 +0200 + + move os keyboard layer into kbd driver, remove legacy keyboard driver + Completely remove the old 'keyboard' driver. + Move the OS keyboard layer from the Xorg DDX into the kbd driver. Right + now, BSD, Linux, SCO, and Solaris, have been dragged over. + Bump to 1.2.0, as we'll collide badly with the existing OS keyboard layer. + +commit 3bfed2fc2e401bc4b5f74a3f20014d4a5c7dad30 +Author: Adam Jackson <ajax@benzedrine.nwnk.net> +Date: Fri Oct 13 18:26:38 2006 -0400 + + Bump to 1.1.1 + +commit d3c6014290a90a985679c9258fe65be3d89bf7b9 +Author: Tilman Sauerbeck <tilman@code-monkey.de> +Date: Sun Jul 9 19:57:36 2006 +0200 + + Added some missing includes. + +commit c94229993dc2a8672802ef8ab35717089b74ab80 +Author: Adam Jackson <ajax@nwnk.net> +Date: Fri Apr 7 17:47:17 2006 +0000 + + Unlibcwrap. Bump server version requirement. Bump to 1.1.0. + +commit 01744910cd7c4034fa1dd14ef734d7087832647d +Author: Kevin E Martin <kem@kem.org> +Date: Wed Dec 21 02:29:57 2005 +0000 + + Update package version for X11R7 release. + +commit 9bd0521c65760d4e555ac992a92ce74ce8d55437 +Author: Adam Jackson <ajax@nwnk.net> +Date: Mon Dec 19 16:25:51 2005 +0000 + + Stub COPYING files + +commit 75d352b91ff79b5b55dbd7c5d3952470de87704f +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Mon Dec 19 09:07:50 2005 +0000 + + Typo fixes, mailing list & url updates, and other changes to prepare for + X11R6.9 & 7.0 releases. + +commit 29309dd08deb535262625c2eb73558c6eae69336 +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 a459e2028834e76e21117070d073cc9489b0d65f +Author: Kevin E Martin <kem@kem.org> +Date: Tue Dec 6 22:48:30 2005 +0000 + + Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + +commit 9c5c0e3d211fcce658aa667d8be7f979b9cb83cd +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 05:49:31 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit edb6ec6c311543686230a43885183071e92dc60d +Author: Kevin E Martin <kem@kem.org> +Date: Fri Dec 2 02:16:05 2005 +0000 + + Remove extraneous AC_MSG_RESULT. + +commit 0721c4b4a75fe836d17445550746ed415f06d126 +Author: Adam Jackson <ajax@nwnk.net> +Date: Tue Nov 29 23:29:56 2005 +0000 + + Only build dlloader modules by default. + +commit 9885aa10eeb6e42212a0e21861790b72adc3ce71 +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Mon Nov 28 22:04:07 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 ec4425c0ddb1dd45fb24e3984d490a68ff211b08 +Author: Eric Anholt <anholt@freebsd.org> +Date: Mon Nov 21 10:49:05 2005 +0000 + + Add .cvsignores for drivers. + +commit e5451950a80744b183f5e8f4259ff2e596952a13 +Author: Kevin E Martin <kem@kem.org> +Date: Wed Nov 9 21:31:23 2005 +0000 + + Bump version numbers for X11R6.9/X11R7 RC2. + +commit 066e7c7d2768dec2c033a2ce723abbe31495f6d0 +Author: Kevin E Martin <kem@kem.org> +Date: Wed Nov 9 21:15:12 2005 +0000 + + Update package version number for X11R7 RC2 release. + +commit 4442fdf90f51cc265679b61cc341f6ed32e134a1 +Author: Kean Johnson <kean@armory.com> +Date: Tue Nov 8 06:33:28 2005 +0000 + + See ChangeLog entry 2005-11-07 for details. + +commit 85dfda745021f49f01424d6a01c6396865d1723d +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 288c4a7f79b9fb4b0531fe7cf21dec7f7f4a3668 +Author: Kevin E Martin <kem@kem.org> +Date: Wed Oct 19 02:48:00 2005 +0000 + + Update package version number for RC1 release. + +commit 4861d1586d6ce54a8563047fa01016b658517d8f +Author: Kevin E Martin <kem@kem.org> +Date: Tue Oct 18 15:46:36 2005 +0000 + + Do the following to make the drivers pass distcheck: + - Only define EXTRA_DIST when there are actually man pages to be processed + - Add missing man pages to keyboard and ati drivers EXTRA_DIST + +commit f7e91cad97e22e05b87de3d16a0f4299ea471a88 +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 9e5a8ec5b63ec730916c0312cf6d65c26fd138d5 +Author: Adam Jackson <ajax@nwnk.net> +Date: Mon Oct 17 22:57:28 2005 +0000 + + More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead + of indirectly + +commit f06abf1decb60bdaf453b0d73f05f45b833b843a +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Mon Oct 17 00:08:58 2005 +0000 + + Use sed & cpp to substitute variables in driver man pages + +commit 8668a70c065a3cba91a0f4b75c34c4478099bedd +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Sun Oct 16 19:01:25 2005 +0000 + + Remove note about kbd being experimental. Add Solaris to supported OS list + for kbd. + Add note about plans to move to kbd in a future release. + +commit a228e916cc1ffa85446c95a6c42380b39d67b9f6 +Author: Matthieu Herrb <matthieu.herrb@laas.fr> +Date: Sat Oct 1 17:30:58 2005 +0000 + + Bug #3411: fix handling of keyboard Autorepeat rate in xorg.conf. + +commit 66693592a767baabca9eae015b57e9c6660a080b +Author: Daniel Stone <daniel@fooishbar.org> +Date: Thu Aug 18 09:03:39 2005 +0000 + + Update autogen.sh to one that does objdir != srcdir. + +commit ea7e6dfb03714a48edfb04053ac49f71f553872d +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 8f930fc988f0d43bf2d964721e846fcf5fed6e4b +Author: Adam Jackson <ajax@nwnk.net> +Date: Tue Aug 2 00:51:34 2005 +0000 + + AS_HELP_STRING workaround + +commit c392a4c091e70d42b498f9e8a55737feedbe2871 +Author: Kevin E Martin <kem@kem.org> +Date: Fri Jul 29 21:22:41 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 b1379685a2fce1f1b2092814d3170cc29f4fd039 +Author: Kevin E Martin <kem@kem.org> +Date: Wed Jul 13 20:03:22 2005 +0000 + + Make the module dir configurable + +commit 9f91bf7017f10ed23e2d313e47934d803e292dbc +Author: Alan Hourihane <alanh@fairlite.demon.co.uk> +Date: Wed Jul 13 12:30:04 2005 +0000 + + //bugs.freedesktop.org/show_bug.cgi?id=2587> Fix keyboard mapping on Sun + keyboards in the keyboard module. + +commit da10828e418bc7fdbdcd03162ee92b0a999a11b7 +Author: Kevin E Martin <kem@kem.org> +Date: Wed Jul 13 02:21:00 2005 +0000 + + Update all input drivers to pass distcheck + +commit c9b223867b4922c646dd85c7468b8f79bf5257d5 +Author: Adam Jackson <ajax@nwnk.net> +Date: Tue Jul 12 06:15:09 2005 +0000 + + Build skeletons for input drivers. Should basically work. + +commit c9097dd3204d4fe2a3a21cec23948f27ec6292ed +Author: Adam Jackson <ajax@nwnk.net> +Date: Mon Jul 11 02:38:00 2005 +0000 + + Prep input drivers for modularizing by adding guarded #include "config.h" + +commit 83efe32bd4a9372467680cafd5880438e551db31 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Fri Jul 1 22:43:22 2005 +0000 + + Change all misc.h and os.h references to <X11/foo.h>. + +commit ebf2b80b2027ebb99dbe44c7d77fd9f7a43f2e72 +Author: Adam Jackson <ajax@nwnk.net> +Date: Sat Jun 25 21:17:02 2005 +0000 + + Bug #3626: _X_EXPORT tags for video and input drivers. + +commit 3360f15f5f4cdd4a6cf204ff8af70a90c314ada3 +Author: Eric Anholt <anholt@freebsd.org> +Date: Tue May 10 00:12:17 2005 +0000 + + Bugzilla #2561: Disable some keycode translations on PC98, which had + various bad effects including modifier keys not working. + +commit 2ca94be67112a926721ef699f495bc158c4963a4 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Wed Apr 20 12:25:34 2005 +0000 + + Fix includes right throughout the Xserver tree: + change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h; + change "foo.h", "extensions/foo.h" and "X11/foo.h" to + <X11/extensions/foo.h> for extension headers, e.g. Xv.h; + change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files. + +commit d157c2188389c84f3ee7594ddd0980f1a3553e97 +Author: Egbert Eich <eich@suse.de> +Date: Tue Jan 11 14:59:02 2005 +0000 + + Minor format fix. + Added explanatory comment and debug code. + Added comment. + +commit b7f68e909640008e831c2ddb67ca4fb9515cec04 +Author: Egbert Eich <eich@suse.de> +Date: Mon Jan 10 17:44:39 2005 +0000 + + PC keyboards internally generate a different scan code when the ALT + modifier is pressed with the SysReq/Print key. Since X expects the same + scancode regardless of the modifier the keyboard driver has to 'map the + code back'. So far it does so when seeing the SysReq scancode without + checking if the modifier is on. If this scancode is also sent by + another key on an extended keyboard it receives the same remapping. + Fix: Add check for ALT modifier down before doing the remapping (Helmut + Fahrion). + +commit b04ef340e213badb2e44fb669583b490f7278969 +Author: Matthieu Herrb <matthieu.herrb@laas.fr> +Date: Mon Dec 6 21:51:11 2004 +0000 + + Previous fix broke hardware-based autorepeat. This fix mimics the behaviour + of the legacy driver by making a local copy of the autoRepeat flag. + +commit db3b5cb60a71f2d5e536797559001dc59090ab6c +Author: Matthieu Herrb <matthieu.herrb@laas.fr> +Date: Fri Dec 3 23:30:48 2004 +0000 + + programs/Xserver/hw/xfree86/input/keyboard/kbd.c + - set default XkbModel to pc105 (like legacy keyboard driver did) + - fix autorepeat (Bugzilla #1651, Petter Urkedal). + +commit b9bece29e9733bdf4bb44da6ced4d3e0e433f6e5 +Author: Kevin E Martin <kem@kem.org> +Date: Tue Aug 31 01:36:13 2004 +0000 + + Fix keyboard driver regression (Bug #1238, Kristian Hoegsberg). + +commit 3d97e8a41a8a15769f43233a2ed7692387cb0b81 +Author: Kevin E Martin <kem@kem.org> +Date: Sun Aug 29 21:06:00 2004 +0000 + + Fix make install when BuildServersOnly is YES (Bug #1213). + Fix build failures when UseDeprecatedKeyboardDriver is YES and + DoLoadableServer is NO (Bug #1229, Kristian H�gsberg). + Fix failure when using DLL loader and LD_BIND_NOW is set (Bug #1212, Adam + Jackson). + +commit 9e2172ffef436acb9a88147f276c9ddf12739a14 +Author: Kevin E Martin <kem@kem.org> +Date: Mon Aug 16 22:48:51 2004 +0000 + + Update release and date for first RC. + Fix kbd/keyboard driver for DoLoadableServer NO. + Revert change since it is better to set date in the config files. + +commit 58f47a9c32cf379fd473f01b18ddc57b90e47b0b +Author: Kevin E Martin <kem@kem.org> +Date: Mon Aug 16 20:17:52 2004 +0000 + + Add kdb <-> keyboard aliasing when UseDeprecatedKeyboardDriver is NO (Bug + #1072, Kristian H�gsberg). + +commit 32d5ece27279bf7f1211346f15a292f73ff334d6 +Author: Egbert Eich <eich@suse.de> +Date: Fri Apr 23 19:54:03 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit cbec87bb621bd6bb2fddf1fe9aa970a09acba8f7 +Author: Egbert Eich <eich@suse.de> +Date: Sun Mar 14 08:33:52 2004 +0000 + + Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 + +commit f078d9ca112038d16eb9b28d331a900f0ab7bd62 +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 e5e92f4396bc0a73ddda050403d422cee9bdfd2f +Author: Egbert Eich <eich@suse.de> +Date: Thu Feb 26 13:36:00 2004 +0000 + + readding XFree86's cvs IDs + +commit 1056cd4925dc787f72b9f6b5900e55e00d7ba973 +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 1c8924b7c1728653ebe49a663dd6125cef010bc8 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Dec 19 20:55:25 2003 +0000 + + XFree86 4.3.99.902 (RC 2) + +commit 01eff4e6297717400f8b9517a9e4ccdc067d07d3 +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 303235b2d4a53231a6aa74d4d74d683842477b27 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:56 2003 +0000 + + XFree86 4.3.0.1 + +commit 724aeb56e7d6e5940ad6d329f53f5b80a9fc38ae +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:56 2003 +0000 + + Initial revision diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-keyboard-1.3.1/configure.ac new/xf86-input-keyboard-1.3.2/configure.ac --- old/xf86-input-keyboard-1.3.1/configure.ac 2008-05-21 21:39:45.000000000 +0200 +++ new/xf86-input-keyboard-1.3.2/configure.ac 2009-01-07 17:48:34.000000000 +0100 @@ -22,10 +22,15 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-keyboard], - 1.3.1, + 1.3.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-keyboard) +# Require xorg-macros version 1.2 or newer for XORG_CWARNFLAGS and +# XORG_CHANGELOG macros +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2.1 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.2.1) + AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_AUX_DIR(.) AM_INIT_AUTOMAKE([dist-bzip2]) @@ -44,8 +49,6 @@ AH_TOP([#include "xorg-server.h"]) -m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) - case $host_os in linux*) IS_LINUX="yes" @@ -98,8 +101,7 @@ [Default xorg module directory [[default=$libdir/xorg/modules]]]), [moduledir="$withval"], [moduledir="$libdir/xorg/modules"]) -inputdir=${moduledir}/input -AC_SUBST(inputdir) +AC_SUBST(moduledir) # Checks for extensions XORG_DRIVER_CHECK_EXT(RANDR, randrproto) @@ -110,8 +112,9 @@ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.2.99.0] xproto $REQUIRED_MODULES) sdkdir=$(pkg-config --variable=sdkdir xorg-server) -CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src' -AC_SUBST([CFLAGS]) +XORG_CWARNFLAGS +XORG_CFLAGS="$CWARNFLAGS $XORG_CFLAGS" +AC_SUBST([XORG_CFLAGS]) # Checks for libraries. @@ -120,5 +123,6 @@ XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile src/Makefile man/Makefile]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-keyboard-1.3.1/Makefile.am new/xf86-input-keyboard-1.3.2/Makefile.am --- old/xf86-input-keyboard-1.3.1/Makefile.am 2008-03-20 19:55:18.000000000 +0100 +++ new/xf86-input-keyboard-1.3.2/Makefile.am 2009-01-07 17:40:47.000000000 +0100 @@ -20,3 +20,14 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = src man + +EXTRA_DIST = ChangeLog + +MAINTAINERCLEANFILES=ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-keyboard-1.3.1/src/atKeynames.h new/xf86-input-keyboard-1.3.2/src/atKeynames.h --- old/xf86-input-keyboard-1.3.1/src/atKeynames.h 1970-01-01 01:00:00.000000000 +0100 +++ new/xf86-input-keyboard-1.3.2/src/atKeynames.h 2009-01-07 17:35:10.000000000 +0100 @@ -0,0 +1,295 @@ +/* + * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany. + * + * 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 Thomas Roell not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. Thomas Roell makes no representations + * about the suitability of this software for any purpose. It is provided + * "as is" without express or implied warranty. + * + * THOMAS ROELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL THOMAS ROELL 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. + * + */ +/* + * Copyright (c) 1994-2003 by The XFree86 Project, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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 copyright holder(s) + * and author(s) 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 copyright holder(s) and author(s). + */ + +#ifndef _ATKEYNAMES_H +#define _ATKEYNAMES_H + +#define XK_TECHNICAL +#define XK_KATAKANA +#include <X11/keysym.h> +#include <X11/XF86keysym.h> + +#define GLYPHS_PER_KEY 4 +#define NUM_KEYCODES 248 +#define MIN_KEYCODE 8 +#define MAX_KEYCODE (NUM_KEYCODES + MIN_KEYCODE - 1) + +#define AltMask Mod1Mask +#define NumLockMask Mod2Mask +#define AltLangMask Mod3Mask +#define KanaMask Mod4Mask +#define ScrollLockMask Mod5Mask + +#define KeyPressed(k) (keyc->postdown[k >> 3] & (1 << (k & 7))) +#define ModifierDown(k) ((keyc->state & (k)) == (k)) + +/* + * NOTE: The AT/MF keyboards can generate (via the 8042) two (MF: three) + * sets of scancodes. Set3 can only be generated by a MF keyboard. + * Set2 sends a makecode for keypress, and the same code prefixed by a + * F0 for keyrelease. This is a little bit ugly to handle. Thus we use + * here for X386 the PC/XT compatible Set1. This set uses 8bit scancodes. + * Bit 7 ist set if the key is released. The code E0 switches to a + * different meaning to add the new MF cursorkeys, while not breaking old + * applications. E1 is another special prefix. Since I assume that there + * will be further versions of PC/XT scancode compatible keyboards, we + * may be in trouble one day. + * + * IDEA: 1) Use Set2 on AT84 keyboards and translate it to MF Set3. + * 2) Use the keyboards native set and translate it to common keysyms. + */ + +/* + * definition of the AT84/MF101/MF102 Keyboard: + * ============================================================ + * Defined Key Cap Glyphs Pressed value + * Key Name Main Also (hex) (dec) + * ---------------- ---------- ------- ------ ------ + */ + +#define KEY_Escape /* Escape 0x01 */ 1 +#define KEY_1 /* 1 ! 0x02 */ 2 +#define KEY_2 /* 2 @ 0x03 */ 3 +#define KEY_3 /* 3 # 0x04 */ 4 +#define KEY_4 /* 4 $ 0x05 */ 5 +#define KEY_5 /* 5 % 0x06 */ 6 +#define KEY_6 /* 6 ^ 0x07 */ 7 +#define KEY_7 /* 7 & 0x08 */ 8 +#define KEY_8 /* 8 * 0x09 */ 9 +#define KEY_9 /* 9 ( 0x0a */ 10 +#define KEY_0 /* 0 ) 0x0b */ 11 +#define KEY_Minus /* - (Minus) _ (Under) 0x0c */ 12 +#define KEY_Equal /* = (Equal) + 0x0d */ 13 +#define KEY_BackSpace /* Back Space 0x0e */ 14 +#define KEY_Tab /* Tab 0x0f */ 15 +#define KEY_Q /* Q 0x10 */ 16 +#define KEY_W /* W 0x11 */ 17 +#define KEY_E /* E 0x12 */ 18 +#define KEY_R /* R 0x13 */ 19 +#define KEY_T /* T 0x14 */ 20 +#define KEY_Y /* Y 0x15 */ 21 +#define KEY_U /* U 0x16 */ 22 +#define KEY_I /* I 0x17 */ 23 +#define KEY_O /* O 0x18 */ 24 +#define KEY_P /* P 0x19 */ 25 +#define KEY_LBrace /* [ { 0x1a */ 26 +#define KEY_RBrace /* ] } 0x1b */ 27 +#define KEY_Enter /* Enter 0x1c */ 28 +#define KEY_LCtrl /* Ctrl(left) 0x1d */ 29 +#define KEY_A /* A 0x1e */ 30 +#define KEY_S /* S 0x1f */ 31 +#define KEY_D /* D 0x20 */ 32 +#define KEY_F /* F 0x21 */ 33 +#define KEY_G /* G 0x22 */ 34 +#define KEY_H /* H 0x23 */ 35 +#define KEY_J /* J 0x24 */ 36 +#define KEY_K /* K 0x25 */ 37 +#define KEY_L /* L 0x26 */ 38 +#define KEY_SemiColon /* ;(SemiColon) :(Colon) 0x27 */ 39 +#define KEY_Quote /* ' (Apostr) " (Quote) 0x28 */ 40 +#define KEY_Tilde /* ` (Accent) ~ (Tilde) 0x29 */ 41 +#define KEY_ShiftL /* Shift(left) 0x2a */ 42 +#define KEY_BSlash /* \(BckSlash) |(VertBar)0x2b */ 43 +#define KEY_Z /* Z 0x2c */ 44 +#define KEY_X /* X 0x2d */ 45 +#define KEY_C /* C 0x2e */ 46 +#define KEY_V /* V 0x2f */ 47 +#define KEY_B /* B 0x30 */ 48 +#define KEY_N /* N 0x31 */ 49 +#define KEY_M /* M 0x32 */ 50 +#define KEY_Comma /* , (Comma) < (Less) 0x33 */ 51 +#define KEY_Period /* . (Period) >(Greater)0x34 */ 52 +#define KEY_Slash /* / (Slash) ? 0x35 */ 53 +#define KEY_ShiftR /* Shift(right) 0x36 */ 54 +#define KEY_KP_Multiply /* * 0x37 */ 55 +#define KEY_Alt /* Alt(left) 0x38 */ 56 +#define KEY_Space /* (SpaceBar) 0x39 */ 57 +#define KEY_CapsLock /* CapsLock 0x3a */ 58 +#define KEY_F1 /* F1 0x3b */ 59 +#define KEY_F2 /* F2 0x3c */ 60 +#define KEY_F3 /* F3 0x3d */ 61 +#define KEY_F4 /* F4 0x3e */ 62 +#define KEY_F5 /* F5 0x3f */ 63 +#define KEY_F6 /* F6 0x40 */ 64 +#define KEY_F7 /* F7 0x41 */ 65 +#define KEY_F8 /* F8 0x42 */ 66 +#define KEY_F9 /* F9 0x43 */ 67 +#define KEY_F10 /* F10 0x44 */ 68 +#define KEY_NumLock /* NumLock 0x45 */ 69 +#define KEY_ScrollLock /* ScrollLock 0x46 */ 70 +#define KEY_KP_7 /* 7 Home 0x47 */ 71 +#define KEY_KP_8 /* 8 Up 0x48 */ 72 +#define KEY_KP_9 /* 9 PgUp 0x49 */ 73 +#define KEY_KP_Minus /* - (Minus) 0x4a */ 74 +#define KEY_KP_4 /* 4 Left 0x4b */ 75 +#define KEY_KP_5 /* 5 0x4c */ 76 +#define KEY_KP_6 /* 6 Right 0x4d */ 77 +#define KEY_KP_Plus /* + (Plus) 0x4e */ 78 +#define KEY_KP_1 /* 1 End 0x4f */ 79 +#define KEY_KP_2 /* 2 Down 0x50 */ 80 +#define KEY_KP_3 /* 3 PgDown 0x51 */ 81 +#define KEY_KP_0 /* 0 Insert 0x52 */ 82 +#define KEY_KP_Decimal /* . (Decimal) Delete 0x53 */ 83 +#define KEY_SysReqest /* SysReqest 0x54 */ 84 + /* NOTUSED 0x55 */ +#define KEY_Less /* < (Less) >(Greater) 0x56 */ 86 +#define KEY_F11 /* F11 0x57 */ 87 +#define KEY_F12 /* F12 0x58 */ 88 + +#define KEY_Prefix0 /* special 0x60 */ 96 +#define KEY_Prefix1 /* specail 0x61 */ 97 + +/* + * The 'scancodes' below are generated by the server, because the MF101/102 + * keyboard sends them as sequence of other scancodes + */ +#define KEY_Home /* Home 0x59 */ 89 +#define KEY_Up /* Up 0x5a */ 90 +#define KEY_PgUp /* PgUp 0x5b */ 91 +#define KEY_Left /* Left 0x5c */ 92 +#define KEY_Begin /* Begin 0x5d */ 93 +#define KEY_Right /* Right 0x5e */ 94 +#define KEY_End /* End 0x5f */ 95 +#define KEY_Down /* Down 0x60 */ 96 +#define KEY_PgDown /* PgDown 0x61 */ 97 +#define KEY_Insert /* Insert 0x62 */ 98 +#define KEY_Delete /* Delete 0x63 */ 99 +#define KEY_KP_Enter /* Enter 0x64 */ 100 +#define KEY_RCtrl /* Ctrl(right) 0x65 */ 101 +#define KEY_Pause /* Pause 0x66 */ 102 +#define KEY_Print /* Print 0x67 */ 103 +#define KEY_KP_Divide /* Divide 0x68 */ 104 +#define KEY_AltLang /* AtlLang(right) 0x69 */ 105 +#define KEY_Break /* Break 0x6a */ 106 +#define KEY_LMeta /* Left Meta 0x6b */ 107 +#define KEY_RMeta /* Right Meta 0x6c */ 108 +#define KEY_Menu /* Menu 0x6d */ 109 +#define KEY_F13 /* F13 0x6e */ 110 +#define KEY_F14 /* F14 0x6f */ 111 +#define KEY_F15 /* F15 0x70 */ 112 +#define KEY_HKTG /* Hirugana/Katakana tog 0x70 */ 112 +#define KEY_F16 /* F16 0x71 */ 113 +#define KEY_F17 /* F17 0x72 */ 114 +#define KEY_KP_DEC /* KP_DEC 0x73 */ 115 +#define KEY_BSlash2 /* \ _ 0x73 */ 115 +#define KEY_KP_Equal /* Equal (Keypad) 0x76 */ 118 +#define KEY_XFER /* Kanji Transfer 0x79 */ 121 +#define KEY_NFER /* No Kanji Transfer 0x7b */ 123 +#define KEY_Yen /* Yen 0x7d */ 125 + +#define KEY_Power /* Power Key 0x84 */ 132 +#define KEY_Mute /* Audio Mute 0x85 */ 133 +#define KEY_AudioLower /* Audio Lower 0x86 */ 134 +#define KEY_AudioRaise /* Audio Raise 0x87 */ 135 +#define KEY_Help /* Help 0x88 */ 136 +#define KEY_L1 /* Stop 0x89 */ 137 +#define KEY_L2 /* Again 0x8a */ 138 +#define KEY_L3 /* Props 0x8b */ 139 +#define KEY_L4 /* Undo 0x8c */ 140 +#define KEY_L5 /* Front 0x8d */ 141 +#define KEY_L6 /* Copy 0x8e */ 142 +#define KEY_L7 /* Open 0x8f */ 143 +#define KEY_L8 /* Paste 0x90 */ 144 +#define KEY_L9 /* Find 0x91 */ 145 +#define KEY_L10 /* Cut 0x92 */ 146 + +/* + * Fake 'scancodes' in the following ranges are generated for 2-byte + * codes not handled elsewhere. These correspond to most extended keys + * on so-called "Internet" keyboards: + * + * 0x79-0x93 + * 0x96-0xa1 + * 0xa3-0xac + * 0xb1-0xb4 + * 0xba-0xbd + * 0xc2 + * 0xcc-0xd2 + * 0xd6-0xf7 + */ + +/* + * Remapped 'scancodes' are generated for single-byte codes in the range + * 0x59-0x5f,0x62-0x76. These are used for some extra keys on some keyboards. + */ + +#define KEY_0x59 0x95 +#define KEY_0x5A 0xA2 +#define KEY_0x5B 0xAD +#define KEY_0x5C KEY_KP_EQUAL +#define KEY_0x5D 0xAE +#define KEY_0x5E 0xAF +#define KEY_0x5F 0xB0 +#define KEY_0x62 0xB5 +#define KEY_0x63 0xB6 +#define KEY_0x64 0xB7 +#define KEY_0x65 0xB8 +#define KEY_0x66 0xB9 +#define KEY_0x67 0xBE +#define KEY_0x68 0xBF +#define KEY_0x69 0xC0 +#define KEY_0x6A 0xC1 +#define KEY_0x6B 0xC3 +#define KEY_0x6C 0xC4 +#define KEY_0x6D 0xC5 +#define KEY_0x6E 0xC6 +#define KEY_0x6F 0xC7 +#define KEY_0x70 0xC8 +#define KEY_0x71 0xC9 +#define KEY_0x72 0xCA +#define KEY_0x73 0xCB +#define KEY_0x74 0xD3 +#define KEY_0x75 0xD4 +#define KEY_0x76 0xD5 + +/* These are for "notused" and "unknown" entries in translation maps. */ +#define KEY_NOTUSED 0 +#define KEY_UNKNOWN 255 + +#endif /* _ATKEYNAMES_H */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-keyboard-1.3.1/src/kbd.c new/xf86-input-keyboard-1.3.2/src/kbd.c --- old/xf86-input-keyboard-1.3.1/src/kbd.c 2008-05-21 21:39:38.000000000 +0200 +++ new/xf86-input-keyboard-1.3.2/src/kbd.c 2009-01-07 17:51:05.000000000 +0100 @@ -1,6 +1,3 @@ -/* $XdotOrg: driver/xf86-input-keyboard/src/kbd.c,v 1.19 2005/11/09 21:31:23 kem Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/keyboard/kbd.c,v 1.8 2003/11/03 05:11:47 tsi Exp $ */ - /* * Copyright (c) 2002 by The XFree86 Project, Inc. * Author: Ivan Pascal. @@ -12,7 +9,6 @@ * xf86Events.c and xf86Io.c which are * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany. */ -/* $XdotOrg: driver/xf86-input-keyboard/src/kbd.c,v 1.19 2005/11/09 21:31:23 kem Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -211,6 +207,39 @@ } } + +#define ModifierIsSet(k) ((modifiers & (k)) == (k)) + +static Bool +CommonSpecialKey(int key, Bool down, int modifiers) +{ + if ((!ModifierIsSet(ShiftMask)) && + (((ModifierIsSet(ControlMask | AltMask)) || + (ModifierIsSet(ControlMask | AltLangMask))))) { + switch (key) { + + case KEY_BackSpace: + xf86ProcessActionEvent(ACTION_TERMINATE, NULL); + break; + + /* + * The idea here is to pass the scancode down to a list of + * registered routines. There should be some standard conventions + * for processing certain keys. + */ + case KEY_KP_Minus: /* Keypad - */ + if (down) xf86ProcessActionEvent(ACTION_PREV_MODE, NULL); + break; + + case KEY_KP_Plus: /* Keypad + */ + if (down) xf86ProcessActionEvent(ACTION_NEXT_MODE, NULL); + break; + } + } + return FALSE; +} + + static InputInfoPtr KbdPreInit(InputDriverPtr drv, IDevPtr dev, int flags) { @@ -425,12 +454,14 @@ InitKBD(InputInfoPtr pInfo, Bool init) { char rad; - unsigned int i; xEvent kevent; KbdDevPtr pKbd = (KbdDevPtr) pInfo->private; +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 1 DeviceIntPtr pKeyboard = pInfo->dev; KeyClassRec *keyc = pKeyboard->key; KeySym *map = keyc->curKeySyms.map; + unsigned int i; +#endif kevent.u.keyButtonPointer.time = GetTimeInMillis(); kevent.u.keyButtonPointer.rootX = 0; @@ -649,7 +680,7 @@ } #ifndef TERMINATE_FALLBACK -#define TERMINATE_FALLBACK 1 +#define TERMINATE_FALLBACK 0 #endif #ifdef XKB if (noXkbExtension @@ -659,7 +690,7 @@ ) #endif { - if (xf86CommonSpecialKey(specialkey, down, keyc->state)) + if (CommonSpecialKey(specialkey, down, keyc->state)) return; if (pKbd->SpecialKey != NULL) if (pKbd->SpecialKey(pInfo, specialkey, down, keyc->state)) @@ -843,13 +874,8 @@ { static Bool Initialised = FALSE; - if (!Initialised) { + if (!Initialised) Initialised = TRUE; -#ifndef REMOVE_LOADER_CHECK_MODULE_INFO - if (xf86LoaderCheckSymbol("xf86AddModuleInfo")) -#endif - xf86AddModuleInfo(&KbdInfo, module); - } xf86AddInputDriver(&KBD, module, 0); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-keyboard-1.3.1/src/Makefile.am new/xf86-input-keyboard-1.3.2/src/Makefile.am --- old/xf86-input-keyboard-1.3.1/src/Makefile.am 2008-03-20 19:55:18.000000000 +0100 +++ new/xf86-input-keyboard-1.3.2/src/Makefile.am 2009-01-07 17:47:02.000000000 +0100 @@ -18,10 +18,11 @@ # 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. -driverdir = @inputdir@ -driver_LTLIBRARIES = kbd_drv.la +AM_CFLAGS = @XORG_CFLAGS@ +kbd_drv_la_LTLIBRARIES = kbd_drv.la kbd_drv_la_LDFLAGS = -avoid-version -module -kbd_drv_la_SOURCES = kbd.c xf86OSKbd.h xf86Keymap.h +kbd_drv_la_SOURCES = kbd.c xf86OSKbd.h xf86Keymap.h atKeynames.h +kbd_drv_ladir = @moduledir@/input BSD_SRCS = bsd_KbdMap.c bsd_kbd.c bsd_kbd.h at_scancode.c HURD_SRCS = hurd_kbd.c at_scancode.c diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-keyboard-1.3.1/src/sun_kbd.c new/xf86-input-keyboard-1.3.2/src/sun_kbd.c --- old/xf86-input-keyboard-1.3.1/src/sun_kbd.c 2008-03-20 19:55:18.000000000 +0100 +++ new/xf86-input-keyboard-1.3.2/src/sun_kbd.c 2009-01-07 17:35:10.000000000 +0100 @@ -219,8 +219,11 @@ int i; /* restore original state */ - - sunKbdSetLeds(pInfo, priv->oleds); + + if (priv->oleds != -1) { + sunKbdSetLeds(pInfo, priv->oleds); + priv->oleds = -1; + } if (priv->otranslation != -1) { SYSCALL(i = ioctl(pInfo->fd, KIOCTRANS, &priv->otranslation)); @@ -251,6 +254,7 @@ "%s: cannot pop module '%s' off keyboard device: %s\n", pInfo->name, priv->strmod, strerror(errno)); } + priv->strmod = NULL; } return Success; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-keyboard-1.3.1/src/sun_kbd.h new/xf86-input-keyboard-1.3.2/src/sun_kbd.h --- old/xf86-input-keyboard-1.3.1/src/sun_kbd.h 2008-03-20 19:55:18.000000000 +0100 +++ new/xf86-input-keyboard-1.3.2/src/sun_kbd.h 2009-01-07 17:35:10.000000000 +0100 @@ -34,7 +34,7 @@ Bool kbdActive; /* Have we set kbd modes for X? */ int otranslation; /* Original translation mode */ int odirect; /* Original "direct" mode setting */ - unsigned char oleds; /* Original LED state */ + int oleds; /* Original LED state */ const char * strmod; /* Streams module pushed on kbd device */ } sunKbdPrivRec, *sunKbdPrivPtr; ++++++ xf86-input-penmount-1.3.0.tar.bz2 -> xf86-input-penmount-1.4.0.tar.bz2 ++++++ ++++ 11464 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-penmount-1.3.0/ChangeLog new/xf86-input-penmount-1.4.0/ChangeLog --- old/xf86-input-penmount-1.3.0/ChangeLog 2008-03-20 21:37:54.000000000 +0100 +++ new/xf86-input-penmount-1.4.0/ChangeLog 2009-02-19 07:34:41.000000000 +0100 @@ -1,3 +1,88 @@ +commit 0536f70861f11192820439d36de951ef106d4e5e +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Thu Feb 19 16:32:32 2009 +1000 + + penmount 1.4.0 + +commit ae5faa7a024cf63b766b916ef09adf3e66d1a170 +Author: mjs <mjs@core7.eu> +Date: Tue Feb 17 01:48:43 2009 +0100 + + Add DMC9512 support #19885 + + Add new value for the ControllerModel option because we can not auto-detect it (looks like a DMC8910). + The only relevant difference between the DMC8910 and DMC9512 is the device initialization. + + Signed-off-by: mjs <mjs@core7.eu> + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +commit ec3379232341ea024b6fb2b612733fdb99537c5e +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Fri Jan 30 20:28:40 2009 -0800 + + Add README with pointers to mailing list, bugzilla & git repos + +commit 0627c2743471791f57fe8b8e96d7df3db676aca9 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Fri Jan 9 16:22:15 2009 -0800 + + Remove xorgconfig & xorgcfg from See Also list in man page + +commit e94c776512adba9398a01406e630271cf912bf21 +Author: Arrigo Marchiori <ardovm@yahoo.it> +Date: Thu Nov 20 09:57:34 2008 +1000 + + Fix y axis inversion for axis ranges with a non-zero minimum. + + Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com> + +commit d112cca181b9fc9586391e83b8c0ff26ca22ff9e +Author: Steve Bian <s@pictorii.com> +Date: Tue Sep 23 20:43:23 2008 +0930 + + Init axes according to configuration. + + When reporting mode is TS_Raw since we do no scaling, it will just be the + values in xorg.conf. If however reporting mode is TS_Scaled however, + xf86ScaleAxis will return a value between 0 screen_width/screen_height, so we + must setup the axis accordingly or there will be strange behaviour + + Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com> + +commit 22fca7467a943539b44a520a7b9d827508f01538 +Author: Steve Bian <s@pictorii.com> +Date: Tue Sep 23 20:42:33 2008 +0930 + + InvertY should be disabled by default. + + Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com> + +commit 8a9ff94e3db692736f86d52e569f65f6f363b0e0 +Author: Arrigo Marchiori <ardovm@yahoo.it> +Date: Sun Jun 22 18:00:57 2008 +0930 + + Fix scaling behaviour if the axes are swapped. #13535 + + First swapping, then inverting and scaling. I think it's the most + intuitive solution to the problem, because it makes minX, maxX & co. act on + the _actual_ X and Y axes, from the user/developer point of view. + + Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au> + + X.Org Bug 13535 <http://bugs.freedesktop.org/show_bug.cgi?id=13535> + +commit 5e1c22ff2c21cd20b204394731e2ad8ce1980091 +Author: Peter Hutterer <peter@cs.unisa.edu.au> +Date: Mon May 26 22:19:12 2008 +0930 + + Check for XINPUT ABI 3. + +commit d66c0b070d6a80b7b5d98cf364149fbc2df81fac +Author: Adam Jackson <ajax@redhat.com> +Date: Thu Mar 20 16:40:15 2008 -0400 + + penmount 1.3.0 + commit 600e029c61c012c7a7eb1075a805fbc01681962a Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> Date: Wed Jan 30 17:37:28 2008 -0200 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-penmount-1.3.0/configure.ac new/xf86-input-penmount-1.4.0/configure.ac --- old/xf86-input-penmount-1.3.0/configure.ac 2008-03-20 21:37:10.000000000 +0100 +++ new/xf86-input-penmount-1.4.0/configure.ac 2009-02-18 12:05:51.000000000 +0100 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-penmount], - 1.3.0, + 1.4.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-penmount) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-penmount-1.3.0/man/penmount.man new/xf86-input-penmount-1.4.0/man/penmount.man --- old/xf86-input-penmount-1.3.0/man/penmount.man 2008-03-20 19:55:44.000000000 +0100 +++ new/xf86-input-penmount-1.4.0/man/penmount.man 2009-02-18 03:48:01.000000000 +0100 @@ -33,6 +33,6 @@ .PP Config details... .SH "SEE ALSO" -__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__). +__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__). .SH AUTHORS Authors include... diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-penmount-1.3.0/README new/xf86-input-penmount-1.4.0/README --- old/xf86-input-penmount-1.3.0/README 1970-01-01 01:00:00.000000000 +0100 +++ new/xf86-input-penmount-1.4.0/README 2009-02-18 03:48:01.000000000 +0100 @@ -0,0 +1,20 @@ +xf86-input-penmount - PenMount 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-penmount + + http://cgit.freedesktop.org/xorg/driver/xf86-input-penmount + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-penmount-1.3.0/src/xf86PM.c new/xf86-input-penmount-1.4.0/src/xf86PM.c --- old/xf86-input-penmount-1.3.0/src/xf86PM.c 2008-03-20 19:55:44.000000000 +0100 +++ new/xf86-input-penmount-1.4.0/src/xf86PM.c 2009-02-18 12:04:13.000000000 +0100 @@ -4,6 +4,9 @@ * CoAuthor: Mayk Langer <langer@vsys.de> * * History: + * 02/01/2009: mjs <mjs@core7.eu> + * - Added DMC9512 controller protocol support + * based on old code from http://www.salt.com.tw/Download/Driver/PenMount/DMC9512/ * 09/16/2005: Jaya Kumar <jayakumar.xorg@gmail.com> * - Added DMC9000 controller protocol support * - DMC9000 support work was sponsored by CIS(M) Sdn Bhd @@ -105,7 +108,9 @@ "xf86CollectInputOptions", "xf86ErrorFVerb", "xf86FindOptionValue", +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 "xf86GetMotionEvents", +#endif "xf86GetVerbosity", "xf86MotionHistoryAllocate", "xf86NameCmp", @@ -175,6 +180,7 @@ { unsigned char map[] = {0, 1}; + int min_x, min_y, max_x, max_y; /* * these have to be here instead of in the SetupProc, because when the * SetupProc is run at server startup, screenInfo is not setup yet @@ -195,7 +201,10 @@ * Device reports motions on 2 axes in absolute coordinates. * Axes min and max values are reported in raw coordinates. */ - if (InitValuatorClassDeviceStruct (dev, 2, xf86GetMotionEvents, + if (InitValuatorClassDeviceStruct (dev, 2, +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 + xf86GetMotionEvents, +#endif pInfo->history_size, Absolute) == FALSE) { ErrorF ("Unable to allocate PenMount ValuatorClassDeviceStruct\n"); @@ -203,11 +212,33 @@ } else { - InitValuatorAxisStruct (dev, 0, priv->min_x, priv->max_x, + /* max_* min_* refer to the max/min values we will emit to the core. + * When reporting mode is TS_Raw since we do no scaling, it will + * just be the values in xorg.conf. If however reporting mode is + * TS_Scaled however, xf86ScaleAxis will return a value between 0 + * screen_width/screen_height, so we must setup the axis accordingly + * or there will be strange behaviour + */ + if ( priv->reporting_mode == TS_Raw ) + { + max_x = priv->max_x; + min_x = priv->min_x; + max_y = priv->max_y; + min_y = priv->min_y; + } + else + { + max_x = priv->screen_width; + min_x = 0; + max_y = priv->screen_height; + min_y = 0; + } + + InitValuatorAxisStruct (dev, 0, min_x, max_x, 9500, 0 /* min_res */ , 9500 /* max_res */ ); - InitValuatorAxisStruct (dev, 1, priv->min_y, priv->max_y, + InitValuatorAxisStruct (dev, 1, min_y, max_y, 10500, 0 /* min_res */ , 10500 /* max_res */ ); @@ -320,6 +351,119 @@ } +static Bool +DMC9512_ProcessDeviceOn(PenMountPrivatePtr priv, DeviceIntPtr dev, InputInfoPtr pInfo) +{ + unsigned char buf[5] = { 'D', 'G', 0x02, 0x80, 0x00 }; + + XisbBlockDuration (priv->buffer, 500000); + + if ( PenMountSendPacket(priv, buf, 5) != Success ) + { + return !Success; + } + + /* wait for right response */ + priv->lex_mode = PenMount_Response0; + + if (PenMountGetPacket (priv) != Success ) + { + return !Success; + } + + if ( ! (priv->packet[0] == 0xff && priv->packet[1] == 0x70) ) + { + return !Success; + } + + xf86Msg(X_NOTICE, "%s: DMC9512: found\n", pInfo->name); + priv->chip = DMC9512; + + /* disable DMC9512 */ + buf[2] = 0x0a; + buf[3] = 0x00; + buf[4] = 0x00; + PenMountSendPacket(priv,buf,5); + priv->lex_mode = PenMount_Response0; + PenMountGetPacket(priv); + + /* set screen width */ + buf[2] = 0x02; + buf[3] = 0x03; /*(priv->screen_width & 0x0fff) >> 8;*/ + buf[4] = 0xfc; /*priv->screen_width & 0xff;*/ + PenMountSendPacket(priv,buf,5); + priv->lex_mode = PenMount_Response0; + PenMountGetPacket(priv); + + /* set screen height */ + buf[2] = 0x02; + buf[3] = 0x13; /*(priv->screen_height & 0x0fff) >> 8;*/ + buf[4] = 0xfc; /*priv->screen_height & 0xff;*/ + buf[3] |= 0x10; + PenMountSendPacket(priv,buf,5); + priv->lex_mode = PenMount_Response0; + PenMountGetPacket(priv); + + /* Set Calibration Data */ + /* Set X-coordinate of the Left Top corner */ + buf[2] = 0x02; + buf[3] = 0x40; + buf[4] = 0x03; + PenMountSendPacket(priv,buf,5); + priv->lex_mode = PenMount_Response0; + PenMountGetPacket(priv); + + /* Set Y-coordinate of the Left Top corner */ + buf[2] = 0x02; + buf[3] = 0x50; + buf[4] = 0x03; + PenMountSendPacket(priv,buf,5); + priv->lex_mode = PenMount_Response0; + PenMountGetPacket(priv); + + /* Set X-coordinate of the Right bottom corner */ + buf[2] = 0x02; + buf[3] = 0x60; + buf[4] = 0xfc; + PenMountSendPacket(priv,buf,5); + priv->lex_mode = PenMount_Response0; + PenMountGetPacket(priv); + + /* Set Y-coordinate of the Right bottom corner */ + buf[2] = 0x02; + buf[3] = 0x70; + buf[4] = 0xfc; + PenMountSendPacket(priv,buf,5); + priv->lex_mode = PenMount_Response0; + PenMountGetPacket(priv); + + /* Set Screen Width Again */ + buf[2] = 0x02; + buf[3] = 0x03; + buf[4] = 0xfc; + PenMountSendPacket(priv,buf,5); + priv->lex_mode = PenMount_Response0; + PenMountGetPacket(priv); + + /* Set Screen Height Again */ + buf[2] = 0x02; + buf[3] = 0x13; + buf[4] = 0xfc; + PenMountSendPacket(priv,buf,5); + priv->lex_mode = PenMount_Response0; + PenMountGetPacket(priv); + + /* enable DMC9512 */ + buf[2] = 0x0a; + buf[3] = 0x01; + buf[4] = 0x00; + PenMountSendPacket(priv,buf,5); + priv->lex_mode = PenMount_Response0; + PenMountGetPacket(priv); + + return Success; +} + static InputInfoPtr PenMountPreInit(InputDriverPtr drv, IDevPtr dev, int flags) { @@ -384,7 +528,7 @@ priv->screen_num = xf86SetIntOption( pInfo->options, "ScreenNumber", 0 ); priv->button_number = xf86SetIntOption( pInfo->options, "ButtonNumber", 1 ); priv->swap_xy = xf86SetIntOption( pInfo->options, "SwapXY", 0 ); - priv->invert_y = xf86SetIntOption( pInfo->options, "InvertY", 1 ); + priv->invert_y = xf86SetIntOption( pInfo->options, "InvertY", 0 ); priv->buffer = NULL; s = xf86FindOptionValue (pInfo->options, "ReportingMode"); if ((s) && (xf86NameCmp (s, "raw") == 0)) @@ -397,6 +541,8 @@ priv->chip = DMC9000; pInfo->device_control = DMC9000_DeviceControl; pInfo->read_input = DMC9000_ReadInput; + } else if ((s) && (xf86NameCmp (s, "DMC9512") == 0)) { + priv->chip = DMC9512; } priv->proximity = FALSE; @@ -458,6 +604,18 @@ return (!Success); } /* if (isatty (pInfo->fd)) check if DMC8910 is found */ + + if (priv->chip == DMC9512) + { + if (DMC9512_ProcessDeviceOn(priv,dev,pInfo) != Success) + { + xf86Msg(X_WARNING, "%s: DMC9512: could not initialize", pInfo->name); + return !Success; + } + // else continue to the code below which does common stuff + // between 8910/9512 again + } + else { /* echo Success Code */ unsigned char buf[5] = { 'D', 'G', 0x02, 0x80, 0x00 }; @@ -545,7 +703,7 @@ XisbBlockDuration (priv->buffer, -1); while (1) { - if ( priv->chip != DMC8910 ) + if ( priv->chip != DMC8910 && priv->chip != DMC9512 ) { if ( PenMountGetPacket (priv) != Success) break; @@ -680,15 +838,15 @@ } x = ((((unsigned int) (priv->packet[1]&0x07)) << 7) | (priv->packet[2]&0x7F)); y = ((((unsigned int) (priv->packet[3]&0x07)) << 7) | (priv->packet[4]&0x7F)); - if (priv->invert_y) - { - y = priv->max_y - y; - } if ( priv->swap_xy) { tmp = y; y = x; - x = tmp; + x = tmp; + } + if (priv->invert_y) + { + y = priv->max_y - y + priv->min_y; } priv->packet[0] = priv->pen_down ? 0x01 : 0x00; @@ -870,7 +1028,7 @@ switch (priv->lex_mode) { case PenMount_byte0: - if ( priv->chip != DMC8910 ) + if ( priv->chip != DMC8910 && priv->chip != DMC9512 ) { if (!(c & 0x08) ) return (!Success); @@ -892,7 +1050,7 @@ case PenMount_byte2: priv->packet[2] = (unsigned char) c; priv->lex_mode = PenMount_byte0; - if ( priv->chip != DMC8910 ) + if ( priv->chip != DMC8910 && priv->chip != DMC9512 ) return (Success); if (( priv->packet[2] == 0xfe ) && ( priv->packet[1] == 0xfe )) return (Success); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-penmount-1.3.0/src/xf86PM.h new/xf86-input-penmount-1.4.0/src/xf86PM.h --- old/xf86-input-penmount-1.3.0/src/xf86PM.h 2008-03-20 19:55:44.000000000 +0100 +++ new/xf86-input-penmount-1.4.0/src/xf86PM.h 2009-02-18 12:04:13.000000000 +0100 @@ -74,6 +74,7 @@ #define CHIP_UNKNOWN 0 #define DMC8910 1 #define DMC9000 2 +#define DMC9512 3 /****************************************************************************** ++++++ xf86-input-vmmouse-12.6.2.tar.bz2 -> xf86-input-vmmouse-12.6.3.tar.bz2 ++++++ ++++ 5687 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-vmmouse-12.6.2/configure.ac new/xf86-input-vmmouse-12.6.3/configure.ac --- old/xf86-input-vmmouse-12.6.2/configure.ac 2008-11-14 19:29:46.000000000 +0100 +++ new/xf86-input-vmmouse-12.6.3/configure.ac 2008-12-22 06:15:28.000000000 +0100 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-vmmouse], - 12.6.2, + 12.6.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-vmmouse) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-vmmouse-12.6.2/missing new/xf86-input-vmmouse-12.6.3/missing --- old/xf86-input-vmmouse-12.6.2/missing 2007-02-27 20:35:39.000000000 +0100 +++ new/xf86-input-vmmouse-12.6.3/missing 2008-12-22 05:08:31.000000000 +0100 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2006-05-10.23 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. @@ -33,6 +33,8 @@ fi run=: +sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' +sed_minuso='s/.* -o \([^ ]*\).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -44,7 +46,7 @@ msg="missing on your system" -case "$1" in +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -77,6 +79,7 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -106,7 +109,7 @@ # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect # the program). -case "$1" in +case $1 in lex|yacc) # Not GNU programs, they don't have --version. ;; @@ -135,7 +138,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case "$1" in +case $1 in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -164,7 +167,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -192,8 +195,8 @@ You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -214,25 +217,25 @@ in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; @@ -244,18 +247,18 @@ in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; @@ -267,11 +270,9 @@ \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file @@ -289,11 +290,17 @@ DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` + file=`sed -n ' + /^@setfilename/{ + s/.* \([^ ]*\) *$/\1/ + p + q + }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi @@ -317,13 +324,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-vmmouse-12.6.2/src/Makefile.am new/xf86-input-vmmouse-12.6.3/src/Makefile.am --- old/xf86-input-vmmouse-12.6.2/src/Makefile.am 2008-10-22 03:41:50.000000000 +0200 +++ new/xf86-input-vmmouse-12.6.3/src/Makefile.am 2008-12-22 06:15:25.000000000 +0100 @@ -18,14 +18,12 @@ # 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. -SHARED_DIR = $(top_srcdir)/shared - @DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la @DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version -@DRIVER_NAME@_drv_la_LIBADD = $(SHARED_DIR)/lib@DRIVER_NAME@.la +@DRIVER_NAME@_drv_la_LIBADD = $(top_builddir)/shared/lib@DRIVER_NAME@.la @DRIVER_NAME@_drv_ladir = @inputdir@ -INCLUDES = -I$(SHARED_DIR) +INCLUDES = -I$(top_srcdir)/shared -@DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.c +@DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.c xf86OSmouse.h diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-vmmouse-12.6.2/src/xf86OSmouse.h new/xf86-input-vmmouse-12.6.3/src/xf86OSmouse.h --- old/xf86-input-vmmouse-12.6.2/src/xf86OSmouse.h 1970-01-01 01:00:00.000000000 +0100 +++ new/xf86-input-vmmouse-12.6.3/src/xf86OSmouse.h 2008-12-22 05:47:03.000000000 +0100 @@ -0,0 +1,277 @@ +/* + * Copyright (c) 1999-2003 by The XFree86 Project, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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 copyright holder(s) + * and author(s) 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 copyright holder(s) and author(s). + */ + +/* Public interface to OS-specific mouse support. */ + +#ifndef _XF86OSMOUSE_H_ +#define _XF86OSMOUSE_H_ + +#include "xf86Xinput.h" + +/* Mouse interface classes */ +#define MSE_NONE 0x00 +#define MSE_SERIAL 0x01 /* serial port */ +#define MSE_BUS 0x02 /* old bus mouse */ +#define MSE_PS2 0x04 /* standard read-only PS/2 */ +#define MSE_XPS2 0x08 /* extended PS/2 */ +#define MSE_AUTO 0x10 /* auto-detect (PnP) */ +#define MSE_MISC 0x20 /* The OS layer will identify the + * specific protocol names that are + * supported for this class. */ + +/* Mouse Protocol IDs. */ +typedef enum { + PROT_UNKNOWN = -2, + PROT_UNSUP = -1, /* protocol is not supported */ + PROT_MS = 0, + PROT_MSC, + PROT_MM, + PROT_LOGI, + PROT_LOGIMAN, + PROT_MMHIT, + PROT_GLIDE, + PROT_IMSERIAL, + PROT_THINKING, + PROT_ACECAD, + PROT_VALUMOUSESCROLL, + PROT_PS2, + PROT_GENPS2, + PROT_IMPS2, + PROT_EXPPS2, + PROT_THINKPS2, + PROT_MMPS2, + PROT_GLIDEPS2, + PROT_NETPS2, + PROT_NETSCPS2, + PROT_BM, + PROT_AUTO, + PROT_SYSMOUSE, + PROT_NUMPROTOS /* This must always be last. */ +} MouseProtocolID; + +struct _MouseDevRec; + +typedef int (*GetInterfaceTypesProc)(void); +typedef const char **(*BuiltinNamesProc)(void); +typedef Bool (*CheckProtocolProc)(const char *protocol); +typedef Bool (*BuiltinPreInitProc)(InputInfoPtr pInfo, const char *protocol, + int flags); +typedef const char *(*DefaultProtocolProc)(void); +typedef const char *(*SetupAutoProc)(InputInfoPtr pInfo, int *protoPara); +typedef void (*SetResProc)(InputInfoPtr pInfo, const char* protocol, int rate, + int res); +typedef const char *(*FindDeviceProc)(InputInfoPtr pInfo, const char *protocol, + int flags); +typedef const char *(*GuessProtocolProc)(InputInfoPtr pInfo, int flags); + +/* + * OSMouseInfoRec is used to pass information from the OSMouse layer to the + * OS-independent mouse driver. + */ +typedef struct { + GetInterfaceTypesProc SupportedInterfaces; + BuiltinNamesProc BuiltinNames; + CheckProtocolProc CheckProtocol; + BuiltinPreInitProc PreInit; + DefaultProtocolProc DefaultProtocol; + SetupAutoProc SetupAuto; + SetResProc SetPS2Res; + SetResProc SetBMRes; + SetResProc SetMiscRes; + FindDeviceProc FindDevice; + GuessProtocolProc GuessProtocol; +} OSMouseInfoRec, *OSMouseInfoPtr; + +/* + * SupportedInterfaces: Returns the mouse interface types that the OS support. + * If MSE_MISC is returned, then the BuiltinNames and + * CheckProtocol should be set. + * + * BuiltinNames: Returns the names of the protocols that are fully handled + * in the OS-specific code. These are names that don't appear + * directly in the main "mouse" driver. + * + * CheckProtocol: Checks if the protocol name given is supported by the + * OS. It should return TRUE for both "builtin" protocols and + * protocols of type MSE_MISC that are supported by the OS. + * + * PreInit: The PreInit function for protocols that are builtin. This + * function is passed the protocol name. + * + * DefaultProtocol: Returns the name of a default protocol that should be used + * for the OS when none has been supplied in the config file. + * This should only be set when there is a reasonable default. + * + * SetupAuto: This function can be used to do OS-specific protocol + * auto-detection. It returns the name of the detected protocol, + * or NULL when detection fails. It may also adjust one or more + * of the "protoPara" values for the detected protocol by setting + * then to something other than -1. SetupAuto gets called in two + * ways. The first is before any devices have been opened. This + * can be used when the protocol "Auto" always maps to a single + * protocol type. The second is with the device open, allowing + * OS-specific probing to be done. + * + * SetPS2Res: Set the resolution and sample rate for MSE_PS2 and MSE_XPS2 + * protocol types. + * + * SetBMRes: Set the resolution and sample rate for MSE_BM protocol types. + * + * SetMiscRes: Set the resolution and sample rate for MSE_MISC protocol types. + * + * FindDevice: This function gets called when no Device has been specified + * in the config file. OS-specific methods may be used to guess + * which input device to use. This function is called after the + * pre-open attempts at protocol discovery are done, but before + * the device is open. I.e., after the first SetupAuto() call, + * after the DefaultProtocol() call, but before the PreInit() + * call. Available protocol information may be used in locating + * the default input device. + * + * GuessProtocol: A last resort attempt at guessing the mouse protocol by + * whatever OS-specific means might be available. OS-independent + * things should be in the mouse driver. This function gets + * called after the mouse driver's OS-independent methods have + * failed. + */ + +extern OSMouseInfoPtr xf86OSMouseInit(int flags); + +/* Adjust this when the mouse interface changes. */ + +/* + * History: + * + * 1.0.0 - Everything up to when versioning was started. + * 1.1.0 - FindDevice and GuessProtocol added to OSMouseInfoRec + * 1.2.0 - xisbscale added to MouseDevRec + * + */ + +/* Z axis mapping */ +#define MSE_NOZMAP 0 +#define MSE_MAPTOX -1 +#define MSE_MAPTOY -2 +#define MSE_MAPTOZ -3 +#define MSE_MAPTOW -4 + +/* Generalize for other axes. */ +#define MSE_NOAXISMAP MSE_NOZMAP + +#define MSE_MAXBUTTONS 24 +#define MSE_DFLTBUTTONS 3 + +/* + * Mouse device record. This is shared by the mouse driver and the OSMouse + * layer. + */ + +typedef void (*checkMovementsProc)(InputInfoPtr,int, int); +typedef void (*autoProbeProc)(InputInfoPtr, Bool, Bool); +typedef Bool (*collectDataProc)(struct _MouseDevRec *, unsigned char); +typedef Bool (*dataGoodProc)(struct _MouseDevRec *); + +typedef void (*PostMseEventProc)(InputInfoPtr pInfo, int buttons, + int dx, int dy, int dz, int dw); +typedef void (*MouseCommonOptProc)(InputInfoPtr pInfo); + +typedef struct _MouseDevRec { + PtrCtrlProcPtr Ctrl; + PostMseEventProc PostEvent; + MouseCommonOptProc CommonOptions; + DeviceIntPtr device; + const char * mseDevice; + const char * protocol; + MouseProtocolID protocolID; + MouseProtocolID oldProtocolID; /* hack */ + int class; + int mseModel; + int baudRate; + int oldBaudRate; + int sampleRate; + int lastButtons; + int threshold; /* acceleration */ + int num; + int den; + int buttons; /* # of buttons */ + int emulateState; /* automata state for 2 button mode */ + Bool emulate3Buttons; + Bool emulate3ButtonsSoft; + int emulate3Timeout;/* Timeout for 3 button emulation */ + Bool chordMiddle; + Bool flipXY; + int invX; + int invY; + int mouseFlags; /* Flags to Clear after opening + * mouse dev */ + int truebuttons; /* (not used) + * Arg to maintain before + * emulate3buttons timer callback */ + int resolution; + int negativeZ; /* button mask */ + int positiveZ; /* button mask */ + int negativeW; /* button mask */ + int positiveW; /* button mask */ + pointer buffer; /* usually an XISBuffer* */ + int protoBufTail; + unsigned char protoBuf[8]; + unsigned char protoPara[8]; + unsigned char inSync; /* driver in sync with datastream */ + pointer mousePriv; /* private area */ + InputInfoPtr pInfo; + int origProtocolID; + const char * origProtocol; + Bool emulate3Pending;/* timer waiting */ + CARD32 emulate3Expires;/* time to fire emulation code */ + Bool emulateWheel; + int wheelInertia; + int wheelButton; + int negativeX; /* Button values. Unlike the Z and */ + int positiveX; /* W equivalents, these are button */ + int negativeY; /* values rather than button masks. */ + int positiveY; + int wheelYDistance; + int wheelXDistance; + Bool autoProbe; + checkMovementsProc checkMovements; + autoProbeProc autoProbeMouse; + collectDataProc collectData; + dataGoodProc dataGood; + int angleOffset; + pointer pDragLock; /* drag lock area */ + int xisbscale; /* buffer size for 1 event */ + int wheelButtonTimeout;/* Timeout for the wheel button emulation */ + CARD32 wheelButtonExpires; + int doubleClickSourceButtonMask; + int doubleClickTargetButton; + int doubleClickTargetButtonMask; + int doubleClickOldSourceState; + int lastMappedButtons; + int buttonMap[MSE_MAXBUTTONS]; +} MouseDevRec, *MouseDevPtr; + +#endif /* _XF86OSMOUSE_H_ */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-vmmouse-12.6.2/tools/Makefile.am new/xf86-input-vmmouse-12.6.3/tools/Makefile.am --- old/xf86-input-vmmouse-12.6.2/tools/Makefile.am 2008-10-24 06:52:03.000000000 +0200 +++ new/xf86-input-vmmouse-12.6.3/tools/Makefile.am 2008-12-22 06:15:25.000000000 +0100 @@ -20,11 +20,10 @@ bin_PROGRAMS = @DRIVER_NAME@_detect -SHARED_PATH = $(top_srcdir)/shared -INCLUDES = -I$(SHARED_PATH) +INCLUDES = -I$(top_srcdir)/shared @DRIVER_NAME@_detect_SOURCES = vmmouse_detect.c -@DRIVER_NAME@_detect_LDADD = $(SHARED_PATH)/lib@DRIVER_NAME@.la +@DRIVER_NAME@_detect_LDADD = $(top_builddir)/shared/lib@DRIVER_NAME@.la calloutsdir=$(HAL_CALLOUTS_DIR) callouts_SCRIPTS = hal-probe-vmmouse @@ -32,7 +31,7 @@ hal-probe-vmmouse: sed -e 's|__BIN_PREFIX__|$(bindir)|g' \ -e 's|__HAL_BIN_PREFIX__|$(HAL_BIN_DIR)|g' \ - < $@.in > $@ + < $(srcdir)/$@.in > $@ EXTRA_DIST = hal-probe-vmmouse.in ++++++ xf86-input-void-1.1.1.tar.bz2 -> xf86-input-void-1.2.0.tar.bz2 ++++++ ++++ 28653 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-void-1.1.1/ChangeLog new/xf86-input-void-1.2.0/ChangeLog --- old/xf86-input-void-1.1.1/ChangeLog 2007-09-07 21:38:23.000000000 +0200 +++ new/xf86-input-void-1.2.0/ChangeLog 2009-02-24 23:54:12.000000000 +0100 @@ -1,3 +1,48 @@ +commit c1932081e5a6ba2f6196b8f862fe246668e92124 +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Wed Feb 25 08:52:53 2009 +1000 + + void 1.2.0 + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +commit 2154cf5b31c7868e32e1cdc6865ed32c2bff5e88 +Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> +Date: Thu Feb 5 17:30:18 2009 -0200 + + Janitor: update for ABI_XINPUT_VERSION >= 5 + + This driver should be seen as the simplest possible input + driver, and somewhat as a skeleton/model for newer ones. + Having it at least compiling with current xorg sdk is a plus. + + Signed-off-by: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +commit 48295279acfcd2b6902daa49a5eb944318240586 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Thu Jan 29 14:54:32 2009 -0800 + + Add README with pointers to mailing list, bugzilla & git repos + +commit 2d53d8bf892c39e9a327676da37e766d51557877 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Fri Jan 9 16:24:27 2009 -0800 + + Remove xorgconfig & xorgcfg from See Also list in man page + +commit 2ad046c73fd4bf1b880cc19899d161b07608c8c3 +Author: Peter Hutterer <peter@cs.unisa.edu.au> +Date: Mon May 26 22:24:22 2008 +0930 + + Check for XINPUT ABI 3. + +commit b57f5e54c8a2ee15d83be98a739e16b2595fdf28 +Author: Matthieu Herrb <matthieu@bluenote.herrb.net> +Date: Sat Mar 8 23:18:51 2008 +0100 + + Makefile.am: nuke RCS Id + commit 4e43b6206bc719d68ced1ca793ca4e3b938d8e8e Author: Alan Coopersmith <alan.coopersmith@sun.com> Date: Fri Sep 7 12:36:56 2007 -0700 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-void-1.1.1/configure.ac new/xf86-input-void-1.2.0/configure.ac --- old/xf86-input-void-1.1.1/configure.ac 2007-09-07 21:34:44.000000000 +0200 +++ new/xf86-input-void-1.2.0/configure.ac 2009-02-24 23:52:52.000000000 +0100 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-void], - 1.1.1, + 1.2.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-void) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-void-1.1.1/man/Makefile.am new/xf86-input-void-1.2.0/man/Makefile.am --- old/xf86-input-void-1.1.1/man/Makefile.am 2006-07-11 04:46:26.000000000 +0200 +++ new/xf86-input-void-1.2.0/man/Makefile.am 2008-04-16 08:25:54.000000000 +0200 @@ -1,4 +1,3 @@ -# $Id$ # # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-void-1.1.1/man/void.man new/xf86-input-void-1.2.0/man/void.man --- old/xf86-input-void-1.1.1/man/void.man 2007-02-28 01:34:01.000000000 +0100 +++ new/xf86-input-void-1.2.0/man/void.man 2009-01-29 07:46:21.000000000 +0100 @@ -24,6 +24,6 @@ details and for options that can be used with all input drivers. This driver doesn't have any configuration options in addition to those. .SH "SEE ALSO" -__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__). +__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__). .SH AUTHORS Authors include... diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-void-1.1.1/README new/xf86-input-void-1.2.0/README --- old/xf86-input-void-1.1.1/README 1970-01-01 01:00:00.000000000 +0100 +++ new/xf86-input-void-1.2.0/README 2009-02-15 00:16:42.000000000 +0100 @@ -0,0 +1,20 @@ +xf86-input-void - null input driver for Xorg 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-void + + http://cgit.freedesktop.org/xorg/driver/xf86-input-void + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-void-1.1.1/src/void.c new/xf86-input-void-1.2.0/src/void.c --- old/xf86-input-void-1.1.1/src/void.c 2007-09-07 18:47:15.000000000 +0200 +++ new/xf86-input-void-1.2.0/src/void.c 2009-02-15 00:19:12.000000000 +0100 @@ -57,6 +57,7 @@ /****************************************************************************** * Function/Macro keys variables *****************************************************************************/ +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 5 static KeySym void_map[] = { NoSymbol, NoSymbol, NoSymbol, NoSymbol, @@ -130,6 +131,7 @@ /* map minKeyCode maxKeyCode width */ void_map, 8, 255, 1 }; +#endif /* GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 5 */ static const char *DEFAULTS[] = { NULL @@ -172,6 +174,10 @@ InputInfoPtr pInfo; unsigned char map[MAXBUTTONS + 1]; int i; +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5 + XkbRMLVOSet rmlvo; +#endif + Bool result; pInfo = device->public.devicePrivate; @@ -202,14 +208,25 @@ return !Success; } */ - if (InitKeyboardDeviceStruct((DevicePtr)device, &void_keysyms, NULL, BellProc, KeyControlProc) == FALSE) { + +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5 + memset(&rmlvo, 0, sizeof(XkbRMLVOSet)); + result = InitKeyboardDeviceStruct(device, &rmlvo, + BellProc, KeyControlProc); +#else + result = InitKeyboardDeviceStruct((DevicePtr)device, &void_keysyms, + NULL, BellProc, KeyControlProc); +#endif + if (!result) { ErrorF("unable to init keyboard device\n"); return !Success; } if (InitValuatorClassDeviceStruct(device, 2, - xf86GetMotionEvents, +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 + xf86GetMotionEvents, +#endif 0, Absolute) == FALSE) { InitValuatorAxisStruct(device, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org