--- xserver-xorg-input-evdev-2.6.0.orig/autogen.sh +++ xserver-xorg-input-evdev-2.6.0/autogen.sh @@ -0,0 +1,12 @@ +#! /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 "$@" --- xserver-xorg-input-evdev-2.6.0.orig/debian/xserver-xorg-input-evdev.links +++ xserver-xorg-input-evdev-2.6.0/debian/xserver-xorg-input-evdev.links @@ -0,0 +1 @@ +usr/share/bug/xserver-xorg-core/script usr/share/bug/xserver-xorg-input-evdev/script --- xserver-xorg-input-evdev-2.6.0.orig/debian/copyright +++ xserver-xorg-input-evdev-2.6.0/debian/copyright @@ -0,0 +1,100 @@ +This package was downloaded from +git://anongit.freedesktop.org/git/xorg/driver/xf86-input-evdev. +Release tarballs are available at +http://xorg.freedesktop.org/releases/individual/driver/ + +Various copyright notices found in this driver: + +Copyright © 2004-2008 Red Hat, Inc. + +Permission to use, copy, modify, distribute, and sell this software +and its documentation for any purpose is hereby granted without +fee, provided that the above copyright notice appear in all copies +and that both that copyright notice and this permission notice +appear in supporting documentation, and that the name of Red Hat +not be used in advertising or publicity pertaining to distribution +of the software without specific, written prior permission. Red +Hat makes no representations about the suitability of this software +for any purpose. It is provided "as is" without express or implied +warranty. + +THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN +NO EVENT SHALL THE AUTHORS 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 2005 Sun Microsystems, Inc. All rights reserved. + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of the copyright holders 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 holders. + +Copyright © 2008 University of South Australia +copyrights taken from xf86-input-mouse, partly valid for this driver. +Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany. +Copyright 1993 by David Dawes +Copyright 2002 by SuSE Linux AG, Author: Egbert Eich +Copyright 1994-2002 by The XFree86 Project, Inc. +Copyright 2002 by Paul Elliott + +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 the authors +not be used in advertising or publicity pertaining to distribution of the +software without specific, written prior permission. The authors make no +representations about the suitability of this software for any +purpose. It is provided "as is" without express or implied +warranty. + +THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN +NO EVENT SHALL THE AUTHORS 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 2005 Adam Jackson. + +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 +on the rights to use, copy, modify, merge, publish, distribute, sub +license, and/or sell copies of the Software, and to permit persons to whom +the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL +ADAM JACKSON 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. + --- xserver-xorg-input-evdev-2.6.0.orig/debian/compat +++ xserver-xorg-input-evdev-2.6.0/debian/compat @@ -0,0 +1 @@ +5 --- xserver-xorg-input-evdev-2.6.0.orig/debian/xserver-xorg-input-evdev-udeb.install +++ xserver-xorg-input-evdev-2.6.0/debian/xserver-xorg-input-evdev-udeb.install @@ -0,0 +1 @@ +usr/lib/xorg/modules/input/*.so --- xserver-xorg-input-evdev-2.6.0.orig/debian/control +++ xserver-xorg-input-evdev-2.6.0/debian/control @@ -0,0 +1,69 @@ +Source: xserver-xorg-input-evdev +Section: x11 +Priority: optional +Maintainer: Ubuntu X-SWAT +XSBC-Original-Maintainer: Debian X Strike Force +Uploaders: David Nusinow , Drew Parsons , Brice Goglin , Cyril Brulebois +Build-Depends: + debhelper (>= 5.0.0), + pkg-config, + quilt, + xserver-xorg-dev (>= 2:1.9.99.902-2ubuntu1), + x11proto-core-dev, + x11proto-randr-dev, + x11proto-input-dev (>= 2.0.1-1ubuntu1), + x11proto-kb-dev, + libxkbfile-dev, + dpkg-dev (>= 1.14.17), + automake, + libtool, + xutils-dev (>= 1:7.5+4), + libutouch-grail-dev (>= 1.0.10), + libmtdev-dev +Standards-Version: 3.8.4 +Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-evdev +Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-evdev.git + +Package: xserver-xorg-input-evdev +Architecture: linux-any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${xinpdriver:Depends}, + libutouch-grail1 (>= 1.0.19), + xserver-xorg-core (>= 2:1.9.99.902-2ubuntu1) +Provides: ${xinpdriver:Provides} +Replaces: xserver-xorg (<< 6.8.2-35), xserver-xorg-input-gevdev +Conflicts: xserver-xorg-input-gevdev +Description: X.Org X server -- evdev input driver + This package provides the driver for input devices using evdev, the Linux + kernel's event delivery mechanism. This driver allows for multiple keyboards + and mice to be treated as separate input devices. + . + More information about X.Org can be found at: + + . + This package is built from the X.org xf86-input-evdev driver module. + +Package: xserver-xorg-input-evdev-udeb +XC-Package-Type: udeb +Section: debian-installer +Architecture: linux-any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}, + udev-udeb [linux-any], + libutouch-grail1-udeb (>= 1.0.19), + xserver-xorg-core-udeb (>= 2:1.9.99.902-2ubuntu1) +Provides: ${xinpdriver:Provides} +Description: X.Org X server -- evdev input driver + This is a udeb, or a microdeb, for the debian-installer. + +Package: xserver-xorg-input-evdev-dev +Section: libdevel +Architecture: all +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: X.Org X server -- evdev input driver (development headers) + This package provides the development headers for the evdev input driver + found in xserver-xorg-input-evdev. Non-developers likely have little use + for this package. + . + More information about X.Org can be found at: + + . + This package is built from the X.org xf86-input-evdev driver module. --- xserver-xorg-input-evdev-2.6.0.orig/debian/watch +++ xserver-xorg-input-evdev-2.6.0/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://xorg.freedesktop.org/releases/individual/driver/ xf86-input-evdev-(.*)\.tar\.gz --- xserver-xorg-input-evdev-2.6.0.orig/debian/xserver-xorg-input-evdev-dev.install +++ xserver-xorg-input-evdev-2.6.0/debian/xserver-xorg-input-evdev-dev.install @@ -0,0 +1,3 @@ +usr/include/xorg/* +usr/lib/pkgconfig/xorg-evdev.pc + --- xserver-xorg-input-evdev-2.6.0.orig/debian/rules +++ xserver-xorg-input-evdev-2.6.0/debian/rules @@ -0,0 +1,117 @@ +#!/usr/bin/make -f +# debian/rules for the Debian xserver-xorg-input-evdev package. +# Copyright © 2004 Scott James Remnant +# Copyright © 2005 Daniel Stone +# Copyright © 2005 David Nusinow + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include debian/xsfbs/xsfbs.mk + +CFLAGS = -Wall -g +ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + MAKEFLAGS += -j$(NUMJOBS) +endif + +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + confflags += --build=$(DEB_HOST_GNU_TYPE) +else + confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) +endif + +# kbd_drv.a isn't phenomenally useful; kbd_drv.so more so +confflags += --disable-static + +# enable grail for gesture support +confflags += --enable-grail + +configure: $(STAMP_DIR)/patch + autoreconf -vfi + +build/config.status: configure + mkdir -p build + cd build && \ + ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info $(confflags) \ + CFLAGS="$(CFLAGS)" + +build: build-stamp +build-stamp: build/config.status + dh_testdir + cd build && $(MAKE) + >$@ + +clean: xsfclean + dh_testdir + dh_testroot + rm -f build-stamp + + rm -f config.cache config.log config.status + rm -f */config.cache */config.log */config.status + rm -f conftest* */conftest* + rm -rf autom4te.cache */autom4te.cache + rm -rf build + rm -f $$(find -name Makefile.in) + rm -f compile config.guess config.sub configure depcomp install-sh + rm -f ltmain.sh missing INSTALL aclocal.m4 ylwrap mkinstalldirs config.h.in + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install + +# Build architecture-dependent files here. +binary-arch: DH_OPTIONS=-s +binary-arch: build install serverabi + dh_testdir + dh_testroot + + dh_installdocs + dh_installchangelogs ChangeLog + dh_install --sourcedir=debian/tmp --list-missing --exclude=evdev_drv.la + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps -- --warnings=6 + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture-independent files here. +binary-indep: DH_OPTIONS=-i +binary-indep: build install + dh_testdir + dh_testroot + dh_installdocs + dh_installchangelogs + dh_install --sourcedir=debian/tmp + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- xserver-xorg-input-evdev-2.6.0.orig/debian/xserver-xorg-input-evdev.manpages +++ xserver-xorg-input-evdev-2.6.0/debian/xserver-xorg-input-evdev.manpages @@ -0,0 +1 @@ +debian/tmp/usr/share/man/man4/* --- xserver-xorg-input-evdev-2.6.0.orig/debian/changelog +++ xserver-xorg-input-evdev-2.6.0/debian/changelog @@ -0,0 +1,605 @@ +xserver-xorg-input-evdev (1:2.6.0-1ubuntu12) natty; urgency=low + + * Another fix for event handling for devices that provide proximity events + (LP: #573006) + + -- Chase Douglas Thu, 14 Apr 2011 16:09:18 -0400 + +xserver-xorg-input-evdev (1:2.6.0-1ubuntu11) natty; urgency=low + + [ Chase Douglas ] + * Fix event handling for devices that provide proximity events (LP: #573006) + + [ Timo Aaltonen ] + * Add debian/local/11-evdev-quirks.conf and install it to sysconfigdir. + Included is a quirk to enable middle button emulation for the Ubuntu + branded travel mouse (LP: #746639) + + -- Timo Aaltonen Mon, 04 Apr 2011 16:58:27 +0300 + +xserver-xorg-input-evdev (1:2.6.0-1ubuntu10) natty; urgency=low + + * Set event window correctly for global gesture event + (LP: #728696) + + -- Chase Douglas Fri, 04 Mar 2011 15:27:14 -0500 + +xserver-xorg-input-evdev (1:2.6.0-1ubuntu9) natty; urgency=low + + [ Chase Douglas ] + * Fix evdev when handling devices with full array of abs axes (LP: #725202) + + -- Alberto Milone Tue, 01 Mar 2011 16:56:14 +0100 + +xserver-xorg-input-evdev (1:2.6.0-1ubuntu8) natty; urgency=low + + * Make xserver-xorg-input-evdev-udeb depend on xserver-xorg-core-udeb, not + xserver-xorg-core. + + -- Colin Watson Wed, 23 Feb 2011 15:05:58 +0000 + +xserver-xorg-input-evdev (1:2.6.0-1ubuntu7) natty; urgency=low + + * Drop 100-fix-touchup-problem-on-touchpads.patch + - Upstream fixed the issue + * Add xi 2.1 support + - Added 100-xi2.1.patch + - Refreshed 101-gestures.patch + - Bump dependency on xserver-xorg-dev for xi 2.1 + - Add new xi 2.1 dependency on libmtdev-dev and libutouch-grail1-dev + - Bump runtime dependency on libutouch-grail1 to 1.0.19 + * Revert rule for Magic Trackpad, synaptics will handle it now + + -- Chase Douglas Mon, 21 Feb 2011 18:50:15 -0500 + +xserver-xorg-input-evdev (1:2.6.0-1ubuntu6) natty; urgency=low + + * debian/control: Bump xserver build-depend to really, really rebuild against + Xserver 1.10 + + -- Christopher James Halse Rogers Tue, 01 Feb 2011 20:41:10 +1100 + +xserver-xorg-input-evdev (1:2.6.0-1ubuntu5) natty; urgency=low + + * No-change rebuild against xserver 1.10 + + -- Bryce Harrington Mon, 31 Jan 2011 19:04:25 -0800 + +xserver-xorg-input-evdev (1:2.6.0-1ubuntu4) natty; urgency=low + + [ Chase Douglas ] + * debian/patches/101-gestures.patch: Fix SIGSEGV in xserver, + re-enable. + + -- Bryce Harrington Mon, 31 Jan 2011 15:49:24 -0800 + +xserver-xorg-input-evdev (1:2.6.0-1ubuntu3) natty; urgency=low + + * Make xserver-xorg-input-evdev-udeb explicitly depend on + libutouch-grail1-udeb, to match the explicit dependency in + xserver-xorg-input-evdev. + + -- Colin Watson Mon, 31 Jan 2011 11:44:35 +0000 + +xserver-xorg-input-evdev (1:2.6.0-1ubuntu2) natty; urgency=low + + * Disable patch 101-gestures.patch - Fix SIGSEGV in xserver. + (LP: #709977) + + -- Bryce Harrington Sun, 30 Jan 2011 10:06:05 -0800 + +xserver-xorg-input-evdev (1:2.6.0-1ubuntu1) natty; urgency=low + + [ Robert Hooker ] + * Merge from Debian Experimental. Remaining Ubuntu changes: + - Set default input module to evdev for Apple Magic Mouse (LP 637430) + - Add debian/local/60-magictrackpad.conf + - Add gesture support + - Add debian/patches/100-fix-touchup-problem-on-touchpads.patch and + debian/patches/101-gestures.patch + - debian/rules: add configure option to enable utouch-grail support + - Replace xserver-xorg-input-gevdev as it was a temporary solution + - Depend on newer utouch-grail for udebs and ABI changes + + [ Christopher James Halse Rogers ] + * 100-fix-touchup-problem-on-touchpads.patch: + * 101-gestures.patch: + - Refresh for new upstream + + -- Christopher James Halse Rogers Fri, 28 Jan 2011 10:54:01 +1100 + +xserver-xorg-input-evdev (1:2.6.0-1) experimental; urgency=low + + * New upstream release. + + -- Cyril Brulebois Tue, 11 Jan 2011 15:40:01 +0100 + +xserver-xorg-input-evdev (1:2.5.99.903-1) experimental; urgency=low + + * New upstream release candidate. + + -- Cyril Brulebois Wed, 05 Jan 2011 01:33:36 +0100 + +xserver-xorg-input-evdev (1:2.5.99.901-2) experimental; urgency=low + + * Switch Architecture for all binary packages from any to linux-any + since this driver is Linux-only. + * Cherry-pick bed25600 from upstream to fix crashes in + GetProximityEvents (Closes: #605374). + + -- Cyril Brulebois Tue, 04 Jan 2011 16:06:52 +0100 + +xserver-xorg-input-evdev (1:2.5.99.901-1) experimental; urgency=low + + * New upstream release. + + -- Cyril Brulebois Mon, 22 Nov 2010 15:50:51 +0100 + +xserver-xorg-input-evdev (1:2.5.0-1) experimental; urgency=low + + [ Robert Hooker ] + * New upstream release. + * Bump xutils-dev build dep for new util-macros. + + [ Cyril Brulebois ] + * New upstream release fixes some bugs: + - Forward keycodes > 255 (Closes: #500096). + - No longer list README.mouse (Closes: #590529). + + -- Cyril Brulebois Thu, 21 Oct 2010 19:49:10 +0200 + +xserver-xorg-input-evdev (1:2.3.2-7) experimental; urgency=low + + * Build against Xserver 1.9.1 rc1. + + -- Cyril Brulebois Tue, 12 Oct 2010 23:52:24 +0200 + +xserver-xorg-input-evdev (1:2.3.2-6ubuntu3) maverick; urgency=low + + * Set default input module to evdev for Apple Magic Mouse (LP: #637430) + - Add debian/local/60-magictrackpad.conf + + -- Chase Douglas Thu, 16 Sep 2010 09:38:26 +0200 + +xserver-xorg-input-evdev (1:2.3.2-6ubuntu2) maverick; urgency=low + + * Add 102-magic-mouse.patch - Patch from Chase Douglas to set default + input module to evdev for Apple Magic Mouse + (LP: #637430) + + -- Bryce Harrington Wed, 15 Sep 2010 16:13:54 -0700 + +xserver-xorg-input-evdev (1:2.3.2-6ubuntu1) maverick; urgency=low + + * Add gesture support + - Add debian/patches/100-fix-touchup-problem-on-touchpads.patch and + debian/patches/101-gestures.patch + - debian/rules: + - add configure option to enable utouch-grail support + * Replace xserver-xorg-input-gevdev as it was a temporary solution + * Depend on newer utouch-grail for udebs and ABI changes + * Build depend on latest xserver-xorg-dev for serverminver dependency + + -- Chase Douglas Fri, 20 Aug 2010 16:47:09 -0400 + +xserver-xorg-input-evdev (1:2.3.2-6) unstable; urgency=low + + [ Julien Cristau ] + * Drop 05-evdev.conf, this moved to the server. + * Build-Depend on xserver-xorg-dev 1.7.6.901. + * Sanitize manpage installation. + * Update to new xsfbs, use ${xinpdriver:Depends} in debian/control. + + -- Cyril Brulebois Sat, 17 Apr 2010 21:40:15 +0200 + +xserver-xorg-input-evdev (1:2.3.2-5) unstable; urgency=low + + * Install 05-evdev.conf in /usr/lib/X11/xorg.conf.d. + * Remove 65-xorg-evdev.rules, obsoleted by the above. + * Drop the postinst, and don't depend on udev. + + -- Timo Aaltonen Tue, 30 Mar 2010 21:40:54 +0300 + +xserver-xorg-input-evdev (1:2.3.2-4) unstable; urgency=low + + [ Julien Cristau ] + * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no + good reason. Thanks, Colin Watson! + * Remove myself from Uploaders + * 65-xorg-evdev.rules: only set x11_driver for event devices. + + [ Robert Hooker ] + * Build xserver-xorg-input-evdev-dev on arch: all. + + [ Cyril Brulebois ] + * Add udeb needed for the graphical installer: + xserver-xorg-input-evdev-udeb. + * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed). + * Add myself to Uploaders. + + -- Cyril Brulebois Fri, 12 Mar 2010 01:02:58 +0100 + +xserver-xorg-input-evdev (1:2.3.2-3) unstable; urgency=low + + * 65-xorg-evdev.rules: instead of blacklisting joysticks, explicitly + whitelist keyboards, mice, touchscreens and touchpads (closes: #564219). + We'll need a better solution, but this should do for now. + * No need to test for linux in postinst, this package only exists on linux. + + -- Julien Cristau Tue, 12 Jan 2010 10:36:54 +0000 + +xserver-xorg-input-evdev (1:2.3.2-2) unstable; urgency=low + + [ Timo Aaltonen ] + * evdev.rules: Skip joysticks, since using evdev for those is + generally considered as a bad idea. Use -joystick instead. + + [ Julien Cristau ] + * evdev.rules: Match on ID_INPUT instead of device name + subsystem. + * Upload to unstable. + + -- Julien Cristau Thu, 07 Jan 2010 20:21:57 +0000 + +xserver-xorg-input-evdev (1:2.3.2-1) experimental; urgency=low + + [ Timo Aaltonen ] + * Build against Xserver 1.7. + * Run udevadm trigger on postinst, and depend on udev [linux-any]. + * Add xserver-xorg-input-evdev-dev for the header and .pc files. + + [ Julien Cristau ] + * 65-xorg-evdev.rules: don't ignore change events. + + [ Brice Goglin ] + * New upstream release. + + -- Brice Goglin Sat, 12 Dec 2009 17:56:22 +0100 + +xserver-xorg-input-evdev (1:2.3.1-1) experimental; urgency=low + + * New upstream release. + + Finalize the middle button emulation when a read error occurs + (closes: #550970, #552012) + * Replace the fdi file with an udev rule. + + -- Julien Cristau Sat, 28 Nov 2009 20:42:52 +0100 + +xserver-xorg-input-evdev (1:2.2.99.1-1) experimental; urgency=low + + * New upstream snapshot. + * Bump build-dep on xutils-dev for new xorg-macros. + * Build against xserver 1.7 RC. + * Bump Standards-Version to 3.8.3. + + -- Julien Cristau Tue, 29 Sep 2009 21:04:26 +0200 + +xserver-xorg-input-evdev (1:2.2.5-1) unstable; urgency=low + + * New upstream release. + + -- Brice Goglin Fri, 21 Aug 2009 07:18:07 +0200 + +xserver-xorg-input-evdev (1:2.2.4-1) unstable; urgency=low + + * New upstream release. + + -- Brice Goglin Thu, 06 Aug 2009 07:29:42 +0200 + +xserver-xorg-input-evdev (1:2.2.3-1) unstable; urgency=low + + * New upstream release. + + Fix corrupted mouse motion events sending pointer to + top-left of screen, cloces: #528994. + * Add README.source, bump Standards-Version to 3.8.2. + + -- Brice Goglin Thu, 30 Jul 2009 09:14:44 +0200 + +xserver-xorg-input-evdev (1:2.2.2-1) unstable; urgency=low + + * New upstream release. + * Add myself to Uploaders. + + -- Brice Goglin Thu, 30 Apr 2009 08:59:58 +0200 + +xserver-xorg-input-evdev (1:2.2.1-1) unstable; urgency=low + + * New upstream release. + * Upload to unstable. + + -- Julien Cristau Thu, 09 Apr 2009 01:16:36 +0100 + +xserver-xorg-input-evdev (1:2.1.1-1) experimental; urgency=low + + * New upstream release. + * Update debian/copyright from upstream's COPYING. + * Build against xserver 1.6 rc1. + + -- Julien Cristau Wed, 21 Jan 2009 21:58:47 +0100 + +xserver-xorg-input-evdev (1:2.1.0-1) experimental; urgency=low + + [ Timo Aaltonen ] + * New upstream release. + + Store device file's minor/major to avoid duplicate devices + (closes: #505635) + + [ Julien Cristau ] + * debian/control: update the long description. We don't do "clever" device + matching anymore, that's hal/udev's job. Also drop the mention of + 'Protocol "evdev"', which unexists since quite a while. + + -- Julien Cristau Wed, 26 Nov 2008 19:27:26 +0100 + +xserver-xorg-input-evdev (1:2.0.99.3-1) experimental; urgency=low + + [ Timo Aaltonen ] + * rules: Clean config.h.in. + + [ Julien Cristau ] + * New upstream release. + + don't grab the device by default + + close the device on DEVICE_OFF, and reopen it on DEVICE_ON + (closes: #496101, #492146) + * Drop patch included upstream. + * Install (temporarily) an fdi file to get Xorg to load the evdev driver for + mice and keyboards. + * Depend on xserver-xorg-core >= 2:1.5.3, to make sure the console is set to + RAW mode. + + -- Julien Cristau Wed, 12 Nov 2008 20:22:57 +0100 + +xserver-xorg-input-evdev (1:2.0.3-2) experimental; urgency=low + + * Build against xserver 1.5 rc6. + * Run autoreconf at build time; build-depend on automake, libtool and + xutils-dev. + * Add support for parallel builds. + + -- Julien Cristau Mon, 04 Aug 2008 13:38:46 +0200 + +xserver-xorg-input-evdev (1:2.0.3-1) unstable; urgency=low + + * New upstream release, incorporates the two fixes from our previous + version. + * Pull from evdev-2.0-branch: + - Print the device name when we get a read error + - Actually close the fd on DEVICE_CLOSE + + -- Julien Cristau Mon, 04 Aug 2008 13:05:52 +0200 + +xserver-xorg-input-evdev (1:2.0.2-1.lenny1) unstable; urgency=low + + * Pull two fixes from upstream + - Fix EVIOCGBIT ioctl usage on big endian platforms + - Fill up the version info + + -- Julien Cristau Wed, 30 Jul 2008 11:30:53 +0200 + +xserver-xorg-input-evdev (1:2.0.2-1) unstable; urgency=low + + * New upstream release + + fixes mice with lots of buttons (Closes: #491061) + + -- Julien Cristau Fri, 18 Jul 2008 22:21:17 +0200 + +xserver-xorg-input-evdev (1:2.0.1-1) unstable; urgency=low + + [ Julien Cristau, Timo Aaltonen ] + * New upstream release. + + [ Julien Cristau ] + * Drop the XS- prefix from Vcs-* control fields. + * Drop evdev_no_flush_on_init.diff, obsolete. + * New patch include-the-proper-header-for-XkbSetRulesDflts-and-X.patch, fix + a 'missing declaration' compiler warning by including the right header. + * Run dpkg-shlibdeps with --warnings=6. Drivers reference symbols from + /usr/bin/Xorg and other modules, and that's not a bug, so we want + dpkg-shlibdeps to shut up about symbols it can't find. Build-depend on + dpkg-dev >= 1.14.17. + * Fix target dependencies in debian/rules. + + -- Julien Cristau Sun, 13 Jul 2008 15:37:13 +0200 + +xserver-xorg-input-evdev (1:1.2.0-1) unstable; urgency=low + + * New upstream releases + + includes manpage fixes from Peter Samuelson (close: #446118) + + drop evdev_man_illegal_char.patch, included upstream + * Bump Standards-Version to 3.7.3. + + -- Julien Cristau Thu, 06 Dec 2007 17:05:24 +0100 + +xserver-xorg-input-evdev (1:1.2.0~git20070819-4) unstable; urgency=low + + * New patch evdev_no_flush_on_init.diff: don't send button release events on + init. + + -- Julien Cristau Tue, 13 Nov 2007 21:27:37 +0100 + +xserver-xorg-input-evdev (1:1.2.0~git20070819-3) unstable; urgency=low + + * Upload to unstable + + -- David Nusinow Sun, 16 Sep 2007 15:13:36 -0400 + +xserver-xorg-input-evdev (1:1.2.0~git20070819-2) experimental; urgency=low + + * Build against xserver 1.4. + + -- Julien Cristau Mon, 10 Sep 2007 16:30:28 +0200 + +xserver-xorg-input-evdev (1:1.2.0~git20070819-1) experimental; urgency=low + + * New git snapshot from upstream's master branch. + + manpage typos fixed (closes: #432063). Thanks, A. Costa! + * Build against xserver 1.3.99.0. + * Update debian/copyright. + * Generate the Provides field automatically. + * Add myself to uploaders, and remove Branden with his permission. + * Drop build-dep on linux-kernel-headers, which is provided by + build-essential. + + -- Julien Cristau Sun, 19 Aug 2007 17:22:09 +0200 + +xserver-xorg-input-evdev (1:1.1.5-3) unstable; urgency=low + + * Cherry-pick commit 987c6b15: don't call xf86OSRingBell() which isn't + available anymore (closes: #430539). + + -- Julien Cristau Sat, 07 Jul 2007 19:21:43 +0200 + +xserver-xorg-input-evdev (1:1.1.5-2) unstable; urgency=low + + [ Julien Cristau ] + * Generate the dependency on xserver-xorg-core automatically. + * Upload to unstable. + + [ Brice Goglin ] + * Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902 + (needed to let xsfbs get access to serverminver). + * Add XS-Vcs-*. + * Add a link to www.X.org and a reference to the xf86-input-evdev + module in the long description. + * Remove Fabio from uploaders with his permission. He's always welcome back. + + -- Julien Cristau Thu, 03 May 2007 20:18:03 +0200 + +xserver-xorg-input-evdev (1:1.1.5-1) experimental; urgency=low + + [ Julien Cristau ] + * Add link to xserver-xorg-core bug script, so that bugreports contain + the user's config and log files. + * Bump dependency on xserver-xorg-core to >= 2:1.1.1-11, as previous + versions don't have the bug script. + * New upstream release. + + Drop all patches, applied upstream. + * New patch to replace "ø" with "\(/o" in the evdev(4) manpage. + * Make debian/rules clean depend on xsfclean, to make sure that patches are + unapplied and everything is cleaned up. + + -- Drew Parsons Mon, 19 Mar 2007 19:36:42 +1100 + +xserver-xorg-input-evdev (1:1.1.2-6) unstable; urgency=low + + * Apply upstream patch 30-absolute-axis.patch to avert potential + crashes in the absolute axis setup. + * Also apply 40-close-fd.patch, as the last "trivial" patch from + upstream before the major changes of 1.1.3. + * Use dh_installman to install man pages. + + -- Drew Parsons Sun, 5 Nov 2006 21:37:25 +1100 + +xserver-xorg-input-evdev (1:1.1.2-5) unstable; urgency=low + + * Applied upstream patches 10-bitfield-fixes.patch and + 11-bitops-fixes.patch to define bit operations. Closes: #395510. + The former contains the hppa inotify patch, so rework + 1-add-inotify-architectures.patch into + 20-add-inotify-architectures.patch to accommodate. Also, deleted + the trivial man patch from 10-bitfield-fixes.patch, it was not + applying neatly. + + -- Drew Parsons Wed, 1 Nov 2006 20:05:50 +1100 + +xserver-xorg-input-evdev (1:1.1.2-4) unstable; urgency=low + + * Fix versioned depends: xserver-xorg-core (>= 2:1.1.1-1) (see + #391508) since it is built against xserver-xorg-dev (>= 2:1.1.1-1). + However the specific versioned build-depends is not needed since + it is not required in configure.ac (the driver could be built + against older xserver versions). + + -- Drew Parsons Fri, 27 Oct 2006 22:13:15 +1000 + +xserver-xorg-input-evdev (1:1.1.2-3) unstable; urgency=low + + * Add patch rule to build rule to debian/rules to get + 1-add-inotify-architectures.patch applied. Run autoreconf and + update config.{guess,sub} for good measure. + + -- Drew Parsons Sun, 24 Sep 2006 10:02:45 +1000 + +xserver-xorg-input-evdev (1:1.1.2-2) unstable; urgency=low + + [ Andres Salomon ] + * Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build; + idempotency fix. + + [ Drew Parsons ] + * Upstream patch 1-add-inotify-architectures.patch enables building + for hppa, mips (from git upstream) and m68k (thanks Geert Uytterhoeven). + Closes: #387922, #388639. + * Install upstream ChangeLog. Closes: #370300. + * Exclude evdev_drv.la from dh_install. + + -- Drew Parsons Sun, 24 Sep 2006 01:51:55 +1000 + +xserver-xorg-input-evdev (1:1.1.2-1) unstable; urgency=low + + * New upstream release + + Now includes manpage (closes: #362679) + + Doesn't suck (closes: #365581) + * Run dh_install with --list-missing + * Bump debhelper compat to 5 + * Bump standards version to 3.7.2.0 + * Add x11proto-kb-dev to build-depends + + -- David Nusinow Tue, 30 May 2006 22:37:01 -0400 + +xserver-xorg-input-evdev (1:1.0.0.5-2) unstable; urgency=low + + * Upload to modular + + -- David Nusinow Sun, 26 Mar 2006 20:25:00 -0500 + +xserver-xorg-input-evdev (1:1.0.0.5-1) experimental; urgency=low + + * First upload to Debian + * Change source package, package, and provides names to denote the + type of driver and that they are for xserver-xorg + + -- David Nusinow Thu, 19 Jan 2006 20:40:34 -0500 + +xserver-xorg-input-evdev (1:1.0.0.5-0ubuntu1) dapper; urgency=low + + * New upstream release. + * Add provides on xserver-xorg-input. + + -- Daniel Stone Wed, 4 Jan 2006 19:42:22 +1100 + +xserver-xorg-input-evdev (1:1.0.0.4-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Mon, 19 Dec 2005 08:55:27 +1100 + +xserver-xorg-input-evdev (1:1.0.0.3-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Mon, 12 Dec 2005 13:37:47 +1100 + +xserver-xorg-input-evdev (1:1.0.0.2-0ubuntu2) dapper; urgency=low + + * Add missing Build-Depends (x11proto-core-dev, x11proto-randr-dev, + x11proto-input-dev). + + -- Daniel Stone Mon, 5 Dec 2005 12:47:45 +1100 + +xserver-xorg-input-evdev (1:1.0.0.2-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Tue, 22 Nov 2005 13:20:15 +1100 + +xserver-xorg-input-evdev (1:1.0.0.1-1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Tue, 25 Oct 2005 16:52:45 +1000 + +xserver-xorg-input-evdev (1:1.0.0-1) breezy; urgency=low + + * First xserver-xorg-input-evdev release. + + -- Daniel Stone Wed, 6 Jul 2005 15:48:17 +1000 --- xserver-xorg-input-evdev-2.6.0.orig/debian/README.source +++ xserver-xorg-input-evdev-2.6.0/debian/README.source @@ -0,0 +1,73 @@ +------------------------------------------------------ +Quick Guide To Patching This Package For The Impatient +------------------------------------------------------ + +1. Make sure you have quilt installed +2. Unpack the package as usual with "dpkg-source -x" +3. Run the "patch" target in debian/rules +4. Create a new patch with "quilt new" (see quilt(1)) +5. Edit all the files you want to include in the patch with "quilt edit" + (see quilt(1)). +6. Write the patch with "quilt refresh" (see quilt(1)) +7. Run the "clean" target in debian/rules + +Alternatively, instead of using quilt directly, you can drop the patch in to +debian/patches and add the name of the patch to debian/patches/series. + +------------------------------------ +Guide To The X Strike Force Packages +------------------------------------ + +The X Strike Force team maintains X packages in git repositories on +git.debian.org in the pkg-xorg subdirectory. Most upstream packages +are actually maintained in git repositories as well, so they often +just need to be pulled into git.debian.org in a "upstream-*" branch. +Otherwise, the upstream sources are manually installed in the Debian +git repository. + +The .orig.tar.gz upstream source file could be generated using this +"upstream-*" branch in the Debian git repository but it is actually +copied from upstream tarballs directly. + +Due to X.org being highly modular, packaging all X.org applications +as their own independent packages would have created too many Debian +packages. For this reason, some X.org applications have been grouped +into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils, +x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils. +Most packages, including the X.org server itself and all libraries +and drivers are, however maintained independently. + +The Debian packaging is added by creating the "debian-*" git branch +which contains the aforementioned "upstream-*" branch plus the debian/ +repository files. +When a patch has to be applied to the Debian package, two solutions +are involved: +* If the patch is available in one of the upstream branches, it + may be git'cherry-picked into the Debian repository. In this + case, it appears directly in the .diff.gz. +* Otherwise, the patch is added to debian/patches/ which is managed + with quilt as documented in /usr/share/doc/quilt/README.source. + +quilt is actually invoked by the Debian X packaging through a larger +set of scripts called XSFBS. XSFBS brings some other X specific +features such as managing dependencies and conflicts due to the video +and input driver ABIs. +XSFBS itself is maintained in a separate repository at + git://git.debian.org/pkg-xorg/xsfbs.git +and it is pulled inside the other Debian X repositories when needed. + +The XSFBS patching system requires a build dependency on quilt. Also +a dependency on $(STAMP_DIR)/patch has to be added to debian/rules +so that the XSFBS patching occurs before the actual build. So the +very first target of the build (likely the one running autoreconf) +should depend on $(STAMP_DIR)/patch. It should also not depend on +anything so that parallel builds are correctly supported (nothing +should probably run while patching is being done). And finally, the +clean target should depend on the xsfclean target so that patches +are unapplied on clean. + +When the upstream sources contain some DFSG-nonfree files, they are +listed in text files in debian/prune/ in the "debian-*" branch of +the Debian repository. XSFBS' scripts then take care of removing +these listed files during the build so as to generate a modified +DFSG-free .orig.tar.gz tarball. --- xserver-xorg-input-evdev-2.6.0.orig/debian/xserver-xorg-input-evdev.install +++ xserver-xorg-input-evdev-2.6.0/debian/xserver-xorg-input-evdev.install @@ -0,0 +1,3 @@ +usr/lib/xorg/modules/input/*.so +usr/share/man +../local/11-evdev-quirks.conf usr/share/X11/xorg.conf.d/ --- xserver-xorg-input-evdev-2.6.0.orig/debian/xsfbs/xsfbs.sh +++ xserver-xorg-input-evdev-2.6.0/debian/xsfbs/xsfbs.sh @@ -0,0 +1,622 @@ +# This is the X Strike Force shell library for X Window System package +# maintainer scripts. It serves to define shell functions commonly used by +# such packages, and performs some error checking necessary for proper operation +# of those functions. By itself, it does not "do" much; the maintainer scripts +# invoke the functions defined here to accomplish package installation and +# removal tasks. + +# If you are reading this within a Debian package maintainer script (e.g., +# /var/lib/dpkg/info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can +# skip past this library by scanning forward in this file to the string +# "GOBSTOPPER". + +SOURCE_VERSION=@SOURCE_VERSION@ +OFFICIAL_BUILD=@OFFICIAL_BUILD@ + +# Use special abnormal exit codes so that problems with this library are more +# easily tracked down. +SHELL_LIB_INTERNAL_ERROR=86 +SHELL_LIB_THROWN_ERROR=74 +SHELL_LIB_USAGE_ERROR=99 + +# old -> new variable names +if [ -z "$DEBUG_XORG_PACKAGE" ] && [ -n "$DEBUG_XFREE86_PACKAGE" ]; then + DEBUG_XORG_PACKAGE="$DEBUG_XFREE86_PACKAGE" +fi +if [ -z "$DEBUG_XORG_DEBCONF" ] && [ -n "$DEBUG_XFREE86_DEBCONF" ]; then + DEBUG_XORG_DEBCONF="$DEBUG_XFREE86_DEBCONF" +fi + +# initial sanity checks +if [ -z "$THIS_PACKAGE" ]; then + cat >&2 < on the World Wide Web for +instructions, read the file /usr/share/doc/debian/bug-reporting.txt from the +"doc-debian" package, or install the "reportbug" package and use the command of +the same name to file a report against version $SOURCE_VERSION of this package. +EOF + exit $SHELL_LIB_USAGE_ERROR +fi + +if [ -z "$THIS_SCRIPT" ]; then + cat >&2 < on the World Wide Web for +instructions, read the file /usr/share/doc/debian/bug-reporting.txt from the +"doc-debian" package, or install the "reportbug" package and use the command of +the same name to file a report against version $SOURCE_VERSION of the +"$THIS_PACKAGE" package. +EOF + exit $SHELL_LIB_USAGE_ERROR +fi + +if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then + RECONFIGURE="true" +else + RECONFIGURE= +fi + +if ([ "$1" = "install" ] || [ "$1" = "configure" ]) && [ -z "$2" ]; then + FIRSTINST="yes" +fi + +if [ -z "$RECONFIGURE" ] && [ -z "$FIRSTINST" ]; then + UPGRADE="yes" +fi + +trap "message;\ + message \"Received signal. Aborting $THIS_PACKAGE package $THIS_SCRIPT script.\";\ + message;\ + exit 1" HUP INT QUIT TERM + +reject_nondigits () { + # syntax: reject_nondigits [ operand ... ] + # + # scan operands (typically shell variables whose values cannot be trusted) for + # characters other than decimal digits and barf if any are found + while [ -n "$1" ]; do + # does the operand contain anything but digits? + if ! expr "$1" : "[[:digit:]]\+$" > /dev/null 2>&1; then + # can't use die(), because it wraps message() which wraps this function + echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_nondigits() encountered" \ + "possibly malicious garbage \"$1\"" >&2 + exit $SHELL_LIB_THROWN_ERROR + fi + shift + done +} + +reject_unlikely_path_chars () { + # syntax: reject_unlikely_path_chars [ operand ... ] + # + # scan operands (typically shell variables whose values cannot be trusted) for + # characters unlikely to be seen in a path and which the shell might + # interpret and barf if any are found + while [ -n "$1" ]; do + # does the operand contain any funny characters? + if expr "$1" : '.*[!$&()*;<>?|].*' > /dev/null 2>&1; then + # can't use die(), because I want to avoid forward references + echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_unlikely_path_chars()" \ + "encountered possibly malicious garbage \"$1\"" >&2 + exit $SHELL_LIB_THROWN_ERROR + fi + shift + done +} + +# Query the terminal to establish a default number of columns to use for +# displaying messages to the user. This is used only as a fallback in the +# event the COLUMNS variable is not set. ($COLUMNS can react to SIGWINCH while +# the script is running, and this cannot, only being calculated once.) +DEFCOLUMNS=$(stty size 2> /dev/null | awk '{print $2}') || true +if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" > /dev/null 2>&1; then + DEFCOLUMNS=80 +fi + +message () { + # pretty-print messages of arbitrary length + reject_nondigits "$COLUMNS" + echo "$*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS} >&2 +} + +observe () { + # syntax: observe message ... + # + # issue observational message suitable for logging someday when support for + # it exists in dpkg + if [ -n "$DEBUG_XORG_PACKAGE" ]; then + message "$THIS_PACKAGE $THIS_SCRIPT note: $*" + fi +} + +warn () { + # syntax: warn message ... + # + # issue warning message suitable for logging someday when support for + # it exists in dpkg; also send to standard error + message "$THIS_PACKAGE $THIS_SCRIPT warning: $*" +} + +die () { + # syntax: die message ... + # + # exit script with error message + message "$THIS_PACKAGE $THIS_SCRIPT error: $*" + exit $SHELL_LIB_THROWN_ERROR +} + +internal_error () { + # exit script with error; essentially a "THIS SHOULD NEVER HAPPEN" message + message "internal error: $*" + if [ -n "$OFFICIAL_BUILD" ]; then + message "Please report a bug in the $THIS_SCRIPT script of the" \ + "$THIS_PACKAGE package, version $SOURCE_VERSION to the Debian Bug" \ + "Tracking System. Include all messages above that mention the" \ + "$THIS_PACKAGE package. Visit " \ + " on the World Wide Web for" \ + "instructions, read the file" \ + "/usr/share/doc/debian/bug-reporting.txt from the doc-debian" \ + "package, or install the reportbug package and use the command of" \ + "the same name to file a report." + fi + exit $SHELL_LIB_INTERNAL_ERROR +} + +usage_error () { + message "usage error: $*" + message "Please report a bug in the $THIS_SCRIPT script of the" \ + "$THIS_PACKAGE package, version $SOURCE_VERSION to the Debian Bug" \ + "Tracking System. Include all messages above that mention the" \ + "$THIS_PACKAGE package. Visit " \ + " on the World Wide Web for" \ + "instructions, read the file" \ + "/usr/share/doc/debian/bug-reporting.txt from the doc-debian" \ + "package, or install the reportbug package and use the command of" \ + "the same name to file a report." + exit $SHELL_LIB_USAGE_ERROR +} + +font_update () { + # run $UPDATECMDS in $FONTDIRS + + local dir cmd shortcmd x_font_dir_prefix + + x_font_dir_prefix="/usr/share/fonts/X11" + + if [ -z "$UPDATECMDS" ]; then + usage_error "font_update() called but \$UPDATECMDS not set" + fi + if [ -z "$FONTDIRS" ]; then + usage_error "font_update() called but \$FONTDIRS not set" + fi + + reject_unlikely_path_chars "$UPDATECMDS" + reject_unlikely_path_chars "$FONTDIRS" + + for dir in $FONTDIRS; do + if [ -d "$x_font_dir_prefix/$dir" ]; then + for cmd in $UPDATECMDS; do + if which "$cmd" > /dev/null 2>&1; then + shortcmd=${cmd##*/} + observe "running $shortcmd in $dir font directory" + cmd_opts= + if [ "$shortcmd" = "update-fonts-alias" ]; then + cmd_opts=--x11r7-layout + fi + if [ "$shortcmd" = "update-fonts-dir" ]; then + cmd_opts=--x11r7-layout + fi + if [ "$shortcmd" = "update-fonts-scale" ]; then + cmd_opts=--x11r7-layout + fi + $cmd $cmd_opts $dir || warn "$cmd $cmd_opts $dir" \ + "failed; font directory data may not" \ + "be up to date" + else + warn "$cmd not found; not updating corresponding $dir font" \ + "directory data" + fi + done + else + warn "$dir is not a directory; not updating font directory data" + fi + done +} + +remove_conffile_prepare () { + # syntax: remove_conffile_prepare filename official_md5sum ... + # + # Check a conffile "filename" against a list of canonical MD5 checksums. + # If the file's current MD5 checksum matches one of the "official_md5sum" + # operands provided, then prepare the conffile for removal from the system. + # We defer actual deletion until the package is configured so that we can + # roll this operation back if package installation fails. + # + # Call this function from a preinst script in the event $1 is "upgrade" or + # "install" and verify $2 to ensure the package is being upgraded from a + # version (or installed over a version removed-but-not-purged) prior to the + # one in which the conffile was obsoleted. + + local conffile current_checksum + + # validate arguments + if [ $# -lt 2 ]; then + usage_error "remove_conffile_prepare() called with wrong number of" \ + "arguments; expected at least 2, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + conffile="$1" + shift + + # does the conffile even exist? + if [ -e "$conffile" ]; then + # calculate its checksum + current_checksum=$(md5sum < "$conffile" | sed 's/[[:space:]].*//') + # compare it to each supplied checksum + while [ -n "$1" ]; do + if [ "$current_checksum" = "$1" ]; then + # we found a match; move the confffile and stop looking + observe "preparing obsolete conffile $conffile for removal" + mv "$conffile" "$conffile.$THIS_PACKAGE-tmp" + break + fi + shift + done + fi +} + +remove_conffile_lookup () { + # syntax: remove_conffile_lookup package filename + # + # Lookup the md5sum of a conffile in dpkg's database, and prepare for removal + # if it matches the actual file's md5sum. + # + # Call this function when you would call remove_conffile_prepare but only + # want to check against dpkg's status database instead of known checksums. + + local package conffile old_md5sum + + # validate arguments + if [ $# -ne 2 ]; then + usage_error "remove_conffile_lookup() called with wrong number of" \ + "arguments; expected 1, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + package="$1" + conffile="$2" + + if ! [ -e "$conffile" ]; then + return + fi + old_md5sum="$(dpkg-query -W -f='${Conffiles}' "$package" | \ + awk '{ if (match($0, "^ '"$conffile"' ")) print $2}')" + if [ -n "$old_md5sum" ]; then + remove_conffile_prepare "$conffile" "$old_md5sum" + fi +} + +remove_conffile_commit () { + # syntax: remove_conffile_commit filename + # + # Complete the removal of a conffile "filename" that has become obsolete. + # + # Call this function from a postinst script after having used + # remove_conffile_prepare() in the preinst. + + local conffile + + # validate arguments + if [ $# -ne 1 ]; then + usage_error "remove_conffile_commit() called with wrong number of" \ + "arguments; expected 1, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + conffile="$1" + + # if the temporary file created by remove_conffile_prepare() exists, remove it + if [ -e "$conffile.$THIS_PACKAGE-tmp" ]; then + observe "committing removal of obsolete conffile $conffile" + rm "$conffile.$THIS_PACKAGE-tmp" + fi +} + +remove_conffile_rollback () { + # syntax: remove_conffile_rollback filename + # + # Roll back the removal of a conffile "filename". + # + # Call this function from a postrm script in the event $1 is "abort-upgrade" + # or "abort-install" is after having used remove_conffile_prepare() in the + # preinst. + + local conffile + + # validate arguments + if [ $# -ne 1 ]; then + usage_error "remove_conffile_rollback() called with wrong number of" \ + "arguments; expected 1, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + conffile="$1" + + # if the temporary file created by remove_conffile_prepare() exists, move it + # back + if [ -e "$conffile.$THIS_PACKAGE-tmp" ]; then + observe "rolling back removal of obsolete conffile $conffile" + mv "$conffile.$THIS_PACKAGE-tmp" "$conffile" + fi +} + +replace_conffile_with_symlink_prepare () { + # syntax: replace_conffile_with_symlink_prepare oldfilename newfilename \ + # official_md5sum ... + # + # Check a conffile "oldfilename" against a list of canonical MD5 checksums. + # If the file's current MD5 checksum matches one of the "official_md5sum" + # operands provided, then prepare the conffile for removal from the system. + # We defer actual deletion until the package is configured so that we can + # roll this operation back if package installation fails. Otherwise copy it + # to newfilename and let dpkg handle it through conffiles mechanism. + # + # Call this function from a preinst script in the event $1 is "upgrade" or + # "install" and verify $2 to ensure the package is being upgraded from a + # version (or installed over a version removed-but-not-purged) prior to the + # one in which the conffile was obsoleted. + + local conffile current_checksum + + # validate arguments + if [ $# -lt 3 ]; then + usage_error "replace_conffile_with_symlink_prepare() called with wrong" \ + " number of arguments; expected at least 3, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + oldconffile="$1" + shift + newconffile="$1" + shift + + remove_conffile_prepare "$_oldconffile" "$@" + # If $oldconffile still exists, then md5sums didn't match. + # Copy it to new one. + if [ -f "$oldconffile" ]; then + cp "$oldconffile" "$newconffile" + fi + +} + +replace_conffile_with_symlink_commit () { + # syntax: replace_conffile_with_symlink_commit oldfilename + # + # Complete the removal of a conffile "oldfilename" that has been + # replaced by a symlink. + # + # Call this function from a postinst script after having used + # replace_conffile_with_symlink_prepare() in the preinst. + + local conffile + + # validate arguments + if [ $# -ne 1 ]; then + usage_error "replace_conffile_with_symlink_commit() called with wrong" \ + "number of arguments; expected 1, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + conffile="$1" + + remove_conffile_commit "$conffile" +} + +replace_conffile_with_symlink_rollback () { + # syntax: replace_conffile_with_symlink_rollback oldfilename newfilename + # + # Roll back the replacing of a conffile "oldfilename" with symlink to + # "newfilename". + # + # Call this function from a postrm script in the event $1 is "abort-upgrade" + # or "abort-install" and verify $2 to ensure the package failed to upgrade + # from a version (or install over a version removed-but-not-purged) prior + # to the one in which the conffile was obsoleted. + # You should have used replace_conffile_with_symlink_prepare() in the + # preinst. + + local conffile + + # validate arguments + if [ $# -ne 2 ]; then + usage_error "replace_conffile_with_symlink_rollback() called with wrong" \ + "number of arguments; expected 2, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + oldconffile="$1" + newconffile="$2" + + remove_conffile_rollback "$_oldconffile" + if [ -f "$newconffile" ]; then + rm "$newconffile" + fi +} + +run () { + # syntax: run command [ argument ... ] + # + # Run specified command with optional arguments and report its exit status. + # Useful for commands whose exit status may be nonzero, but still acceptable, + # or commands whose failure is not fatal to us. + # + # NOTE: Do *not* use this function with db_get or db_metaget commands; in + # those cases the return value of the debconf command *must* be checked + # before the string returned by debconf is used for anything. + + local retval + + # validate arguments + if [ $# -lt 1 ]; then + usage_error "run() called with wrong number of arguments; expected at" \ + "least 1, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + "$@" || retval=$? + + if [ ${retval:-0} -ne 0 ]; then + observe "command \"$*\" exited with status $retval" + fi +} + +make_symlink_sane () { + # syntax: make_symlink_sane symlink target + # + # Ensure that the symbolic link symlink exists, and points to target. + # + # If symlink does not exist, create it and point it at target. + # + # If symlink exists but is not a symbolic link, back it up. + # + # If symlink exists, is a symbolic link, but points to the wrong location, fix + # it. + # + # If symlink exists, is a symbolic link, and already points to target, do + # nothing. + # + # This function wouldn't be needed if ln had an -I, --idempotent option. + + # Validate arguments. + if [ $# -ne 2 ]; then + usage_error "make_symlink_sane() called with wrong number of arguments;" \ + "expected 2, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + # We could just use the positional parameters as-is, but that makes things + # harder to follow. + local symlink target + + symlink="$1" + target="$2" + + if [ -L "$symlink" ] && [ "$(readlink "$symlink")" = "$target" ]; then + observe "link from $symlink to $target already exists" + else + observe "creating symbolic link from $symlink to $target" + mkdir -p "${target%/*}" "${symlink%/*}" + ln -s -b -S ".dpkg-old" "$target" "$symlink" + fi +} + +migrate_dir_to_symlink () { + # syntax: migrate_dir_to_symlink old_location new_location + # + # Per Debian Policy section 6.5.4, "A directory will never be replaced by a + # symbolic link to a directory or vice versa; instead, the existing state + # (symlink or not) will be left alone and dpkg will follow the symlink if + # there is one." + # + # We have to do it ourselves. + # + # This function moves the contents of old_location, a directory, into + # new_location, a directory, then makes old_location a symbolic link to + # new_location. + # + # old_location need not exist, but if it does, it must be a directory (or a + # symlink to a directory). If it is not, it is backed up. If new_location + # exists already and is not a directory, it is backed up. + # + # This function should be called from a package's preinst so that other + # packages unpacked after this one --- but before this package's postinst runs + # --- are unpacked into new_location even if their payloads contain + # old_location filespecs. + + # Validate arguments. + if [ $# -ne 2 ]; then + usage_error "migrate_dir_to_symlink() called with wrong number of" + "arguments; expected 2, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + # We could just use the positional parameters as-is, but that makes things + # harder to follow. + local new old + + old="$1" + new="$2" + + # Is old location a symlink? + if [ -L "$old" ]; then + # Does it already point to new location? + if [ "$(readlink "$old")" = "$new" ]; then + # Nothing to do; migration has already been done. + observe "migration of $old to $new already done" + return 0 + else + # Back it up. + warn "backing up symbolic link $old as $old.dpkg-old" + mv -b "$old" "$old.dpkg-old" + fi + fi + + # Does old location exist, but is not a directory? + if [ -e "$old" ] && ! [ -d "$old" ]; then + # Back it up. + warn "backing up non-directory $old as $old.dpkg-old" + mv -b "$old" "$old.dpkg-old" + fi + + observe "migrating $old to $new" + + # Is new location a symlink? + if [ -L "$new" ]; then + # Does it point the wrong way, i.e., back to where we're migrating from? + if [ "$(readlink "$new")" = "$old" ]; then + # Get rid of it. + observe "removing symbolic link $new which points to $old" + rm "$new" + else + # Back it up. + warn "backing up symbolic link $new as $new.dpkg-old" + mv -b "$new" "$new.dpkg-old" + fi + fi + + # Does new location exist, but is not a directory? + if [ -e "$new" ] && ! [ -d "$new" ]; then + warn "backing up non-directory $new as $new.dpkg-old" + mv -b "$new" "$new.dpkg-old" + fi + + # Create new directory if it does not yet exist. + if ! [ -e "$new" ]; then + observe "creating $new" + mkdir -p "$new" + fi + + # Copy files in old location to new location. Back up any filenames that + # already exist in the new location with the extension ".dpkg-old". + observe "copying files from $old to $new" + if ! (cd "$old" && cp -a -b -S ".dpkg-old" . "$new"); then + die "error(s) encountered while copying files from $old to $new" + fi + + # Remove files at old location. + observe "removing $old" + rm -r "$old" + + # Create symlink from old location to new location. + make_symlink_sane "$old" "$new" +} + +# vim:set ai et sw=2 ts=2 tw=80: + +# GOBSTOPPER: The X Strike Force shell library ends here. --- xserver-xorg-input-evdev-2.6.0.orig/debian/xsfbs/repack.sh +++ xserver-xorg-input-evdev-2.6.0/debian/xsfbs/repack.sh @@ -0,0 +1,32 @@ +#!/bin/sh + +set -e + +if ! [ -d debian/prune ]; then + exit 0 +fi + +if [ "x$1" != x--upstream-version ]; then + exit 1 +fi + +version="$2" +filename="$3" + +if [ -z "$version" ] || ! [ -f "$filename" ]; then + exit 1 +fi + +dir="$(pwd)" +tempdir="$(mktemp -d)" + +cd "$tempdir" +tar xf "$dir/$filename" +cat "$dir"/debian/prune/* | while read file; do rm -f */$file; done + +tar czf "$dir/$filename" * +cd "$dir" +rm -rf "$tempdir" +echo "Done pruning upstream tarball" + +exit 0 --- xserver-xorg-input-evdev-2.6.0.orig/debian/xsfbs/xsfbs.mk +++ xserver-xorg-input-evdev-2.6.0/debian/xsfbs/xsfbs.mk @@ -0,0 +1,285 @@ +#!/usr/bin/make -f + +# Debian X Strike Force Build System (XSFBS): Make portion + +# Copyright 1996 Stephen Early +# Copyright 1997 Mark Eichin +# Copyright 1998-2005, 2007 Branden Robinson +# Copyright 2005 David Nusinow +# +# Licensed under the GNU General Public License, version 2. See the file +# /usr/share/common-licenses/GPL or . + +# Originally by Stephen Early +# Modified by Mark W. Eichin +# Modified by Adam Heath +# Modified by Branden Robinson +# Modified by Fabio Massimo Di Nitto +# Modified by David Nusinow +# Acknowledgements to Manoj Srivastava. + +# Pass $(DH_OPTIONS) into the environment for debhelper's benefit. +export DH_OPTIONS + +# force quilt to not use ~/.quiltrc and to use debian/patches +QUILT = QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null + +# Set up parameters for the upstream build environment. + +# Determine (source) package name from Debian changelog. +SOURCE_NAME:=$(shell dpkg-parsechangelog -ldebian/changelog \ + | grep '^Source:' | awk '{print $$2}') + +# Determine package version from Debian changelog. +SOURCE_VERSION:=$(shell dpkg-parsechangelog -ldebian/changelog \ + | grep '^Version:' | awk '{print $$2}') + +# Determine upstream version number. +UPSTREAM_VERSION:=$(shell echo $(SOURCE_VERSION) | sed 's/-.*//') + +# Determine the source version without the epoch for make-orig-tar-gz +NO_EPOCH_VER:=$(shell echo $(UPSTREAM_VERSION) | sed 's/^.://') + +# Figure out who's building this package. +BUILDER:=$(shell echo $${DEBEMAIL:-$${EMAIL:-$$(echo $$LOGNAME@$$(cat /etc/mailname 2>/dev/null))}}) + +# Find out if this is an official build; an official build has nothing but +# digits, dots, and/or the codename of a release in the Debian part of the +# version number. Anything else indicates an unofficial build. +OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr "$$(echo $${VERSION\#\#*-} | sed 's/\(woody\|sarge\|etch\|lenny\)//g')" : ".*[^0-9.].*" >/dev/null 2>&1; then echo yes; fi) + +# Set up parameters for the Debian build environment. + +# Determine our architecture. +BUILD_ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH) +# Work around some old-time dpkg braindamage. +BUILD_ARCH:=$(subst i486,i386,$(BUILD_ARCH)) +# The DEB_HOST_ARCH variable may be set per the Debian cross-compilation policy. +ifdef DEB_HOST_ARCH + ARCH:=$(DEB_HOST_ARCH) +else + # dpkg-cross sets the ARCH environment variable; if set, use it. + ifdef ARCH + ARCH:=$(ARCH) + else + ARCH:=$(BUILD_ARCH) + endif +endif + +# $(STAMP_DIR) houses stamp files for complex targets. +STAMP_DIR:=stampdir + +# $(DEBTREEDIR) is where all install rules are told (via $(DESTDIR)) to place +# their files. +DEBTREEDIR:=$(CURDIR)/debian/tmp + +# All "important" targets have four lines: +# 1) A target name that is invoked by a package-building tool or the user. +# This consists of a dependency on a "$(STAMP_DIR)/"-prefixed counterpart. +# 2) A line delcaring 1) as a phony target (".PHONY:"). +# 3) A "$(STAMP_DIR)/"-prefixed target which does the actual work, and may +# depend on other targets. +# 4) A line declaring 3) as a member of the $(stampdir_targets) variable; the +# "$(STAMP_DIR)/" prefix is omitted. +# +# This indirection is needed so that the "stamp" files that signify when a rule +# is done can be located in a separate "stampdir". Recall that make has no way +# to know when a goal has been met for a phony target (like "build" or +# "install"). +# +# At the end of each "$(STAMP_DIR)/" target, be sure to run the command ">$@" +# so that the target will not be run again. Removing the file will make Make +# run the target over. + +# All phony targets should be declared as dependencies of .PHONY, even if they +# do not have "($STAMP_DIR)/"-prefixed counterparts. + +# Define a harmless default rule to keep things from going nuts by accident. +.PHONY: default +default: + +# Set up the $(STAMP_DIR) directory. +.PHONY: stampdir +stampdir_targets+=stampdir +stampdir: $(STAMP_DIR)/stampdir +$(STAMP_DIR)/stampdir: + mkdir $(STAMP_DIR) + >$@ + +# Set up the package build directory as quilt expects to find it. +.PHONY: prepare +stampdir_targets+=prepare +prepare: $(STAMP_DIR)/prepare +$(STAMP_DIR)/prepare: $(STAMP_DIR)/logdir $(STAMP_DIR)/genscripts + >$@ + +.PHONY: logdir +stampdir_targets+=logdir +logdir: $(STAMP_DIR)/logdir +$(STAMP_DIR)/logdir: $(STAMP_DIR)/stampdir + mkdir -p $(STAMP_DIR)/log + >$@ + +# Apply all patches to the upstream source. +.PHONY: patch +stampdir_targets+=patch +patch: $(STAMP_DIR)/patch +$(STAMP_DIR)/patch: $(STAMP_DIR)/prepare + if ! [ `which quilt` ]; then \ + echo "Couldn't find quilt. Please install it or add it to the build-depends for this package."; \ + exit 1; \ + fi; \ + if $(QUILT) next >/dev/null 2>&1; then \ + echo -n "Applying patches..."; \ + if $(QUILT) push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \ + cat $(STAMP_DIR)/log/patch; \ + echo "successful."; \ + else \ + cat $(STAMP_DIR)/log/patch; \ + echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \ + exit 1; \ + fi; \ + else \ + echo "No patches to apply"; \ + fi; \ + >$@ + +# Revert all patches to the upstream source. +.PHONY: unpatch +unpatch: $(STAMP_DIR)/logdir + rm -f $(STAMP_DIR)/patch + @echo -n "Unapplying patches..."; \ + if $(QUILT) applied >/dev/null 2>/dev/null; then \ + if $(QUILT) pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \ + cat $(STAMP_DIR)/log/unpatch; \ + echo "successful."; \ + else \ + cat $(STAMP_DIR)/log/unpatch; \ + echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \ + exit 1; \ + fi; \ + else \ + echo "nothing to do."; \ + fi + +# Clean the generated maintainer scripts. +.PHONY: cleanscripts +cleanscripts: + rm -f $(STAMP_DIR)/genscripts + rm -f debian/*.config \ + debian/*.postinst \ + debian/*.postrm \ + debian/*.preinst \ + debian/*.prerm + +# Clean the package build tree. +.PHONY: xsfclean +xsfclean: cleanscripts unpatch + dh_testdir + rm -rf .pc + rm -rf $(STAMP_DIR) + dh_clean + +# Remove files from the upstream source tree that we don't need, or which have +# licensing problems. It must be run before creating the .orig.tar.gz. +# +# Note: This rule is for Debian package maintainers' convenience, and is not +# needed for conventional build scenarios. +.PHONY: prune-upstream-tree +prune-upstream-tree: + # Ensure we're in the correct directory. + dh_testdir + grep -rvh '^#' debian/prune/ | xargs --no-run-if-empty rm -rf + +# Verify that there are no offsets or fuzz in the patches we apply. +# +# Note: This rule is for Debian package maintainers' convenience, and is not +# needed for conventional build scenarios. +.PHONY: patch-audit +patch-audit: prepare unpatch + @echo -n "Auditing patches..."; \ + >$(STAMP_DIR)/log/patch; \ + FUZZY=; \ + while [ -n "$$($(QUILT) next)" ]; do \ + RESULT=$$($(QUILT) push -v | tee -a $(STAMP_DIR)/log/patch | grep ^Hunk | sed 's/^Hunk.*\(succeeded\|FAILED\).*/\1/');\ + case "$$RESULT" in \ + succeeded) \ + echo "fuzzy patch: $$($(QUILT) top)" \ + | tee -a $(STAMP_DIR)/log/$$($(QUILT) top); \ + FUZZY=yes; \ + ;; \ + FAILED) \ + echo "broken patch: $$($(QUILT) next)" \ + | tee -a $(STAMP_DIR)/log/$$($(QUILT) next); \ + exit 1; \ + ;; \ + esac; \ + done; \ + if [ -n "$$FUZZY" ]; then \ + echo "there were fuzzy patches; please fix."; \ + exit 1; \ + else \ + echo "done."; \ + fi + +# Generate the maintainer scripts. +.PHONY: genscripts +stampdir_targets+=genscripts +genscripts: $(STAMP_DIR)/genscripts +$(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir + for FILE in debian/*.config.in \ + debian/*.postinst.in \ + debian/*.postrm.in \ + debian/*.preinst.in \ + debian/*.prerm.in; do \ + if [ -e "$$FILE" ]; then \ + MAINTSCRIPT=$$(echo $$FILE | sed 's/.in$$//'); \ + sed -n '1,/^#INCLUDE_SHELL_LIB#$$/p' <$$FILE \ + | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >$$MAINTSCRIPT.tmp; \ + cat debian/xsfbs/xsfbs.sh >>$$MAINTSCRIPT.tmp; \ + sed -n '/^#INCLUDE_SHELL_LIB#$$/,$$p' <$$FILE \ + | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \ + sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \ + -e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \ + <$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \ + rm $$MAINTSCRIPT.tmp; \ + fi; \ + done + # Validate syntax of generated shell scripts. + #sh debian/scripts/validate-posix-sh debian/*.config \ + # debian/*.postinst \ + # debian/*.postrm \ + # debian/*.preinst \ + # debian/*.prerm + >$@ + +# Compute dependencies for drivers +# +VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null) +INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null) + +# these two can be removed post-squeeze +VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) +INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) +VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI), xorg-driver-video +INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI), xorg-driver-input + +ifeq ($(PACKAGE),) +PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) +endif + +.PHONY: serverabi +serverabi: install +ifeq ($(VIDEODEP),) + @echo 'error: xserver-xorg-dev >= 1.7.6.901 needs to be installed' + @exit 1 +else + echo "xviddriver:Depends=$(VIDEODEP)" >> debian/$(PACKAGE).substvars + echo "xinpdriver:Depends=$(INPUTDEP)" >> debian/$(PACKAGE).substvars + # the following is there for compatibility... + echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars + echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars + echo "xserver:Depends=$(VIDEODEP), $(INPUTDEP)" >> debian/$(PACKAGE).substvars +endif + +# vim:set noet ai sts=8 sw=8 tw=0: --- xserver-xorg-input-evdev-2.6.0.orig/debian/local/11-evdev-quirks.conf +++ xserver-xorg-input-evdev-2.6.0/debian/local/11-evdev-quirks.conf @@ -0,0 +1,9 @@ +Section "InputClass" + Identifier "Avago Technologies mouse quirks (LP: #746639)" + MatchIsPointer "on" + MatchDevicePath "/dev/input/event*" + Driver "evdev" + MatchUSBID "192f:0416" + Option "Emulate3Buttons" "True" + Option "Emulate3Timeout" "50" +EndSection --- xserver-xorg-input-evdev-2.6.0.orig/debian/patches/102-fix_valuator_proximity_handling.patch +++ xserver-xorg-input-evdev-2.6.0/debian/patches/102-fix_valuator_proximity_handling.patch @@ -0,0 +1,44 @@ +From 6139f903bc1942b160d3d94828d9aa66d9d3febd Mon Sep 17 00:00:00 2001 +From: Chase Douglas +Date: Thu, 14 Apr 2011 15:48:10 -0400 +Subject: [PATCH] Copy out of proximity values into current values selectively + +Otherwise, an event that causes us to go into proximity with some new +valuator values will retain some old valuator values from when last in +proximity. This change ensures that all values posted while out of +proximity are accounted for. + +Signed-off-by: Chase Douglas +--- + src/evdev.c | 15 ++++++++------- + 1 files changed, 8 insertions(+), 7 deletions(-) + +diff --git a/src/evdev.c b/src/evdev.c +index b767b0e..f31f492 100644 +--- a/src/evdev.c ++++ b/src/evdev.c +@@ -525,13 +525,14 @@ EvdevProcessProximityState(InputInfoPtr pInfo) + { + /* We're about to go into/out of proximity but have no abs events + * within the EV_SYN. Use the last coordinates we have. */ +- if (!pEvdev->abs_queued && +- valuator_mask_num_valuators(pEvdev->prox) > 0) +- { +- valuator_mask_copy(pEvdev->vals, pEvdev->prox); +- valuator_mask_zero(pEvdev->prox); +- pEvdev->abs_queued = 1; +- } ++ for (i = 0; i < valuator_mask_size(pEvdev->prox); i++) ++ if (!valuator_mask_isset(pEvdev->vals, i) && ++ valuator_mask_isset(pEvdev->prox, i)) ++ valuator_mask_set(pEvdev->vals, i, ++ valuator_mask_get(pEvdev->prox, i)); ++ valuator_mask_zero(pEvdev->prox); ++ ++ pEvdev->abs_queued = valuator_mask_size(pEvdev->vals); + } + + pEvdev->in_proximity = prox_state; +-- +1.7.4.1 + --- xserver-xorg-input-evdev-2.6.0.orig/debian/patches/series +++ xserver-xorg-input-evdev-2.6.0/debian/patches/series @@ -0,0 +1,3 @@ +100-xi2.1.patch +101-gestures.patch +102-fix_valuator_proximity_handling.patch --- xserver-xorg-input-evdev-2.6.0.orig/debian/patches/101-gestures.patch +++ xserver-xorg-input-evdev-2.6.0/debian/patches/101-gestures.patch @@ -0,0 +1,664 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -68,6 +68,22 @@ sdkdir=`$PKG_CONFIG --variable=sdkdir xo + AC_ARG_WITH([sdkdir], [], [sdkdir="$withval"]) + AC_SUBST([sdkdir]) + ++AC_ARG_ENABLE(utouch-grail, AS_HELP_STRING([--enable-utouch-grail], [Build with utouch-grail gesture support (default: auto)]), [GRAIL=$enableval], [GRAIL=auto]) ++PKG_CHECK_MODULES(GRAIL, utouch-grail, [have_grail=yes], [have_grail=no]) ++if test "x$GRAIL" = xauto; then ++ GRAIL="$have_grail" ++fi ++if test "x$GRAIL" = xyes; then ++ if test "x$have_grail" = xno; then ++ AC_MSG_ERROR([Grail build explicitly requested, but required modules not found.]) ++ fi ++ AC_DEFINE(USE_GRAIL, 1, Whether to use grail or not) ++ AC_DEFINE(GESTURES, 1, Needed to interpret xorg headers properly) ++else ++ AC_DEFINE(USE_GRAIL, 0, Whether to use grail or not) ++fi ++AM_CONDITIONAL(USE_GRAIL, [test "x$GRAIL" = xyes]) ++ + DRIVER_NAME=evdev + AC_SUBST([DRIVER_NAME]) + +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -29,12 +29,17 @@ AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS) + AM_CPPFLAGS =-I$(top_srcdir)/include + + @DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la +-@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version ++@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version @GRAIL_LIBS@ + @DRIVER_NAME@_drv_la_LIBADD = $(MTDEV_LIBS) + @DRIVER_NAME@_drv_ladir = @inputdir@ + ++if USE_GRAIL ++GRAIL_SRC=evdev-grail.c evdev-grail.h ++endif ++ + @DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.c \ + @DRIVER_NAME@.h \ ++ $(GRAIL_SRC) \ + emuMB.c \ + emuWheel.c \ + draglock.c +--- /dev/null ++++ b/src/evdev-grail.c +@@ -0,0 +1,375 @@ ++/* ++ * Copyright © 2010 Canonical, Ltd. ++ * ++ * Permission to use, copy, modify, distribute, and sell this software ++ * and its documentation for any purpose is hereby granted without ++ * fee, provided that the above copyright notice appear in all copies ++ * and that both that copyright notice and this permission notice ++ * appear in supporting documentation, and that the name of Red Hat ++ * not be used in advertising or publicity pertaining to distribution ++ * of the software without specific, written prior permission. Red ++ * Hat makes no representations about the suitability of this software ++ * for any purpose. It is provided "as is" without express or implied ++ * warranty. ++ * ++ * THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN ++ * NO EVENT SHALL THE AUTHORS 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. ++ * ++ * Authors: ++ * Chase Douglas (chase.douglas@canonical.com) ++ */ ++ ++/* So we can get at the right data in xorg/windowstr.h */ ++ ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include "evdev.h" ++#include "evdev-grail.h" ++#include "gestureproto.h" ++ ++/* Copied from evdev.c, will be in evdev.h when xserver 1.9 is merged */ ++#define EVDEV_RELATIVE_EVENTS (1 << 2) ++#define EVDEV_TOUCHPAD (1 << 4) ++ ++/* ++ * Provided by the Maverick X server, we don't want to pollute the official ++ * X.org API. ++ */ ++extern _X_EXPORT void xf86PostGestureEvent(DeviceIntPtr dev, unsigned short x, ++ unsigned short y, unsigned short client_id, ++ unsigned short gesture_id, unsigned short gesture_type, ++ Window root, Window event, Window child, ++ unsigned short status, unsigned short num_props, ++ float *props); ++ ++static WindowPtr CommonAncestor(WindowPtr a, WindowPtr b) ++{ ++ WindowPtr c; ++ ++ if (a == b) ++ return a; ++ ++ for (b = b; b; b = b->parent) ++ for (c = a; c; c = c->parent) ++ if (c == b) ++ return b; ++ ++ return NullWindow; ++} ++ ++static WindowPtr GetWindowForGestures(struct grail *grail, ++ const struct grail_coord *contacts, ++ int num_contacts) ++{ ++ WindowPtr window = NULL; ++ int i; ++ ++ for (i = 0; i < num_contacts; i++) ++ { ++ float screen_x = contacts[i].x; ++ float screen_y = contacts[i].y; ++ WindowPtr this_window; ++ ++ this_window = xf86CoordinatesToWindow(screen_x, screen_y, 0); ++ if (!this_window) ++ return NullWindow; ++ ++ if (!window) ++ window = this_window; ++ else ++ window = CommonAncestor(window, this_window); ++ } ++ ++ return window; ++} ++ ++static int GetClients(struct grail *grail, ++ struct grail_client_info *clients, int max_clients, ++ const struct grail_coord *contacts, int num_contacts, ++ const grail_mask_t *types, int type_bytes) ++{ ++ WindowPtr child_window; ++ WindowPtr window; ++ WindowPtr root_window; ++ InputInfoPtr pInfo = grail->priv; ++ EvdevPtr pEvdev = pInfo->private; ++ int j; ++ int found_match = 0; ++ int num_clients = 0; ++ int type; ++ ++ if (max_clients <= 0) ++ return 0; ++ ++ if (pEvdev->flags & (EVDEV_RELATIVE_EVENTS | EVDEV_TOUCHPAD)) ++ { ++ DeviceIntPtr master = pInfo->dev->u.master; ++ struct grail_coord cursor_coord; ++ ++ /* If this mouse isn't hooked up to a cursor, don't do anything */ ++ if (!master) ++ return 0; ++ ++ cursor_coord.x = master->last.valuators[0]; ++ cursor_coord.y = master->last.valuators[1]; ++ ++ child_window = GetWindowForGestures(grail, &cursor_coord, 1); ++ } else ++ child_window = GetWindowForGestures(grail, contacts, num_contacts); ++ ++ if (!child_window) ++ return 0; ++ ++ memset(clients, 0, sizeof(struct grail_client_info) * max_clients); ++ ++ /* Find the root window. */ ++ for (root_window = child_window; root_window->parent; ++ root_window = root_window->parent); ++ ++ /* ++ * Check for a root client with SYSFLAG1 set. SYSFLAG1 is effectively an ++ * active grab for system gestures. We assume only one client has SYSFLAG1 ++ * set. ++ */ ++ window = child_window; ++ while (window) ++ { ++ /* Check if any gestures have been selected on this window. */ ++ if (wGestureMasks(window)) ++ { ++ GestureClientsPtr client; ++ ++ /* For each client */ ++ for (client = wGestureMasks(window)->clients; client; ++ client = client->next) ++ { ++ int first = 1; ++ ++ /* If the client has set the SYSFLAG1 bit */ ++ if (BitIsOn(client->gestureMask[0], GRAIL_TYPE_SYSFLAG1)) ++ { ++ /* For each recognized gesture */ ++ grail_mask_foreach(type, types, type_bytes) ++ { ++ if (type == GRAIL_TYPE_SYSFLAG1) ++ continue; ++ ++ /* ++ * Check if this client selected for this gesture. ++ * Request may be for this device or all devices. ++ */ ++ if (BitIsOn(client->gestureMask[pInfo->dev->id], type) || ++ BitIsOn(client->gestureMask[0], type)) ++ { ++ if (first) { ++ /* Set up new client in array */ ++ clients[0].id.client = CLIENT_ID(client->resource); ++ clients[0].id.root = root_window->drawable.id; ++ clients[0].id.child = child_window->drawable.id; ++ clients[0].id.event = window->drawable.id; ++ grail_mask_clear(clients[0].mask, ++ DIM_GRAIL_TYPE_BYTES); ++ first = 0; ++ } ++ ++ /* Set this gesture bit in the client's gesture mask */ ++ SetBit(clients[0].mask, type); ++ num_clients = 1; ++ } ++ } ++ ++ /* ++ * Either we found a gesture, or we stop looking for SYSFLAG1 ++ * clients. ++ */ ++ if (num_clients) { ++ SetBit(clients[0].mask, GRAIL_TYPE_SYSFLAG1); ++ goto next_window; ++ } ++ } ++ } ++ } ++ ++next_window: ++ window = window->parent; ++ } ++ ++ /* ++ * Traverse the window hierarchy looking for a window with a client ++ * selecting for one of the recognized gestures. ++ * ++ * All clients of the top most window with a match will receive events if ++ * they have selected for gestures that have been recognized, even if they ++ * have selected for different gestures between them. ++ * ++ * Once any gesture is matched on a window, propagation through the window ++ * hierarchy ends. ++ */ ++ for (window = child_window; window && !found_match; window = window->parent) ++ { ++ /* No client selected for gestures on this window */ ++ if (!wGestureMasks(window)) ++ continue; ++ ++ /* For each recognized gesture */ ++ grail_mask_foreach(type, types, type_bytes) ++ { ++ if (type == GRAIL_TYPE_SYSFLAG1) ++ continue; ++ ++ /* Check if any client selected for this gesture on the window */ ++ if (BitIsOn(wGestureMasks(window)->mask, type)) ++ { ++ GestureClientsPtr client; ++ ++ /* For each client that selected for gestures on this window */ ++ for (client = wGestureMasks(window)->clients; client; ++ client = client->next) ++ { ++ /* ++ * Check if this client selected for this gesture. Request ++ * may be for this device or all devices. ++ */ ++ if (BitIsOn(client->gestureMask[pInfo->dev->id], type) || ++ BitIsOn(client->gestureMask[0], type)) ++ { ++ /* ++ * Find this client in the clients array passed back to ++ * the caller. ++ */ ++ for (j = 0; j < num_clients; j++) ++ if (clients[j].id.client == ++ CLIENT_ID(client->resource)) ++ break; ++ ++ /* Check if the client exists in the array yet */ ++ if (j >= num_clients) ++ { ++ /* We ran out of room in the array, return error */ ++ if (num_clients >= max_clients) ++ return -1; ++ /* Set up new client in array */ ++ clients[j].id.client = CLIENT_ID(client->resource); ++ clients[j].id.root = root_window->drawable.id; ++ clients[j].id.child = child_window->drawable.id; ++ clients[j].id.event = window->drawable.id; ++ num_clients++; ++ } ++ ++ /* Set this gesture bit in the client's gesture mask */ ++ SetBit(clients[j].mask, type); ++ } ++ } ++ ++ /* A match has been found, stop propagating */ ++ found_match = 1; ++ } ++ } ++ } ++ ++ return num_clients; ++} ++ ++static void GrailEvent(struct grail *grail, const struct input_event *ev) ++{ ++ InputInfoPtr pInfo = (InputInfoPtr)grail->priv; ++ EvdevProcessEvent(pInfo, (struct input_event *)ev); ++} ++ ++static void GrailGesture(struct grail *grail, const struct grail_event *ev) ++{ ++ InputInfoPtr pInfo = grail->priv; ++ EvdevPtr pEvdev = pInfo->private; ++ int x; ++ int y; ++ ++ /* Override event focus point if this is a relative device */ ++ if (pEvdev->flags & (EVDEV_RELATIVE_EVENTS | EVDEV_TOUCHPAD)) ++ { ++ DeviceIntPtr master = pInfo->dev->u.master; ++ ++ /* If this mouse isn't hooked up to a cursor, don't do anything */ ++ if (!master) ++ return; ++ ++ /* Note: Master device valuators are in screen coordinates */ ++ x = master->last.valuators[0]; ++ y = master->last.valuators[1]; ++ } else { ++ x = ev->pos.x; ++ y = ev->pos.y; ++ } ++ ++ xf86PostGestureEvent(pInfo->dev, x, y, ev->client_id.client, ev->id, ++ ev->type, ev->client_id.root, ev->client_id.event, ++ ev->client_id.child, ev->status, ++ ev->nprop, (float *)ev->prop); ++} ++ ++int ++GrailOpen(InputInfoPtr pInfo) ++{ ++ EvdevPtr pEvdev = pInfo->private; ++ ++ pEvdev->grail = malloc(sizeof(struct grail)); ++ if (!pEvdev->grail) { ++ xf86Msg(X_ERROR, "evdev-grail: failed to allocate grail structure\n"); ++ return -1; ++ } ++ ++ memset(pEvdev->grail, 0, sizeof(struct grail)); ++ pEvdev->grail->get_clients = GetClients; ++ pEvdev->grail->event = GrailEvent; ++ pEvdev->grail->gesture = GrailGesture; ++ pEvdev->grail->priv = pInfo; ++ ++ if (grail_open(pEvdev->grail, pInfo->fd)) { ++ xf86Msg(X_INFO, ++ "evdev-grail: failed to open grail, no gesture support\n"); ++ free(pEvdev->grail); ++ pEvdev->grail = NULL; ++ return -1; ++ } ++ ++ { ++ struct grail_coord min; ++ struct grail_coord max; ++ ++ min.x = screenInfo.screens[0]->x; ++ min.y = screenInfo.screens[0]->y; ++ max.x = min.x + screenInfo.screens[0]->width; ++ max.y = min.y + screenInfo.screens[0]->height; ++ ++ grail_set_bbox(pEvdev->grail, &min, &max); ++ } ++ ++ return 0; ++} ++ ++void ++GrailClose(InputInfoPtr pInfo) ++{ ++ EvdevPtr pEvdev = pInfo->private; ++ ++ if (pEvdev->grail) { ++ grail_close(pEvdev->grail, pInfo->fd); ++ free(pEvdev->grail); ++ pEvdev->grail = NULL; ++ } ++} +--- /dev/null ++++ b/src/evdev-grail.h +@@ -0,0 +1,9 @@ ++#ifndef EVDEV_GRAIL_H_ ++#define EVDEV_GRAIL_H_ ++ ++#include ++ ++extern int GrailOpen(InputInfoPtr pInfo); ++extern void GrailClose(InputInfoPtr pInfo); ++ ++#endif /* _EVDEV_GRAIL_H_ */ +--- a/src/evdev.c ++++ b/src/evdev.c +@@ -60,6 +60,13 @@ + #define MAXDEVICES MAX_DEVICES + #endif + ++#if USE_GRAIL ++#include "evdev-grail.h" ++#else ++#define GrailOpen(pInfo) ++#define GrailClose(pInfo) ++#endif ++ + #define ArrayLength(a) (sizeof(a) / (sizeof((a)[0]))) + + #define MIN_KEYCODE 8 +@@ -900,7 +907,7 @@ EvdevProcessSyncEvent(InputInfoPtr pInfo + * Process the events from the device; nothing is actually posted to the server + * until an EV_SYN event is received. + */ +-static void ++void + EvdevProcessEvent(InputInfoPtr pInfo, struct input_event *ev) + { + switch (ev->type) { +@@ -934,17 +941,14 @@ EvdevReadInput(InputInfoPtr pInfo) + + while (len == sizeof(ev)) + { +-#ifdef MULTITOUCH ++#if USE_GRAIL + EvdevPtr pEvdev = pInfo->private; + +- if (pEvdev->mtdev) +- len = mtdev_get(pEvdev->mtdev, pInfo->fd, ev, NUM_EVENTS) * +- sizeof(struct input_event); ++ if (pEvdev->grail) ++ len = grail_pull(pEvdev->grail, pInfo->fd); + else +- len = read(pInfo->fd, &ev, sizeof(ev)); +-#else +- len = read(pInfo->fd, &ev, sizeof(ev)); + #endif ++ len = read(pInfo->fd, &ev, sizeof(ev)); + if (len <= 0) + { + if (errno == ENODEV) /* May happen after resume */ +@@ -962,6 +966,11 @@ EvdevReadInput(InputInfoPtr pInfo) + break; + } + ++#if USE_GRAIL ++ if (pEvdev->grail) ++ return; ++#endif ++ + /* The kernel promises that we always only read a complete + * event, so len != sizeof ev is an error. */ + if (len % sizeof(ev[0])) { +@@ -1620,6 +1629,7 @@ EvdevProc(DeviceIntPtr device, int what) + if (pEvdev->mtdev) + mtdev_close(pEvdev->mtdev); + #endif ++ GrailClose(pInfo); + EvdevRemoveDevice(pInfo); + pEvdev->min_maj = 0; + break; +@@ -1857,6 +1867,8 @@ EvdevProbe(InputInfoPtr pInfo) + xf86Msg(X_PROBED, "%s: Found absolute axes\n", pInfo->name); + pEvdev->flags |= EVDEV_ABSOLUTE_EVENTS; + ++ GrailOpen(pInfo); ++ + if ((TestBit(ABS_X, pEvdev->abs_bitmask) && + TestBit(ABS_Y, pEvdev->abs_bitmask))) { + xf86Msg(X_PROBED, "%s: Found x and y absolute axes\n", pInfo->name); +--- a/src/evdev.h ++++ b/src/evdev.h +@@ -207,8 +207,14 @@ typedef struct { + /* Event queue used to defer keyboard/button events until EV_SYN time. */ + int num_queue; + EventQueueRec queue[EVDEV_MAXQUEUE]; ++ ++#if USE_GRAIL ++ struct grail *grail; ++#endif + } EvdevRec, *EvdevPtr; + ++void EvdevProcessEvent(InputInfoPtr pInfo, struct input_event *ev); ++ + /* Event posting functions */ + void EvdevQueueKbdEvent(InputInfoPtr pInfo, struct input_event *ev, int value); + void EvdevQueueButtonEvent(InputInfoPtr pInfo, int button, int value); +--- /dev/null ++++ b/src/gestureproto.h +@@ -0,0 +1,132 @@ ++/* ++ * Copyright © 2010 Canonical, Ltd. ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a ++ * copy of this software and associated documentation files (the "Software"), ++ * to deal in the Software without restriction, including without limitation ++ * the rights to use, copy, modify, merge, publish, distribute, sublicense, ++ * and/or sell copies of the Software, and to permit persons to whom the ++ * Software is furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice (including the next ++ * paragraph) shall be included in all copies or substantial portions of the ++ * Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ++ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING ++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER ++ * DEALINGS IN THE SOFTWARE. ++ * ++ * Authors: Chase Douglas ++ * ++ */ ++ ++#ifndef _GESTUREPROTO_H_ ++#define _GESTUREPROTO_H_ ++ ++#include ++#include ++ ++#define Window uint32_t ++#define Time uint32_t ++ ++#define X_GestureQueryVersion 1 ++#define X_GestureSelectEvents 2 ++#define X_GestureGetSelectedEvents 3 ++ ++#define GESTUREREQUESTS (X_GestureGetSelectedEvents - X_GestureQueryVersion + 1) ++ ++#define GestureAllDevices 0 ++ ++/** ++ * Used to select for events on a given window. ++ * Struct is followed by (mask_len * CARD8), with each bit set representing ++ * the event mask for the given type. A mask bit represents an event type if ++ * (mask == (1 << type)). ++ */ ++typedef struct { ++ uint16_t device_id; /**< Device id to select for */ ++ uint16_t mask_len; /**< Length of mask in 4 byte units */ ++} GestureEventMask; ++ ++typedef struct { ++ uint8_t reqType; /**< Gesture extension major code */ ++ uint8_t ReqType; /**< Always ::X_GestureQueryVersion */ ++ uint16_t length; /**< Length in 4 byte units */ ++ uint16_t major_version; ++ uint16_t minor_version; ++} GestureQueryVersionReq; ++ ++typedef struct { ++ uint8_t repType; /**< ::X_Reply */ ++ uint8_t RepType; /**< Always ::X_GestureQueryVersion */ ++ uint16_t sequenceNumber; ++ uint32_t length; ++ uint16_t major_version; ++ uint16_t minor_version; ++ uint32_t pad1; ++ uint32_t pad2; ++ uint32_t pad3; ++ uint32_t pad4; ++ uint32_t pad5; ++} GestureQueryVersionReply; ++ ++typedef struct { ++ uint8_t reqType; /**< Gesture extension major code */ ++ uint8_t ReqType; /**< Always ::X_GestureSelectEvents */ ++ uint16_t length; /**< Length in 4 byte units */ ++ Window window; ++ GestureEventMask mask; ++} GestureSelectEventsReq; ++ ++typedef struct { ++ uint8_t reqType; /**< Gesture extension major code */ ++ uint8_t ReqType; /**< Always ::X_GestureGetSelectedEvents */ ++ uint16_t length; /**< Length in 4 byte units */ ++ Window window; ++} GestureGetSelectedEventsReq; ++ ++typedef struct { ++ uint8_t repType; /**< Gesture extension major opcode */ ++ uint8_t RepType; /**< Always ::X_GestureGetSelectedEvents */ ++ uint16_t sequenceNumber; ++ uint32_t length; ++ uint16_t num_masks; /**< Number of GestureEventMask structs ++ trailing the reply */ ++ uint16_t pad0; ++ uint32_t pad1; ++ uint32_t pad2; ++ uint32_t pad3; ++ uint32_t pad4; ++ uint32_t pad5; ++} GestureGetSelectedEventsReply; ++ ++typedef struct ++{ ++ uint8_t type; /**< Always GenericEvent */ ++ uint8_t extension; /**< Gesture extension offset */ ++ uint16_t sequenceNumber; /**< Xevent sequence number */ ++ uint32_t length; /**< Length in 4 byte uints */ ++ uint16_t evtype; /**< X generic event type */ ++ uint16_t gesture_id; /**< Unique ID for gesture */ ++ uint16_t gesture_type; /**< Gesture type (zoom, rotate, etc.) */ ++ uint16_t device_id; /**< Device that generated this gesture */ ++ Time time; /**< Time of gesture event */ ++ Window root; /**< Root window event occurred on */ ++ Window event; /**< Window selecting this event for a client */ ++ Window child; /**< Top-most window of gesture event */ ++/* └──────── 32 byte boundary ────────┘ */ ++ float focus_x; /**< Always window coords, 16.16 fixed point */ ++ float focus_y; /**< Relative to event window */ ++ uint16_t status; /**< Gesture event status */ ++ uint16_t num_props; /**< Number of properties for gesture event */ ++/* └──── Gesture properties below ────┘ */ ++} GestureEvent; ++ ++#undef Window ++#undef Time ++ ++#endif /* _GESTUREPROTO_H_ */ --- xserver-xorg-input-evdev-2.6.0.orig/debian/patches/100-xi2.1.patch +++ xserver-xorg-input-evdev-2.6.0/debian/patches/100-xi2.1.patch @@ -0,0 +1,1668 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -47,6 +47,9 @@ XORG_DEFAULT_OPTIONS + # Obtain compiler/linker options from server and required extensions + PKG_CHECK_MODULES(XORG, xorg-server xproto inputproto) + ++# Obtain compiler/linker options for mtdev ++PKG_CHECK_MODULES(MTDEV, mtdev) ++ + # Define a configure option for an alternate input module directory + AC_ARG_WITH(xorg-module-dir, + AC_HELP_STRING([--with-xorg-module-dir=DIR], +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -30,6 +30,7 @@ AM_CPPFLAGS =-I$(top_srcdir)/include + + @DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la + @DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version ++@DRIVER_NAME@_drv_la_LIBADD = $(MTDEV_LIBS) + @DRIVER_NAME@_drv_ladir = @inputdir@ + + @DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.c \ +--- a/src/draglock.c ++++ b/src/draglock.c +@@ -44,9 +44,7 @@ + + #include + +-#ifdef HAVE_PROPERTIES + static Atom prop_dlock = 0; /* Drag lock buttons. */ +-#endif + + void EvdevDragLockLockButton(InputInfoPtr pInfo, unsigned int button); + +@@ -211,7 +209,6 @@ EvdevDragLockFilterEvent(InputInfoPtr pI + return FALSE; + } + +-#ifdef HAVE_PROPERTIES + /** + * Set the drag lock property. + * If only one value is supplied, then this is used as the meta button. +@@ -319,5 +316,3 @@ EvdevDragLockInitProperty(DeviceIntPtr d + + XIRegisterPropertyHandler(dev, EvdevDragLockSetProperty, NULL, NULL); + } +- +-#endif +--- a/src/emuMB.c ++++ b/src/emuMB.c +@@ -43,10 +43,8 @@ + + #include + +-#ifdef HAVE_PROPERTIES + static Atom prop_mbemu = 0; /* Middle button emulation on/off property */ + static Atom prop_mbtimeout = 0; /* Middle button timeout property */ +-#endif + /* + * Lets create a simple finite-state machine for 3 button emulation: + * +@@ -330,7 +328,6 @@ EvdevMBEmuFinalize(InputInfoPtr pInfo) + + } + +-#ifdef HAVE_PROPERTIES + static int + EvdevMBEmuSetProperty(DeviceIntPtr dev, Atom atom, XIPropertyValuePtr val, + BOOL checkonly) +@@ -391,4 +388,3 @@ EvdevMBEmuInitProperty(DeviceIntPtr dev) + + XIRegisterPropertyHandler(dev, EvdevMBEmuSetProperty, NULL, NULL); + } +-#endif +--- a/src/emuWheel.c ++++ b/src/emuWheel.c +@@ -44,13 +44,11 @@ + + #define WHEEL_NOT_CONFIGURED 0 + +-#ifdef HAVE_PROPERTIES + static Atom prop_wheel_emu = 0; + static Atom prop_wheel_axismap = 0; + static Atom prop_wheel_inertia = 0; + static Atom prop_wheel_timeout = 0; + static Atom prop_wheel_button = 0; +-#endif + + /* Local Funciton Prototypes */ + static BOOL EvdevWheelEmuHandleButtonMap(InputInfoPtr pInfo, WheelAxisPtr pAxis, char *axis_name); +@@ -120,8 +118,9 @@ EvdevWheelEmuFilterMotion(InputInfoPtr p + + /* We don't want to intercept real mouse wheel events */ + if(pEv->type == EV_ABS) { +- oldValue = pEvdev->vals[pEvdev->axis_map[pEv->code]]; +- pEvdev->vals[pEvdev->axis_map[pEv->code]] = value; ++ int axis = pEvdev->axis_map[pEv->code]; ++ oldValue = valuator_mask_get(pEvdev->vals, axis); ++ valuator_mask_set(pEvdev->vals, axis, value); + value -= oldValue; /* make value into a differential measurement */ + } + +@@ -335,7 +334,6 @@ EvdevWheelEmuPreInit(InputInfoPtr pInfo) + pInfo->name, pEvdev->emulateWheel.button, inertia, timeout); + } + +-#ifdef HAVE_PROPERTIES + static int + EvdevWheelEmuSetProperty(DeviceIntPtr dev, Atom atom, XIPropertyValuePtr val, + BOOL checkonly) +@@ -485,4 +483,3 @@ EvdevWheelEmuInitProperty(DeviceIntPtr d + + XIRegisterPropertyHandler(dev, EvdevWheelEmuSetProperty, NULL, NULL); + } +-#endif +--- a/src/evdev.c ++++ b/src/evdev.c +@@ -48,23 +48,12 @@ + #include + #include + +-#ifdef HAVE_PROPERTIES + #include + #include + #include +-/* 1.6 has properties, but no labels */ +-#ifdef AXIS_LABEL_PROP +-#define HAVE_LABELS +-#else +-#undef HAVE_LABELS +-#endif +- +-#endif + +-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12 + /* removed from server, purge when dropping support for server 1.10 */ + #define XI86_SEND_DRAG_EVENTS 0x08 +-#endif + + #ifndef MAXDEVICES + #include /* for MAX_DEVICES */ +@@ -87,6 +76,14 @@ + #define MODEFLAG 8 + #define COMPOSEFLAG 16 + ++#ifndef ABS_MT_SLOT ++#define ABS_MT_SLOT 0x2f ++#endif ++ ++#ifndef ABS_MT_TRACKING_ID ++#define ABS_MT_TRACKING_ID 0x39 ++#endif ++ + static char *evdevDefaults[] = { + "XkbRules", "evdev", + "XkbModel", "evdev", +@@ -114,7 +111,6 @@ static BOOL EvdevGrabDevice(InputInfoPtr + static void EvdevSetCalibration(InputInfoPtr pInfo, int num_calibration, int calibration[4]); + static int EvdevOpenDevice(InputInfoPtr pInfo); + +-#ifdef HAVE_PROPERTIES + static void EvdevInitAxesLabels(EvdevPtr pEvdev, int natoms, Atom *atoms); + static void EvdevInitButtonLabels(EvdevPtr pEvdev, int natoms, Atom *atoms); + static void EvdevInitProperty(DeviceIntPtr dev); +@@ -125,7 +121,6 @@ static Atom prop_calibration = 0; + static Atom prop_swap = 0; + static Atom prop_axis_label = 0; + static Atom prop_btn_label = 0; +-#endif + + /* All devices the evdev driver has allocated and knows about. + * MAXDEVICES is safe as null-terminated array, as two devices (VCP and VCK) +@@ -302,22 +297,13 @@ EvdevQueueKbdEvent(InputInfoPtr pInfo, s + + /* Filter all repeated events from device. + We'll do softrepeat in the server, but only since 1.6 */ +- if (value == 2 +-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) <= 2 +- && (ev->code == KEY_LEFTCTRL || ev->code == KEY_RIGHTCTRL || +- ev->code == KEY_LEFTSHIFT || ev->code == KEY_RIGHTSHIFT || +- ev->code == KEY_LEFTALT || ev->code == KEY_RIGHTALT || +- ev->code == KEY_LEFTMETA || ev->code == KEY_RIGHTMETA || +- ev->code == KEY_CAPSLOCK || ev->code == KEY_NUMLOCK || +- ev->code == KEY_SCROLLLOCK) /* XXX windows keys? */ +-#endif +- ) +- return; ++ if (value == 2) ++ return; + + if ((pQueue = EvdevNextInQueue(pInfo))) + { + pQueue->type = EV_QUEUE_KEY; +- pQueue->key = code; ++ pQueue->detail.key = code; + pQueue->val = value; + } + } +@@ -327,10 +313,14 @@ EvdevQueueButtonEvent(InputInfoPtr pInfo + { + EventQueuePtr pQueue; + ++ /* Direct touch devices use server side pointer emulation */ ++ if (pInfo->dev->touch && pInfo->dev->touch->mode == XIDirectTouch) ++ return; ++ + if ((pQueue = EvdevNextInQueue(pInfo))) + { + pQueue->type = EV_QUEUE_BTN; +- pQueue->key = button; ++ pQueue->detail.key = button; + pQueue->val = value; + } + } +@@ -342,11 +332,27 @@ EvdevQueueProximityEvent(InputInfoPtr pI + if ((pQueue = EvdevNextInQueue(pInfo))) + { + pQueue->type = EV_QUEUE_PROXIMITY; +- pQueue->key = 0; ++ pQueue->detail.key = 0; + pQueue->val = value; + } + } + ++#ifdef MULTITOUCH ++void ++EvdevQueueTouchEvent(InputInfoPtr pInfo, unsigned int touch, ValuatorMask *mask, ++ uint16_t evtype) ++{ ++ EventQueuePtr pQueue; ++ if ((pQueue = EvdevNextInQueue(pInfo))) ++ { ++ pQueue->type = EV_QUEUE_TOUCH; ++ pQueue->detail.touch = touch; ++ valuator_mask_copy(pQueue->touch_vals, mask); ++ pQueue->val = evtype; ++ } ++} ++#endif ++ + /** + * Post button event right here, right now. + * Interface for MB emulation since these need to post immediately. +@@ -368,41 +374,44 @@ EvdevQueueButtonClicks(InputInfoPtr pInf + } + } + +-#define ABS_X_VALUE 0x1 +-#define ABS_Y_VALUE 0x2 +-#define ABS_VALUE 0x4 + /** + * Take the valuators and process them accordingly. + */ + static void +-EvdevProcessValuators(InputInfoPtr pInfo, int v[MAX_VALUATORS], int *num_v, +- int *first_v) ++EvdevProcessValuators(InputInfoPtr pInfo) + { + int tmp; + EvdevPtr pEvdev = pInfo->private; +- +- *num_v = *first_v = 0; ++ int *delta = pEvdev->delta; + + /* convert to relative motion for touchpads */ + if (pEvdev->abs_queued && (pEvdev->flags & EVDEV_RELATIVE_MODE)) { + if (pEvdev->in_proximity) { +- if (pEvdev->old_vals[0] != -1) +- pEvdev->delta[REL_X] = pEvdev->vals[0] - pEvdev->old_vals[0]; +- if (pEvdev->old_vals[1] != -1) +- pEvdev->delta[REL_Y] = pEvdev->vals[1] - pEvdev->old_vals[1]; +- if (pEvdev->abs_queued & ABS_X_VALUE) +- pEvdev->old_vals[0] = pEvdev->vals[0]; +- if (pEvdev->abs_queued & ABS_Y_VALUE) +- pEvdev->old_vals[1] = pEvdev->vals[1]; ++ if (valuator_mask_isset(pEvdev->vals, 0)) ++ { ++ if (valuator_mask_isset(pEvdev->old_vals, 0)) ++ delta[REL_X] = valuator_mask_get(pEvdev->vals, 0) - ++ valuator_mask_get(pEvdev->old_vals, 0); ++ valuator_mask_set(pEvdev->old_vals, 0, ++ valuator_mask_get(pEvdev->vals, 0)); ++ } ++ if (valuator_mask_isset(pEvdev->vals, 1)) ++ { ++ if (valuator_mask_isset(pEvdev->old_vals, 1)) ++ delta[REL_Y] = valuator_mask_get(pEvdev->vals, 1) - ++ valuator_mask_get(pEvdev->old_vals, 1); ++ valuator_mask_set(pEvdev->old_vals, 1, ++ valuator_mask_get(pEvdev->vals, 1)); ++ } + } else { +- pEvdev->old_vals[0] = pEvdev->old_vals[1] = -1; ++ valuator_mask_zero(pEvdev->old_vals); + } ++ valuator_mask_zero(pEvdev->vals); + pEvdev->abs_queued = 0; + pEvdev->rel_queued = 1; + } + + if (pEvdev->rel_queued) { +- int first = REL_CNT, last = -1; + int i; + + if (pEvdev->swap_axes) { +@@ -419,19 +428,7 @@ EvdevProcessValuators(InputInfoPtr pInfo + { + int map = pEvdev->axis_map[i]; + if (pEvdev->delta[i] && map != -1) +- { +- v[map] = pEvdev->delta[i]; +- if (map < first) +- first = map; +- if (map > last) +- last = map; +- } +- } +- +- if (last >= 0) +- { +- *num_v = (last - first + 1); +- *first_v = first; ++ valuator_mask_set(pEvdev->vals, map, pEvdev->delta[i]); + } + } + /* +@@ -444,43 +441,46 @@ EvdevProcessValuators(InputInfoPtr pInfo + * just works. + */ + else if (pEvdev->abs_queued && pEvdev->in_proximity) { +- memcpy(v, pEvdev->vals, sizeof(int) * pEvdev->num_vals); ++ int unswapped_x = valuator_mask_get(pEvdev->vals, 0); ++ int unswapped_y = valuator_mask_get(pEvdev->vals, 1); ++ int i; + +- if (pEvdev->swap_axes) { +- int tmp = v[0]; +- v[0] = xf86ScaleAxis(v[1], +- pEvdev->absinfo[ABS_X].maximum, +- pEvdev->absinfo[ABS_X].minimum, +- pEvdev->absinfo[ABS_Y].maximum, +- pEvdev->absinfo[ABS_Y].minimum); +- v[1] = xf86ScaleAxis(tmp, +- pEvdev->absinfo[ABS_Y].maximum, +- pEvdev->absinfo[ABS_Y].minimum, +- pEvdev->absinfo[ABS_X].maximum, +- pEvdev->absinfo[ABS_X].minimum); +- } ++ for (i = 0; i <= 1; i++) { ++ int val; ++ int calib_min; ++ int calib_max; + +- if (pEvdev->flags & EVDEV_CALIBRATED) +- { +- v[0] = xf86ScaleAxis(v[0], +- pEvdev->absinfo[ABS_X].maximum, +- pEvdev->absinfo[ABS_X].minimum, +- pEvdev->calibration.max_x, pEvdev->calibration.min_x); +- v[1] = xf86ScaleAxis(v[1], +- pEvdev->absinfo[ABS_Y].maximum, +- pEvdev->absinfo[ABS_Y].minimum, +- pEvdev->calibration.max_y, pEvdev->calibration.min_y); +- } ++ if (!valuator_mask_isset(pEvdev->vals, i)) ++ continue; + +- if (pEvdev->invert_x) +- v[0] = (pEvdev->absinfo[ABS_X].maximum - v[0] + +- pEvdev->absinfo[ABS_X].minimum); +- if (pEvdev->invert_y) +- v[1] = (pEvdev->absinfo[ABS_Y].maximum - v[1] + +- pEvdev->absinfo[ABS_Y].minimum); ++ val = valuator_mask_get(pEvdev->vals, i); ++ ++ if (i == 0) { ++ calib_min = pEvdev->calibration.min_x; ++ calib_max = pEvdev->calibration.max_x; ++ } else { ++ calib_min = pEvdev->calibration.min_y; ++ calib_max = pEvdev->calibration.max_y; ++ } ++ ++ if (pEvdev->swap_axes) ++ val = xf86ScaleAxis((i == 0 ? unswapped_y : unswapped_x), ++ pEvdev->absinfo[i].maximum, ++ pEvdev->absinfo[i].minimum, ++ pEvdev->absinfo[1 - i].maximum, ++ pEvdev->absinfo[1 - i].minimum); ++ ++ if (pEvdev->flags & EVDEV_CALIBRATED) ++ val = xf86ScaleAxis(val, pEvdev->absinfo[i].maximum, ++ pEvdev->absinfo[i].minimum, calib_max, ++ calib_min); ++ ++ if ((i == 0 && pEvdev->invert_x) || (i == 1 && pEvdev->invert_y)) ++ val = (pEvdev->absinfo[i].maximum - val + ++ pEvdev->absinfo[i].minimum); + +- *num_v = pEvdev->num_vals; +- *first_v = 0; ++ valuator_mask_set(pEvdev->vals, i, val); ++ } + } + } + +@@ -518,11 +518,18 @@ EvdevProcessProximityState(InputInfoPtr + int prox_state = 0; + int i; + ++ /* Does this device have any proximity axes? */ ++ if (!pEvdev->prox) ++ return 0; ++ + /* no proximity change in the queue */ + if (!pEvdev->prox_queued) + { + if (pEvdev->abs_queued && !pEvdev->in_proximity) +- pEvdev->abs_prox = pEvdev->abs_queued; ++ for (i = 0; i < valuator_mask_size(pEvdev->vals); i++) ++ if (valuator_mask_isset(pEvdev->vals, i)) ++ valuator_mask_set(pEvdev->prox, i, ++ valuator_mask_get(pEvdev->vals, i)); + return 0; + } + +@@ -540,10 +547,12 @@ EvdevProcessProximityState(InputInfoPtr + { + /* We're about to go into/out of proximity but have no abs events + * within the EV_SYN. Use the last coordinates we have. */ +- if (!pEvdev->abs_queued && pEvdev->abs_prox) ++ if (!pEvdev->abs_queued && ++ valuator_mask_num_valuators(pEvdev->prox) > 0) + { +- pEvdev->abs_queued = pEvdev->abs_prox; +- pEvdev->abs_prox = 0; ++ valuator_mask_copy(pEvdev->vals, pEvdev->prox); ++ valuator_mask_zero(pEvdev->prox); ++ pEvdev->abs_queued = 1; + } + } + +@@ -590,6 +599,7 @@ EvdevProcessRelativeMotionEvent(InputInf + { + int value; + EvdevPtr pEvdev = pInfo->private; ++ int map; + + /* Get the signed value, earlier kernels had this as unsigned */ + value = ev->value; +@@ -622,10 +632,63 @@ EvdevProcessRelativeMotionEvent(InputInf + + pEvdev->rel_queued = 1; + pEvdev->delta[ev->code] += value; ++ map = pEvdev->axis_map[ev->code]; ++ valuator_mask_set(pEvdev->vals, map, value); + break; + } + } + ++#ifdef MULTITOUCH ++static void ++EvdevProcessTouch(InputInfoPtr pInfo) ++{ ++ EvdevPtr pEvdev = pInfo->private; ++ ++ if (pEvdev->cur_slot < 0 || !pEvdev->mt_vals || ++ (!pEvdev->open_slot && !pEvdev->close_slot && ++ valuator_mask_num_valuators(pEvdev->mt_vals) == 0)) ++ return; ++ ++ if (pEvdev->close_slot) { ++ EvdevQueueTouchEvent(pInfo, pEvdev->cur_slot, pEvdev->mt_vals, ++ XI_TouchEnd); ++ pEvdev->close_slot = 0; ++ } else { ++ EvdevQueueTouchEvent(pInfo, pEvdev->cur_slot, pEvdev->mt_vals, ++ pEvdev->open_slot ? XI_TouchBegin : ++ XI_TouchUpdate); ++ pEvdev->open_slot = 0; ++ } ++ ++ valuator_mask_zero(pEvdev->mt_vals); ++} ++ ++static void ++EvdevProcessTouchEvent(InputInfoPtr pInfo, struct input_event *ev) ++{ ++ EvdevPtr pEvdev = pInfo->private; ++ int map; ++ ++ if (ev->code == ABS_MT_SLOT) { ++ EvdevProcessTouch(pInfo); ++ pEvdev->cur_slot = ev->value; ++ } else if (ev->code == ABS_MT_TRACKING_ID) { ++ if (ev->value >= 0) { ++ pEvdev->open_slot = 1; ++ valuator_mask_copy(pEvdev->mt_vals, pEvdev->cur_vals); ++ } else ++ pEvdev->close_slot = 1; ++ } else { ++ map = pEvdev->axis_map[ev->code] - pEvdev->num_vals; ++ valuator_mask_set(pEvdev->mt_vals, map, ev->value); ++ valuator_mask_set(pEvdev->cur_vals, map, ev->value); ++ } ++} ++#else ++#define EvdevProcessTouch(pInfo) ++#define EvdevProcessTouchEvent(pInfo, ev) ++#endif /* MULTITOUCH */ ++ + /** + * Take the absolute motion input event and process it accordingly. + */ +@@ -634,6 +697,7 @@ EvdevProcessAbsoluteMotionEvent(InputInf + { + int value; + EvdevPtr pEvdev = pInfo->private; ++ int map; + + /* Get the signed value, earlier kernels had this as unsigned */ + value = ev->value; +@@ -648,13 +712,16 @@ EvdevProcessAbsoluteMotionEvent(InputInf + if (EvdevWheelEmuFilterMotion(pInfo, ev)) + return; + +- pEvdev->vals[pEvdev->axis_map[ev->code]] = value; +- if (ev->code == ABS_X) +- pEvdev->abs_queued |= ABS_X_VALUE; +- else if (ev->code == ABS_Y) +- pEvdev->abs_queued |= ABS_Y_VALUE; +- else +- pEvdev->abs_queued |= ABS_VALUE; ++ if (ev->code >= ABS_MT_SLOT) { ++ EvdevProcessTouchEvent(pInfo, ev); ++ pEvdev->abs_queued = 1; ++ } ++ /* Direct touch devices use server side pointer emulation */ ++ else if (!pInfo->dev->touch || pInfo->dev->touch->mode != XIDirectTouch) { ++ map = pEvdev->axis_map[ev->code]; ++ valuator_mask_set(pEvdev->vals, map, value); ++ pEvdev->abs_queued = 1; ++ } + } + + /** +@@ -712,7 +779,7 @@ EvdevPostRelativeMotionEvents(InputInfoP + EvdevPtr pEvdev = pInfo->private; + + if (pEvdev->rel_queued) { +- xf86PostMotionEventP(pInfo->dev, FALSE, first_v, num_v, v + first_v); ++ xf86PostMotionEventM(pInfo->dev, FALSE, pEvdev->vals); + } + } + +@@ -735,7 +802,7 @@ EvdevPostAbsoluteMotionEvents(InputInfoP + * this scheme still just work. + */ + if (pEvdev->abs_queued && pEvdev->in_proximity) { +- xf86PostMotionEventP(pInfo->dev, TRUE, first_v, num_v, v + first_v); ++ xf86PostMotionEventM(pInfo->dev, TRUE, pEvdev->vals); + } + } + +@@ -750,6 +817,9 @@ EvdevPostProximityEvents(InputInfoPtr pI + switch (pEvdev->queue[i].type) { + case EV_QUEUE_KEY: + case EV_QUEUE_BTN: ++#ifdef MULTITOUCH ++ case EV_QUEUE_TOUCH: ++#endif + break; + case EV_QUEUE_PROXIMITY: + if (pEvdev->queue[i].val == which) +@@ -772,23 +842,28 @@ static void EvdevPostQueuedEvents(InputI + for (i = 0; i < pEvdev->num_queue; i++) { + switch (pEvdev->queue[i].type) { + case EV_QUEUE_KEY: +- xf86PostKeyboardEvent(pInfo->dev, pEvdev->queue[i].key, ++ xf86PostKeyboardEvent(pInfo->dev, pEvdev->queue[i].detail.key, + pEvdev->queue[i].val); + break; + case EV_QUEUE_BTN: +-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 11 + if (pEvdev->abs_queued && pEvdev->in_proximity) { +- xf86PostButtonEventP(pInfo->dev, 1, pEvdev->queue[i].key, ++ xf86PostButtonEventP(pInfo->dev, 1, pEvdev->queue[i].detail.key, + pEvdev->queue[i].val, first_v, num_v, + v + first_v); + + } else +-#endif +- xf86PostButtonEvent(pInfo->dev, 0, pEvdev->queue[i].key, ++ xf86PostButtonEvent(pInfo->dev, 0, pEvdev->queue[i].detail.key, + pEvdev->queue[i].val, 0, 0); + break; + case EV_QUEUE_PROXIMITY: + break; ++#ifdef MULTITOUCH ++ case EV_QUEUE_TOUCH: ++ xf86PostTouchEvent(pInfo->dev, pEvdev->queue[i].detail.touch, ++ pEvdev->queue[i].val, 0, ++ pEvdev->queue[i].touch_vals); ++ break; ++#endif + } + } + } +@@ -806,7 +881,8 @@ EvdevProcessSyncEvent(InputInfoPtr pInfo + + EvdevProcessProximityState(pInfo); + +- EvdevProcessValuators(pInfo, v, &num_v, &first_v); ++ EvdevProcessValuators(pInfo); ++ EvdevProcessTouch(pInfo); + + EvdevPostProximityEvents(pInfo, TRUE, num_v, first_v, v); + EvdevPostRelativeMotionEvents(pInfo, num_v, first_v, v); +@@ -815,7 +891,8 @@ EvdevProcessSyncEvent(InputInfoPtr pInfo + EvdevPostProximityEvents(pInfo, FALSE, num_v, first_v, v); + + memset(pEvdev->delta, 0, sizeof(pEvdev->delta)); +- memset(pEvdev->queue, 0, sizeof(pEvdev->queue)); ++ if (pEvdev->vals) ++ valuator_mask_zero(pEvdev->vals); + pEvdev->num_queue = 0; + pEvdev->abs_queued = 0; + pEvdev->rel_queued = 0; +@@ -861,7 +938,17 @@ EvdevReadInput(InputInfoPtr pInfo) + + while (len == sizeof(ev)) + { +- len = read(pInfo->fd, &ev, sizeof(ev)); ++#ifdef MULTITOUCH ++ EvdevPtr pEvdev = pInfo->private; ++ ++ if (pEvdev->mtdev) ++ len = mtdev_get(pEvdev->mtdev, pInfo->fd, ev, NUM_EVENTS) * ++ sizeof(struct input_event); ++ else ++ len = read(pInfo->fd, &ev, sizeof(ev)); ++#else ++ len = read(pInfo->fd, &ev, sizeof(ev)); ++#endif + if (len <= 0) + { + if (errno == ENODEV) /* May happen after resume */ +@@ -900,317 +987,6 @@ EvdevPtrCtrlProc(DeviceIntPtr device, Pt + /* Nothing to do, dix handles all settings */ + } + +-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 5 +-static KeySym map[] = { +- /* 0x00 */ NoSymbol, NoSymbol, +- /* 0x01 */ XK_Escape, NoSymbol, +- /* 0x02 */ XK_1, XK_exclam, +- /* 0x03 */ XK_2, XK_at, +- /* 0x04 */ XK_3, XK_numbersign, +- /* 0x05 */ XK_4, XK_dollar, +- /* 0x06 */ XK_5, XK_percent, +- /* 0x07 */ XK_6, XK_asciicircum, +- /* 0x08 */ XK_7, XK_ampersand, +- /* 0x09 */ XK_8, XK_asterisk, +- /* 0x0a */ XK_9, XK_parenleft, +- /* 0x0b */ XK_0, XK_parenright, +- /* 0x0c */ XK_minus, XK_underscore, +- /* 0x0d */ XK_equal, XK_plus, +- /* 0x0e */ XK_BackSpace, NoSymbol, +- /* 0x0f */ XK_Tab, XK_ISO_Left_Tab, +- /* 0x10 */ XK_Q, NoSymbol, +- /* 0x11 */ XK_W, NoSymbol, +- /* 0x12 */ XK_E, NoSymbol, +- /* 0x13 */ XK_R, NoSymbol, +- /* 0x14 */ XK_T, NoSymbol, +- /* 0x15 */ XK_Y, NoSymbol, +- /* 0x16 */ XK_U, NoSymbol, +- /* 0x17 */ XK_I, NoSymbol, +- /* 0x18 */ XK_O, NoSymbol, +- /* 0x19 */ XK_P, NoSymbol, +- /* 0x1a */ XK_bracketleft, XK_braceleft, +- /* 0x1b */ XK_bracketright,XK_braceright, +- /* 0x1c */ XK_Return, NoSymbol, +- /* 0x1d */ XK_Control_L, NoSymbol, +- /* 0x1e */ XK_A, NoSymbol, +- /* 0x1f */ XK_S, NoSymbol, +- /* 0x20 */ XK_D, NoSymbol, +- /* 0x21 */ XK_F, NoSymbol, +- /* 0x22 */ XK_G, NoSymbol, +- /* 0x23 */ XK_H, NoSymbol, +- /* 0x24 */ XK_J, NoSymbol, +- /* 0x25 */ XK_K, NoSymbol, +- /* 0x26 */ XK_L, NoSymbol, +- /* 0x27 */ XK_semicolon, XK_colon, +- /* 0x28 */ XK_quoteright, XK_quotedbl, +- /* 0x29 */ XK_quoteleft, XK_asciitilde, +- /* 0x2a */ XK_Shift_L, NoSymbol, +- /* 0x2b */ XK_backslash, XK_bar, +- /* 0x2c */ XK_Z, NoSymbol, +- /* 0x2d */ XK_X, NoSymbol, +- /* 0x2e */ XK_C, NoSymbol, +- /* 0x2f */ XK_V, NoSymbol, +- /* 0x30 */ XK_B, NoSymbol, +- /* 0x31 */ XK_N, NoSymbol, +- /* 0x32 */ XK_M, NoSymbol, +- /* 0x33 */ XK_comma, XK_less, +- /* 0x34 */ XK_period, XK_greater, +- /* 0x35 */ XK_slash, XK_question, +- /* 0x36 */ XK_Shift_R, NoSymbol, +- /* 0x37 */ XK_KP_Multiply, NoSymbol, +- /* 0x38 */ XK_Alt_L, XK_Meta_L, +- /* 0x39 */ XK_space, NoSymbol, +- /* 0x3a */ XK_Caps_Lock, NoSymbol, +- /* 0x3b */ XK_F1, NoSymbol, +- /* 0x3c */ XK_F2, NoSymbol, +- /* 0x3d */ XK_F3, NoSymbol, +- /* 0x3e */ XK_F4, NoSymbol, +- /* 0x3f */ XK_F5, NoSymbol, +- /* 0x40 */ XK_F6, NoSymbol, +- /* 0x41 */ XK_F7, NoSymbol, +- /* 0x42 */ XK_F8, NoSymbol, +- /* 0x43 */ XK_F9, NoSymbol, +- /* 0x44 */ XK_F10, NoSymbol, +- /* 0x45 */ XK_Num_Lock, NoSymbol, +- /* 0x46 */ XK_Scroll_Lock, NoSymbol, +- /* These KP keys should have the KP_7 keysyms in the numlock +- * modifer... ? */ +- /* 0x47 */ XK_KP_Home, XK_KP_7, +- /* 0x48 */ XK_KP_Up, XK_KP_8, +- /* 0x49 */ XK_KP_Prior, XK_KP_9, +- /* 0x4a */ XK_KP_Subtract, NoSymbol, +- /* 0x4b */ XK_KP_Left, XK_KP_4, +- /* 0x4c */ XK_KP_Begin, XK_KP_5, +- /* 0x4d */ XK_KP_Right, XK_KP_6, +- /* 0x4e */ XK_KP_Add, NoSymbol, +- /* 0x4f */ XK_KP_End, XK_KP_1, +- /* 0x50 */ XK_KP_Down, XK_KP_2, +- /* 0x51 */ XK_KP_Next, XK_KP_3, +- /* 0x52 */ XK_KP_Insert, XK_KP_0, +- /* 0x53 */ XK_KP_Delete, XK_KP_Decimal, +- /* 0x54 */ NoSymbol, NoSymbol, +- /* 0x55 */ XK_F13, NoSymbol, +- /* 0x56 */ XK_less, XK_greater, +- /* 0x57 */ XK_F11, NoSymbol, +- /* 0x58 */ XK_F12, NoSymbol, +- /* 0x59 */ XK_F14, NoSymbol, +- /* 0x5a */ XK_F15, NoSymbol, +- /* 0x5b */ XK_F16, NoSymbol, +- /* 0x5c */ XK_F17, NoSymbol, +- /* 0x5d */ XK_F18, NoSymbol, +- /* 0x5e */ XK_F19, NoSymbol, +- /* 0x5f */ XK_F20, NoSymbol, +- /* 0x60 */ XK_KP_Enter, NoSymbol, +- /* 0x61 */ XK_Control_R, NoSymbol, +- /* 0x62 */ XK_KP_Divide, NoSymbol, +- /* 0x63 */ XK_Print, XK_Sys_Req, +- /* 0x64 */ XK_Alt_R, XK_Meta_R, +- /* 0x65 */ NoSymbol, NoSymbol, /* KEY_LINEFEED */ +- /* 0x66 */ XK_Home, NoSymbol, +- /* 0x67 */ XK_Up, NoSymbol, +- /* 0x68 */ XK_Prior, NoSymbol, +- /* 0x69 */ XK_Left, NoSymbol, +- /* 0x6a */ XK_Right, NoSymbol, +- /* 0x6b */ XK_End, NoSymbol, +- /* 0x6c */ XK_Down, NoSymbol, +- /* 0x6d */ XK_Next, NoSymbol, +- /* 0x6e */ XK_Insert, NoSymbol, +- /* 0x6f */ XK_Delete, NoSymbol, +- /* 0x70 */ NoSymbol, NoSymbol, /* KEY_MACRO */ +- /* 0x71 */ NoSymbol, NoSymbol, +- /* 0x72 */ NoSymbol, NoSymbol, +- /* 0x73 */ NoSymbol, NoSymbol, +- /* 0x74 */ NoSymbol, NoSymbol, +- /* 0x75 */ XK_KP_Equal, NoSymbol, +- /* 0x76 */ NoSymbol, NoSymbol, +- /* 0x77 */ NoSymbol, NoSymbol, +- /* 0x78 */ XK_F21, NoSymbol, +- /* 0x79 */ XK_F22, NoSymbol, +- /* 0x7a */ XK_F23, NoSymbol, +- /* 0x7b */ XK_F24, NoSymbol, +- /* 0x7c */ XK_KP_Separator, NoSymbol, +- /* 0x7d */ XK_Meta_L, NoSymbol, +- /* 0x7e */ XK_Meta_R, NoSymbol, +- /* 0x7f */ XK_Multi_key, NoSymbol, +- /* 0x80 */ NoSymbol, NoSymbol, +- /* 0x81 */ NoSymbol, NoSymbol, +- /* 0x82 */ NoSymbol, NoSymbol, +- /* 0x83 */ NoSymbol, NoSymbol, +- /* 0x84 */ NoSymbol, NoSymbol, +- /* 0x85 */ NoSymbol, NoSymbol, +- /* 0x86 */ NoSymbol, NoSymbol, +- /* 0x87 */ NoSymbol, NoSymbol, +- /* 0x88 */ NoSymbol, NoSymbol, +- /* 0x89 */ NoSymbol, NoSymbol, +- /* 0x8a */ NoSymbol, NoSymbol, +- /* 0x8b */ NoSymbol, NoSymbol, +- /* 0x8c */ NoSymbol, NoSymbol, +- /* 0x8d */ NoSymbol, NoSymbol, +- /* 0x8e */ NoSymbol, NoSymbol, +- /* 0x8f */ NoSymbol, NoSymbol, +- /* 0x90 */ NoSymbol, NoSymbol, +- /* 0x91 */ NoSymbol, NoSymbol, +- /* 0x92 */ NoSymbol, NoSymbol, +- /* 0x93 */ NoSymbol, NoSymbol, +- /* 0x94 */ NoSymbol, NoSymbol, +- /* 0x95 */ NoSymbol, NoSymbol, +- /* 0x96 */ NoSymbol, NoSymbol, +- /* 0x97 */ NoSymbol, NoSymbol, +- /* 0x98 */ NoSymbol, NoSymbol, +- /* 0x99 */ NoSymbol, NoSymbol, +- /* 0x9a */ NoSymbol, NoSymbol, +- /* 0x9b */ NoSymbol, NoSymbol, +- /* 0x9c */ NoSymbol, NoSymbol, +- /* 0x9d */ NoSymbol, NoSymbol, +- /* 0x9e */ NoSymbol, NoSymbol, +- /* 0x9f */ NoSymbol, NoSymbol, +- /* 0xa0 */ NoSymbol, NoSymbol, +- /* 0xa1 */ NoSymbol, NoSymbol, +- /* 0xa2 */ NoSymbol, NoSymbol, +- /* 0xa3 */ NoSymbol, NoSymbol, +- /* 0xa4 */ NoSymbol, NoSymbol, +- /* 0xa5 */ NoSymbol, NoSymbol, +- /* 0xa6 */ NoSymbol, NoSymbol, +- /* 0xa7 */ NoSymbol, NoSymbol, +- /* 0xa8 */ NoSymbol, NoSymbol, +- /* 0xa9 */ NoSymbol, NoSymbol, +- /* 0xaa */ NoSymbol, NoSymbol, +- /* 0xab */ NoSymbol, NoSymbol, +- /* 0xac */ NoSymbol, NoSymbol, +- /* 0xad */ NoSymbol, NoSymbol, +- /* 0xae */ NoSymbol, NoSymbol, +- /* 0xaf */ NoSymbol, NoSymbol, +- /* 0xb0 */ NoSymbol, NoSymbol, +- /* 0xb1 */ NoSymbol, NoSymbol, +- /* 0xb2 */ NoSymbol, NoSymbol, +- /* 0xb3 */ NoSymbol, NoSymbol, +- /* 0xb4 */ NoSymbol, NoSymbol, +- /* 0xb5 */ NoSymbol, NoSymbol, +- /* 0xb6 */ NoSymbol, NoSymbol, +- /* 0xb7 */ NoSymbol, NoSymbol, +- /* 0xb8 */ NoSymbol, NoSymbol, +- /* 0xb9 */ NoSymbol, NoSymbol, +- /* 0xba */ NoSymbol, NoSymbol, +- /* 0xbb */ NoSymbol, NoSymbol, +- /* 0xbc */ NoSymbol, NoSymbol, +- /* 0xbd */ NoSymbol, NoSymbol, +- /* 0xbe */ NoSymbol, NoSymbol, +- /* 0xbf */ NoSymbol, NoSymbol, +- /* 0xc0 */ NoSymbol, NoSymbol, +- /* 0xc1 */ NoSymbol, NoSymbol, +- /* 0xc2 */ NoSymbol, NoSymbol, +- /* 0xc3 */ NoSymbol, NoSymbol, +- /* 0xc4 */ NoSymbol, NoSymbol, +- /* 0xc5 */ NoSymbol, NoSymbol, +- /* 0xc6 */ NoSymbol, NoSymbol, +- /* 0xc7 */ NoSymbol, NoSymbol, +- /* 0xc8 */ NoSymbol, NoSymbol, +- /* 0xc9 */ NoSymbol, NoSymbol, +- /* 0xca */ NoSymbol, NoSymbol, +- /* 0xcb */ NoSymbol, NoSymbol, +- /* 0xcc */ NoSymbol, NoSymbol, +- /* 0xcd */ NoSymbol, NoSymbol, +- /* 0xce */ NoSymbol, NoSymbol, +- /* 0xcf */ NoSymbol, NoSymbol, +- /* 0xd0 */ NoSymbol, NoSymbol, +- /* 0xd1 */ NoSymbol, NoSymbol, +- /* 0xd2 */ NoSymbol, NoSymbol, +- /* 0xd3 */ NoSymbol, NoSymbol, +- /* 0xd4 */ NoSymbol, NoSymbol, +- /* 0xd5 */ NoSymbol, NoSymbol, +- /* 0xd6 */ NoSymbol, NoSymbol, +- /* 0xd7 */ NoSymbol, NoSymbol, +- /* 0xd8 */ NoSymbol, NoSymbol, +- /* 0xd9 */ NoSymbol, NoSymbol, +- /* 0xda */ NoSymbol, NoSymbol, +- /* 0xdb */ NoSymbol, NoSymbol, +- /* 0xdc */ NoSymbol, NoSymbol, +- /* 0xdd */ NoSymbol, NoSymbol, +- /* 0xde */ NoSymbol, NoSymbol, +- /* 0xdf */ NoSymbol, NoSymbol, +- /* 0xe0 */ NoSymbol, NoSymbol, +- /* 0xe1 */ NoSymbol, NoSymbol, +- /* 0xe2 */ NoSymbol, NoSymbol, +- /* 0xe3 */ NoSymbol, NoSymbol, +- /* 0xe4 */ NoSymbol, NoSymbol, +- /* 0xe5 */ NoSymbol, NoSymbol, +- /* 0xe6 */ NoSymbol, NoSymbol, +- /* 0xe7 */ NoSymbol, NoSymbol, +- /* 0xe8 */ NoSymbol, NoSymbol, +- /* 0xe9 */ NoSymbol, NoSymbol, +- /* 0xea */ NoSymbol, NoSymbol, +- /* 0xeb */ NoSymbol, NoSymbol, +- /* 0xec */ NoSymbol, NoSymbol, +- /* 0xed */ NoSymbol, NoSymbol, +- /* 0xee */ NoSymbol, NoSymbol, +- /* 0xef */ NoSymbol, NoSymbol, +- /* 0xf0 */ NoSymbol, NoSymbol, +- /* 0xf1 */ NoSymbol, NoSymbol, +- /* 0xf2 */ NoSymbol, NoSymbol, +- /* 0xf3 */ NoSymbol, NoSymbol, +- /* 0xf4 */ NoSymbol, NoSymbol, +- /* 0xf5 */ NoSymbol, NoSymbol, +- /* 0xf6 */ NoSymbol, NoSymbol, +- /* 0xf7 */ NoSymbol, NoSymbol, +-}; +- +-static struct { KeySym keysym; CARD8 mask; } modifiers[] = { +- { XK_Shift_L, ShiftMask }, +- { XK_Shift_R, ShiftMask }, +- { XK_Control_L, ControlMask }, +- { XK_Control_R, ControlMask }, +- { XK_Caps_Lock, LockMask }, +- { XK_Alt_L, AltMask }, +- { XK_Alt_R, AltMask }, +- { XK_Meta_L, Mod4Mask }, +- { XK_Meta_R, Mod4Mask }, +- { XK_Num_Lock, NumLockMask }, +- { XK_Scroll_Lock, ScrollLockMask }, +- { XK_Mode_switch, AltLangMask } +-}; +- +-/* Server 1.6 and earlier */ +-static int +-EvdevInitKeysyms(DeviceIntPtr device) +-{ +- InputInfoPtr pInfo; +- EvdevPtr pEvdev; +- KeySymsRec keySyms; +- CARD8 modMap[MAP_LENGTH]; +- KeySym sym; +- int i, j; +- +- pInfo = device->public.devicePrivate; +- pEvdev = pInfo->private; +- +- /* Compute the modifier map */ +- memset(modMap, 0, sizeof modMap); +- +- for (i = 0; i < ArrayLength(map) / GLYPHS_PER_KEY; i++) { +- sym = map[i * GLYPHS_PER_KEY]; +- for (j = 0; j < ArrayLength(modifiers); j++) { +- if (modifiers[j].keysym == sym) +- modMap[i + MIN_KEYCODE] = modifiers[j].mask; +- } +- } +- +- keySyms.map = map; +- keySyms.mapWidth = GLYPHS_PER_KEY; +- keySyms.minKeyCode = MIN_KEYCODE; +- keySyms.maxKeyCode = MIN_KEYCODE + ArrayLength(map) / GLYPHS_PER_KEY - 1; +- +- XkbSetRulesDflts(pEvdev->rmlvo.rules, pEvdev->rmlvo.model, +- pEvdev->rmlvo.layout, pEvdev->rmlvo.variant, +- pEvdev->rmlvo.options); +- if (!XkbInitKeyboardDeviceStruct(device, &pEvdev->xkbnames, +- &keySyms, modMap, NULL, +- EvdevKbdCtrl)) +- return 0; +- +- return 1; +-} +-#endif +- + static void + EvdevKbdCtrl(DeviceIntPtr device, KeybdCtrl *ctrl) + { +@@ -1263,14 +1039,8 @@ EvdevAddKeyClass(DeviceIntPtr device) + if (!pEvdev->rmlvo.options) + SetXkbOption(pInfo, "XkbOptions", &pEvdev->rmlvo.options); + +-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5 + if (!InitKeyboardDeviceStruct(device, &pEvdev->rmlvo, NULL, EvdevKbdCtrl)) + return !Success; +-#else +- if (!EvdevInitKeysyms(device)) +- return !Success; +- +-#endif + + return Success; + } +@@ -1280,53 +1050,114 @@ EvdevAddAbsClass(DeviceIntPtr device) + { + InputInfoPtr pInfo; + EvdevPtr pEvdev; +- int num_axes, axis, i = 0; ++ int num_axes, num_mt_axes, axis, i = 0; + Atom *atoms; + + pInfo = device->public.devicePrivate; + pEvdev = pInfo->private; + + if (!TestBit(EV_ABS, pEvdev->bitmask)) +- return !Success; ++ goto out; + +- num_axes = EvdevCountBits(pEvdev->abs_bitmask, NLONGS(ABS_MAX)); +- if (num_axes < 1) +- return !Success; ++ num_axes = CountBits((uint8_t *)pEvdev->abs_bitmask, ABS_MT_SLOT); ++ num_mt_axes = CountBits((uint8_t *)pEvdev->abs_bitmask, ABS_CNT) - num_axes; + + if (num_axes > MAX_VALUATORS) { + xf86Msg(X_WARNING, "%s: found %d axes, limiting to %d.\n", device->name, num_axes, MAX_VALUATORS); + num_axes = MAX_VALUATORS; + } + ++#ifdef MULTITOUCH ++ if (TestBit(ABS_MT_SLOT, pEvdev->abs_bitmask)) ++ num_mt_axes--; ++ if (TestBit(ABS_MT_TRACKING_ID, pEvdev->abs_bitmask)) ++ num_mt_axes--; ++ ++ if (num_mt_axes > MAX_VALUATORS) { ++ xf86Msg(X_WARNING, "%s: found %d MT axes, limiting to %d.\n", device->name, num_axes, MAX_VALUATORS); ++ num_mt_axes = MAX_VALUATORS; ++ } ++#endif ++ ++ if (num_axes < 1 && num_mt_axes < 1) { ++ xf86Msg(X_WARNING, "%s: no absolute or touch axes found.\n", ++ device->name); ++ goto out; ++ } ++ + pEvdev->num_vals = num_axes; +- memset(pEvdev->vals, 0, num_axes * sizeof(int)); +- memset(pEvdev->old_vals, -1, num_axes * sizeof(int)); +- atoms = malloc(pEvdev->num_vals * sizeof(Atom)); ++ if (num_axes > 0) { ++ pEvdev->vals = valuator_mask_new(num_axes); ++ pEvdev->old_vals = valuator_mask_new(num_axes); ++ if (!pEvdev->vals || !pEvdev->old_vals) { ++ xf86Msg(X_ERROR, "%s: failed to allocate valuator masks.\n", ++ device->name); ++ goto out; ++ } ++ } ++#ifdef MULTITOUCH ++ pEvdev->num_mt_vals = num_mt_axes; ++ if (num_mt_axes > 0) { ++ pEvdev->mt_vals = valuator_mask_new(num_mt_axes); ++ pEvdev->cur_vals = valuator_mask_new(num_mt_axes); ++ if (!pEvdev->mt_vals || !pEvdev->cur_vals) { ++ xf86Msg(X_ERROR, "%s: failed to allocate MT valuator mask.\n", ++ device->name); ++ goto out; ++ } ++ ++ for (i = 0; i < EVDEV_MAXQUEUE; i++) { ++ pEvdev->queue[i].touch_vals = ++ valuator_mask_new(num_mt_axes); ++ if (!pEvdev->queue[i].touch_vals) { ++ xf86Msg(X_ERROR, "%s: failed to allocate MT valuator masks for " ++ "evdev event queue.\n", device->name); ++ goto out; ++ } ++ } ++ } ++#endif ++ atoms = malloc((pEvdev->num_vals + num_mt_axes) * sizeof(Atom)); + ++ i = 0; + for (axis = ABS_X; i < MAX_VALUATORS && axis <= ABS_MAX; axis++) { + pEvdev->axis_map[axis] = -1; +- if (!TestBit(axis, pEvdev->abs_bitmask)) ++ if (!TestBit(axis, pEvdev->abs_bitmask) || axis == ABS_MT_SLOT || ++ axis == ABS_MT_TRACKING_ID) + continue; + pEvdev->axis_map[axis] = i; + i++; + } + +- EvdevInitAxesLabels(pEvdev, pEvdev->num_vals, atoms); ++ EvdevInitAxesLabels(pEvdev, pEvdev->num_vals + num_mt_axes, atoms); + +- if (!InitValuatorClassDeviceStruct(device, num_axes, +-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 +- atoms, +-#endif +-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 +- GetMotionHistory, +-#endif ++ if (!InitValuatorClassDeviceStruct(device, num_axes, atoms, + GetMotionHistorySize(), Absolute)) { + xf86Msg(X_ERROR, "%s: failed to initialize valuator class device.\n", + device->name); +- return !Success; ++ goto out; ++ } ++ ++#ifdef MULTITOUCH ++ if (num_mt_axes > 0) ++ { ++ int num_touches = 10; ++ int mode = pEvdev->flags & EVDEV_TOUCHPAD ? ++ XIDependentTouch : XIDirectTouch; ++ ++ if (pEvdev->mtdev->caps.slot.maximum > 0) ++ num_touches = pEvdev->mtdev->caps.slot.maximum; ++ ++ if (!InitTouchClassDeviceStruct(device, num_touches, mode, ++ num_mt_axes)) { ++ xf86Msg(X_ERROR, "%s: failed to initialize touch class device.\n", ++ device->name); ++ goto out; ++ } + } ++#endif + +- for (axis = ABS_X; axis <= ABS_MAX; axis++) { ++ for (axis = ABS_X; axis < ABS_MT_SLOT; axis++) { + int axnum = pEvdev->axis_map[axis]; + int resolution = 10000; + +@@ -1340,20 +1171,32 @@ EvdevAddAbsClass(DeviceIntPtr device) + #endif + + xf86InitValuatorAxisStruct(device, axnum, +-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 + atoms[axnum], +-#endif + pEvdev->absinfo[axis].minimum, + pEvdev->absinfo[axis].maximum, +- resolution, 0, resolution +-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12 +- , Absolute +-#endif +- ); ++ resolution, 0, resolution, Absolute); + xf86InitValuatorDefaults(device, axnum); +- pEvdev->old_vals[axnum] = -1; + } + ++#ifdef MULTITOUCH ++ for (axis = ABS_MT_TOUCH_MAJOR; axis <= ABS_MAX; axis++) { ++ int axnum = pEvdev->axis_map[axis] - pEvdev->num_vals; ++ int resolution = 10000; ++ ++ if (axnum < 0) ++ continue; ++ ++ if (pEvdev->absinfo[axis].resolution) ++ resolution = pEvdev->absinfo[axis].resolution * 1000; ++ ++ xf86InitTouchValuatorAxisStruct(device, axnum, ++ atoms[axnum + pEvdev->num_vals], ++ pEvdev->absinfo[axis].minimum, ++ pEvdev->absinfo[axis].maximum, ++ pEvdev->absinfo[axis].resolution); ++ } ++#endif ++ + free(atoms); + + for (i = 0; i < ArrayLength(proximity_bits); i++) +@@ -1364,6 +1207,12 @@ EvdevAddAbsClass(DeviceIntPtr device) + if (TestBit(proximity_bits[i], pEvdev->key_bitmask)) + { + InitProximityClassDeviceStruct(device); ++ pEvdev->prox = valuator_mask_new(num_axes); ++ if (!pEvdev->prox) { ++ xf86Msg(X_ERROR, "%s: failed to allocate proximity valuator " ++ "mask.\n", device->name); ++ goto out; ++ } + break; + } + } +@@ -1371,7 +1220,7 @@ EvdevAddAbsClass(DeviceIntPtr device) + if (!InitPtrFeedbackClassDeviceStruct(device, EvdevPtrCtrlProc)) { + xf86Msg(X_ERROR, "%s: failed to initialize pointer feedback class " + "device.\n", device->name); +- return !Success; ++ goto out; + } + + if (pEvdev->flags & EVDEV_TOUCHPAD) +@@ -1393,6 +1242,18 @@ EvdevAddAbsClass(DeviceIntPtr device) + } + + return Success; ++ ++out: ++#ifdef MULTITOUCH ++ valuator_mask_free(&pEvdev->mt_vals); ++ valuator_mask_free(&pEvdev->cur_vals); ++ for (i = 0; i < EVDEV_MAXQUEUE; i++) ++ valuator_mask_free(&pEvdev->queue[i].touch_vals); ++#endif ++ valuator_mask_free(&pEvdev->vals); ++ valuator_mask_free(&pEvdev->old_vals); ++ valuator_mask_free(&pEvdev->prox); ++ return !Success; + } + + static int +@@ -1407,11 +1268,11 @@ EvdevAddRelClass(DeviceIntPtr device) + pEvdev = pInfo->private; + + if (!TestBit(EV_REL, pEvdev->bitmask)) +- return !Success; ++ goto out; + + num_axes = EvdevCountBits(pEvdev->rel_bitmask, NLONGS(REL_MAX)); + if (num_axes < 1) +- return !Success; ++ goto out; + + /* Wheels are special, we post them as button events. So let's ignore them + * in the axes list too */ +@@ -1423,7 +1284,7 @@ EvdevAddRelClass(DeviceIntPtr device) + num_axes--; + + if (num_axes <= 0) +- return !Success; ++ goto out; + + if (num_axes > MAX_VALUATORS) { + xf86Msg(X_WARNING, "%s: found %d axes, limiting to %d.\n", device->name, num_axes, MAX_VALUATORS); +@@ -1431,7 +1292,11 @@ EvdevAddRelClass(DeviceIntPtr device) + } + + pEvdev->num_vals = num_axes; +- memset(pEvdev->vals, 0, num_axes * sizeof(int)); ++ if (num_axes > 0) { ++ pEvdev->vals = valuator_mask_new(num_axes); ++ if (!pEvdev->vals) ++ goto out; ++ } + atoms = malloc(pEvdev->num_vals * sizeof(Atom)); + + for (axis = REL_X; i < MAX_VALUATORS && axis <= REL_MAX; axis++) +@@ -1448,23 +1313,17 @@ EvdevAddRelClass(DeviceIntPtr device) + + EvdevInitAxesLabels(pEvdev, pEvdev->num_vals, atoms); + +- if (!InitValuatorClassDeviceStruct(device, num_axes, +-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 +- atoms, +-#endif +-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 +- GetMotionHistory, +-#endif ++ if (!InitValuatorClassDeviceStruct(device, num_axes, atoms, + GetMotionHistorySize(), Relative)) { + xf86Msg(X_ERROR, "%s: failed to initialize valuator class device.\n", + device->name); +- return !Success; ++ goto out; + } + + if (!InitPtrFeedbackClassDeviceStruct(device, EvdevPtrCtrlProc)) { + xf86Msg(X_ERROR, "%s: failed to initialize pointer feedback class " + "device.\n", device->name); +- return !Success; ++ goto out; + } + + for (axis = REL_X; axis <= REL_MAX; axis++) +@@ -1473,21 +1332,18 @@ EvdevAddRelClass(DeviceIntPtr device) + + if (axnum == -1) + continue; +- xf86InitValuatorAxisStruct(device, axnum, +-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 +- atoms[axnum], +-#endif +- -1, -1, 1, 0, 1 +-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12 +- , Relative +-#endif +- ); ++ xf86InitValuatorAxisStruct(device, axnum, atoms[axnum], -1, -1, 1, 0, 1, ++ Relative); + xf86InitValuatorDefaults(device, axnum); + } + + free(atoms); + + return Success; ++ ++out: ++ valuator_mask_free(&pEvdev->vals); ++ return !Success; + } + + static int +@@ -1503,10 +1359,7 @@ EvdevAddButtonClass(DeviceIntPtr device) + labels = malloc(pEvdev->num_buttons * sizeof(Atom)); + EvdevInitButtonLabels(pEvdev, pEvdev->num_buttons, labels); + +- if (!InitButtonClassDeviceStruct(device, pEvdev->num_buttons, +-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 +- labels, +-#endif ++ if (!InitButtonClassDeviceStruct(device, pEvdev->num_buttons, labels, + pEvdev->btnmap)) + return !Success; + +@@ -1678,7 +1531,6 @@ EvdevInit(DeviceIntPtr device) + else if (pEvdev->flags & EVDEV_ABSOLUTE_EVENTS) + EvdevInitAbsClass(device, pEvdev); + +-#ifdef HAVE_PROPERTIES + /* We drop the return value, the only time we ever want the handlers to + * unregister is when the device dies. In which case we don't have to + * unregister anyway */ +@@ -1687,7 +1539,6 @@ EvdevInit(DeviceIntPtr device) + EvdevMBEmuInitProperty(device); + EvdevWheelEmuInitProperty(device); + EvdevDragLockInitProperty(device); +-#endif + + return Success; + } +@@ -1726,6 +1577,9 @@ EvdevProc(DeviceIntPtr device, int what) + { + InputInfoPtr pInfo; + EvdevPtr pEvdev; ++#ifdef MULTITOUCH ++ int i; ++#endif + + pInfo = device->public.devicePrivate; + pEvdev = pInfo->private; +@@ -1759,6 +1613,17 @@ EvdevProc(DeviceIntPtr device, int what) + close(pInfo->fd); + pInfo->fd = -1; + } ++ valuator_mask_free(&pEvdev->vals); ++ valuator_mask_free(&pEvdev->old_vals); ++ valuator_mask_free(&pEvdev->prox); ++#ifdef MULTITOUCH ++ valuator_mask_free(&pEvdev->mt_vals); ++ valuator_mask_free(&pEvdev->cur_vals); ++ for (i = 0; i < EVDEV_MAXQUEUE; i++) ++ valuator_mask_free(&pEvdev->queue[i].touch_vals); ++ if (pEvdev->mtdev) ++ mtdev_close(pEvdev->mtdev); ++#endif + EvdevRemoveDevice(pInfo); + pEvdev->min_maj = 0; + break; +@@ -2015,7 +1880,6 @@ EvdevProbe(InputInfoPtr pInfo) + if (has_lmr || TestBit(BTN_TOOL_FINGER, pEvdev->key_bitmask)) { + xf86Msg(X_PROBED, "%s: Found absolute touchpad.\n", pInfo->name); + pEvdev->flags |= EVDEV_TOUCHPAD; +- memset(pEvdev->old_vals, -1, sizeof(int) * pEvdev->num_vals); + } else { + xf86Msg(X_PROBED, "%s: Found absolute touchscreen\n", pInfo->name); + pEvdev->flags |= EVDEV_TOUCHSCREEN; +@@ -2135,6 +1999,16 @@ EvdevOpenDevice(InputInfoPtr pInfo) + + pEvdev->device = device; + xf86Msg(X_CONFIG, "%s: Device: \"%s\"\n", pInfo->name, device); ++ ++#ifdef MULTITOUCH ++ pEvdev->mtdev = malloc(sizeof(struct mtdev)); ++ if (!pEvdev->mtdev) ++ { ++ xf86Msg(X_ERROR, "%s: Couldn't allocate mtdev structure\n", ++ pInfo->name); ++ return BadAlloc; ++ } ++#endif + } + + if (pInfo->fd < 0) +@@ -2149,6 +2023,17 @@ EvdevOpenDevice(InputInfoPtr pInfo) + } + } + ++#ifdef MULTITOUCH ++ if (mtdev_open(pEvdev->mtdev, pInfo->fd) == 0) ++ pEvdev->cur_slot = pEvdev->mtdev->caps.slot.value; ++ else { ++ free(pEvdev->mtdev); ++ pEvdev->mtdev = NULL; ++ xf86Msg(X_ERROR, "%s: Couldn't open mtdev device\n", pInfo->name); ++ return FALSE; ++ } ++#endif ++ + /* Check major/minor of device node to avoid adding duplicate devices. */ + pEvdev->min_maj = EvdevGetMajorMinor(pInfo); + if (EvdevIsDuplicate(pInfo)) +@@ -2162,52 +2047,8 @@ EvdevOpenDevice(InputInfoPtr pInfo) + return Success; + } + +-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12 +-static int NewEvdevPreInit(InputDriverPtr, InputInfoPtr, int); +- +-static InputInfoPtr +-EvdevPreInit(InputDriverPtr drv, IDevPtr dev, int flags) +-{ +- InputInfoPtr pInfo; +- +- if (!(pInfo = xf86AllocateInput(drv, 0))) +- return NULL; +- +- /* Initialise the InputInfoRec. */ +- pInfo->fd = -1; +- pInfo->name = dev->identifier; +- pInfo->flags = 0; +- pInfo->history_size = 0; +- pInfo->control_proc = NULL; +- pInfo->close_proc = NULL; +- pInfo->conversion_proc = NULL; +- pInfo->reverse_conversion_proc = NULL; +- pInfo->dev = NULL; +- pInfo->private_flags = 0; +- pInfo->always_core_feedback = NULL; +- pInfo->conf_idev = dev; +- pInfo->private = NULL; +- +- xf86CollectInputOptions(pInfo, (const char**)evdevDefaults, NULL); +- xf86ProcessCommonOptions(pInfo, pInfo->options); +- +- if (NewEvdevPreInit(drv, pInfo, flags) == Success) +- { +- pInfo->flags |= XI86_CONFIGURED; +- return pInfo; +- } +- +- +- xf86DeleteInput(pInfo, 0); +- return NULL; +-} +- +-static int +-NewEvdevPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) +-#else + static int + EvdevPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) +-#endif + { + EvdevPtr pEvdev; + int rc = BadAlloc; +@@ -2225,6 +2066,10 @@ EvdevPreInit(InputDriverPtr drv, InputIn + if (rc != Success) + goto error; + ++#ifdef MULTITOUCH ++ pEvdev->cur_slot = -1; ++#endif ++ + /* + * We initialize pEvdev->in_proximity to 1 so that device that doesn't use + * proximity will still report events. +@@ -2279,9 +2124,7 @@ _X_EXPORT InputDriverRec EVDEV = { + EvdevPreInit, + NULL, + NULL, +-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12 + evdevDefaults +-#endif + }; + + static void +@@ -2356,8 +2199,6 @@ EvdevUtilButtonEventToButtonNumber(Evdev + } + } + +-#ifdef HAVE_PROPERTIES +-#ifdef HAVE_LABELS + /* Aligned with linux/input.h. + Note that there are holes in the ABS_ range, these are simply replaced with + MISC here */ +@@ -2411,7 +2252,6 @@ static char* abs_labels[] = { + AXIS_LABEL_PROP_ABS_MISC, /* undefined */ + AXIS_LABEL_PROP_ABS_MISC, /* undefined */ + AXIS_LABEL_PROP_ABS_MISC, /* undefined */ +-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 10 + AXIS_LABEL_PROP_ABS_MT_TOUCH_MAJOR, /* 0x30 */ + AXIS_LABEL_PROP_ABS_MT_TOUCH_MINOR, /* 0x31 */ + AXIS_LABEL_PROP_ABS_MT_WIDTH_MAJOR, /* 0x32 */ +@@ -2423,7 +2263,6 @@ static char* abs_labels[] = { + AXIS_LABEL_PROP_ABS_MT_BLOB_ID, /* 0x38 */ + AXIS_LABEL_PROP_ABS_MT_TRACKING_ID, /* 0x39 */ + AXIS_LABEL_PROP_ABS_MT_PRESSURE, /* 0x3a */ +-#endif + }; + + static char* rel_labels[] = { +@@ -2520,11 +2359,8 @@ static char* btn_labels[][16] = { + } + }; + +-#endif /* HAVE_LABELS */ +- + static void EvdevInitAxesLabels(EvdevPtr pEvdev, int natoms, Atom *atoms) + { +-#ifdef HAVE_LABELS + Atom atom; + int axis; + char **labels; +@@ -2557,12 +2393,10 @@ static void EvdevInitAxesLabels(EvdevPtr + + atoms[pEvdev->axis_map[axis]] = atom; + } +-#endif + } + + static void EvdevInitButtonLabels(EvdevPtr pEvdev, int natoms, Atom *atoms) + { +-#ifdef HAVE_LABELS + Atom atom; + int button, bmap; + +@@ -2600,7 +2434,6 @@ static void EvdevInitButtonLabels(EvdevP + atoms[5] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_LEFT); + if (natoms > 6) + atoms[6] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_RIGHT); +-#endif + } + + static void +@@ -2659,11 +2492,10 @@ EvdevInitProperty(DeviceIntPtr dev) + + XISetDevicePropertyDeletable(dev, prop_swap, FALSE); + +-#ifdef HAVE_LABELS + /* Axis labelling */ + if ((pEvdev->num_vals > 0) && (prop_axis_label = XIGetKnownProperty(AXIS_LABEL_PROP))) + { +- Atom atoms[pEvdev->num_vals]; ++ Atom atoms[pEvdev->num_vals + pEvdev->num_mt_vals]; + EvdevInitAxesLabels(pEvdev, pEvdev->num_vals, atoms); + XIChangeDeviceProperty(dev, prop_axis_label, XA_ATOM, 32, + PropModeReplace, pEvdev->num_vals, atoms, FALSE); +@@ -2678,7 +2510,6 @@ EvdevInitProperty(DeviceIntPtr dev) + PropModeReplace, pEvdev->num_buttons, atoms, FALSE); + XISetDevicePropertyDeletable(dev, prop_btn_label, FALSE); + } +-#endif /* HAVE_LABELS */ + } + + } +@@ -2723,4 +2554,3 @@ EvdevSetProperty(DeviceIntPtr dev, Atom + + return Success; + } +-#endif +--- a/src/evdev.h ++++ b/src/evdev.h +@@ -39,6 +39,16 @@ + #include + #include + ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) * 100 + GET_ABI_MINOR(ABI_XINPUT_VERSION) < 1202 ++#error "Need X server input ABI version 12.2 or greater" ++#endif ++ ++#define MULTITOUCH /* Will be at least ABI 13.1, but it's not there yet */ ++ ++#ifdef MULTITOUCH ++#include ++#endif ++ + #ifndef EV_CNT /* linux 2.6.23 kernels and earlier lack _CNT defines */ + #define EV_CNT (EV_MAX+1) + #endif +@@ -72,26 +82,10 @@ + #define EVDEV_UNIGNORE_RELATIVE (1 << 10) /* explicitly unignore rel axes */ + #define EVDEV_RELATIVE_MODE (1 << 11) /* Force relative events for devices with absolute axes */ + +-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 3 +-#define HAVE_PROPERTIES 1 +-#endif +- + #ifndef MAX_VALUATORS + #define MAX_VALUATORS 36 + #endif + +- +-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 5 +-typedef struct { +- char *rules; +- char *model; +- char *layout; +- char *variant; +- char *options; +-} XkbRMLVOSet; +-#endif +- +- + #define LONG_BITS (sizeof(long) * 8) + + /* Number of longs needed to hold the given number of bits */ +@@ -110,9 +104,20 @@ typedef struct { + EV_QUEUE_KEY, /* xf86PostKeyboardEvent() */ + EV_QUEUE_BTN, /* xf86PostButtonEvent() */ + EV_QUEUE_PROXIMITY, /* xf86PostProximityEvent() */ ++#ifdef MULTITOUCH ++ EV_QUEUE_TOUCH, /*xf86PostTouchEvent() */ ++#endif + } type; +- int key; /* May be either a key code or button number. */ +- int val; /* State of the key/button; pressed or released. */ ++ union { ++ int key; /* May be either a key code or button number. */ ++#ifdef MULTITOUCH ++ unsigned int touch; /* Touch ID */ ++#endif ++ } detail; ++ int val; /* State of the key/button/touch; pressed or released. */ ++#ifdef MULTITOUCH ++ ValuatorMask *touch_vals; /* current state of valuators for touch */ ++#endif + } EventQueueRec, *EventQueuePtr; + + typedef struct { +@@ -121,8 +126,18 @@ typedef struct { + + int num_vals; /* number of valuators */ + int axis_map[max(ABS_CNT, REL_CNT)]; /* Map evdev to index */ +- int vals[MAX_VALUATORS]; +- int old_vals[MAX_VALUATORS]; /* Translate absolute inputs to relative */ ++ ValuatorMask *vals; /* new values coming in */ ++ ValuatorMask *old_vals; /* old values for calculating relative motion */ ++ ValuatorMask *prox; /* last values set while not in proximity */ ++#ifdef MULTITOUCH ++ int num_mt_vals; ++ ValuatorMask *mt_vals; /* multitouch values coming in */ ++ ValuatorMask *cur_vals; /* current values of MT axes in evdev state */ ++ int cur_slot; ++ BOOL close_slot; ++ BOOL open_slot; ++ struct mtdev *mtdev; ++#endif + + int flags; + int in_proximity; /* device in proximity */ +@@ -134,12 +149,8 @@ typedef struct { + + int delta[REL_CNT]; + unsigned int abs_queued, rel_queued, prox_queued; +- unsigned int abs_prox; /* valuators posted while out of prox? */ + + /* XKB stuff has to be per-device rather than per-driver */ +-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 5 +- XkbComponentNamesRec xkbnames; +-#endif + XkbRMLVOSet rmlvo; + + /* Middle mouse button emulation */ +@@ -202,6 +213,10 @@ typedef struct { + void EvdevQueueKbdEvent(InputInfoPtr pInfo, struct input_event *ev, int value); + void EvdevQueueButtonEvent(InputInfoPtr pInfo, int button, int value); + void EvdevQueueProximityEvent(InputInfoPtr pInfo, int value); ++#ifdef MULTITOUCH ++void EvdevQueueTouchEvent(InputInfoPtr pInfo, unsigned int touch, ++ ValuatorMask *mask, uint16_t type); ++#endif + void EvdevPostButtonEvent(InputInfoPtr pInfo, int button, int value); + void EvdevQueueButtonClicks(InputInfoPtr pInfo, int button, int count); + void EvdevPostRelativeMotionEvents(InputInfoPtr pInfo, int num_v, int first_v, +@@ -228,9 +243,7 @@ BOOL EvdevWheelEmuFilterMotion(InputInfo + void EvdevDragLockPreInit(InputInfoPtr pInfo); + BOOL EvdevDragLockFilterEvent(InputInfoPtr pInfo, unsigned int button, int value); + +-#ifdef HAVE_PROPERTIES + void EvdevMBEmuInitProperty(DeviceIntPtr); + void EvdevWheelEmuInitProperty(DeviceIntPtr); + void EvdevDragLockInitProperty(DeviceIntPtr); + #endif +-#endif