evdev 2.3.1

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

.gitignore

@@ -1,78 +1,28 @@
-#
-#		X.Org module default exclusion patterns
-#		The next section if for module specific patterns
-#
-#	Do not edit the following section
-# 	GNU Build System (Autotools)
-aclocal.m4
-autom4te.cache/
-autoscan.log
+*.patch
 ChangeLog
-compile
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache
 config.guess
 config.h
 config.h.in
 config.log
-config-ml.in
-config.py
 config.status
-config.status.lineno
 config.sub
 configure
-configure.scan
 depcomp
-.deps/
-INSTALL
 install-sh
-.libs/
 libtool
-libtool.m4
 ltmain.sh
-lt~obsolete.m4
-ltoptions.m4
-ltsugar.m4
-ltversion.m4
-Makefile
-Makefile.in
-mdate-sh
+man/evdev.4
 missing
-mkinstalldirs
+.deps
+.libs
+*.lo
+*.la
+stamp-h1
+xf86-input-evdev-*.tar.*
 *.pc
-py-compile
-stamp-h?
-symlink-tree
-texinfo.tex
-ylwrap
-
-#	Do not edit the following section
-# 	Edit Compile Debug Document Distribute
 *~
-*.[0-9]
-*.[0-9]x
-*.bak
-*.bin
-core
-*.dll
-*.exe
-*-ISO*.bdf
-*-JIS*.bdf
-*-KOI8*.bdf
-*.kld
-*.ko
-*.ko.cmd
-*.lai
-*.l[oa]
-*.[oa]
-*.obj
-*.patch
-*.so
-*.pcf.gz
-*.pdb
-*.tar.bz2
-*.tar.gz
-#
-#		Add & Override patterns for xf86-input-evdev 
-#
-#		Edit the following section as needed
-# For example, !report.pc overrides *.pc. See 'man gitignore'
-# 
+tags

10-evdev.conf

@@ -1,40 +0,0 @@
-#
-# Catch-all evdev loader for udev-based systems
-# We don't simply match on any device since that also adds accelerometers
-# and other devices that we don't really want to use. The list below
-# matches everything but joysticks.
-
-Section "InputClass"
-        Identifier "evdev pointer catchall"
-        MatchIsPointer "on"
-        MatchDevicePath "/dev/input/event*"
-        Driver "evdev"
-EndSection
-
-Section "InputClass"
-        Identifier "evdev keyboard catchall"
-        MatchIsKeyboard "on"
-        MatchDevicePath "/dev/input/event*"
-        Driver "evdev"
-EndSection
-
-Section "InputClass"
-        Identifier "evdev touchpad catchall"
-        MatchIsTouchpad "on"
-        MatchDevicePath "/dev/input/event*"
-        Driver "evdev"
-EndSection
-
-Section "InputClass"
-        Identifier "evdev tablet catchall"
-        MatchIsTablet "on"
-        MatchDevicePath "/dev/input/event*"
-        Driver "evdev"
-EndSection
-
-Section "InputClass"
-        Identifier "evdev touchscreen catchall"
-        MatchIsTouchscreen "on"
-        MatchDevicePath "/dev/input/event*"
-        Driver "evdev"
-EndSection

COPYING

@@ -1,11 +1,57 @@
+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 <dawes@xfree86.org>
 Copyright 2002 by SuSE Linux AG, Author: Egbert Eich
 Copyright 1994-2002 by The XFree86 Project, Inc.
 Copyright 2002 by Paul Elliott
-Copyright © 2008 University of South Australia
-Copyright 2008 by Chris Salch
-Copyright © 2008 Red Hat, Inc.
 
 Permission to use, copy, modify, distribute, and sell this software
 and its documentation for any purpose is hereby granted without
@@ -26,26 +72,6 @@ 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 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.
 
 Copyright 2005 Adam Jackson.
 

Makefile.am

@@ -18,24 +18,23 @@
 #  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.
 
+AUTOMAKE_OPTIONS = foreign
 
-# Provide an sdk location that is writable by the evdev module
+# Ensure headers are installed below $(prefix) for distcheck
 DISTCHECK_CONFIGURE_FLAGS = --with-sdkdir='$${includedir}/xorg'
 
 SUBDIRS = src man include
-MAINTAINERCLEANFILES = ChangeLog INSTALL
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xorg-evdev.pc
 
-dist_xorgconf_DATA = 10-evdev.conf
+EXTRA_DIST = ChangeLog
 
-.PHONY: ChangeLog INSTALL
+MAINTAINERCLEANFILES=ChangeLog
 
-INSTALL:
-	$(INSTALL_CMD)
+.PHONY: ChangeLog
 
 ChangeLog:
 	$(CHANGELOG_CMD)
 
-dist-hook: ChangeLog INSTALL
+dist-hook: ChangeLog

autogen.sh

@@ -1,17 +1,12 @@
 #! /bin/sh
 
-srcdir=`dirname "$0"`
+srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
 ORIGDIR=`pwd`
-cd "$srcdir"
+cd $srcdir
 
 autoreconf -v --install || exit 1
-cd "$ORIGDIR" || exit $?
+cd $ORIGDIR || exit $?
 
-git config --local --get format.subjectPrefix >/dev/null 2>&1 ||
-    git config --local format.subjectPrefix "PATCH xf86-input-evdev"
-
-if test -z "$NOCONFIGURE"; then
-    exec "$srcdir"/configure "$@"
-fi
+$srcdir/configure --enable-maintainer-mode "$@"

configure.ac

@@ -20,37 +20,31 @@
 #
 # Process this file with autoconf to produce a configure script
 
-# Initialize Autoconf
-AC_PREREQ([2.60])
+AC_PREREQ(2.57)
 AC_INIT([xf86-input-evdev],
-        [2.10.6],
+        2.3.1,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
-        [xf86-input-evdev])
+        xf86-input-evdev)
+
 AC_CONFIG_SRCDIR([Makefile.am])
-AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR(.)
+AM_INIT_AUTOMAKE([dist-bzip2])
 
-# Initialize Automake
-AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_MAINTAINER_MODE
 
-# Initialize libtool
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+AM_CONFIG_HEADER([config.h])
+
+# Checks for programs.
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
-
-# Initialize X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
-m4_ifndef([XORG_MACROS_VERSION], 
-          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.8)
+AC_PROG_CC
 XORG_DEFAULT_OPTIONS
 
-# Obtain compiler/linker options from server and required extensions
-PKG_CHECK_MODULES(XORG, [xorg-server >= 1.12] xproto [inputproto >= 2.1.99.3])
-PKG_CHECK_MODULES(UDEV, libudev)
+AH_TOP([#include "xorg-server.h"])
 
-PKG_CHECK_MODULES(LIBEVDEV, [libevdev >= 0.4])
-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],
                            [Default xorg module directory [[default=$libdir/xorg/modules]]]),
@@ -59,28 +53,25 @@ AC_ARG_WITH(xorg-module-dir,
 inputdir=${moduledir}/input
 AC_SUBST(inputdir)
 
-AC_ARG_WITH(xorg-conf-dir,
-            AC_HELP_STRING([--with-xorg-conf-dir=DIR],
-                           [Default xorg.conf.d directory [[default=$prefix/share/X11/xorg.conf.d/]]]),
-            [xorgconfdir="$withval"],
-            [xorgconfdir="$prefix/share/X11/xorg.conf.d"])
-AC_SUBST(xorgconfdir)
-
-# X Server SDK location is required to install evdev header files
-# This location is also relayed in the xorg-evdev.pc file
-sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
-
-# Workaround overriding sdkdir to be able to create a tarball when user has no
-# write permission in sdkdir. See DISTCHECK_CONFIGURE_FLAGS in Makefile.am
-AC_ARG_WITH([sdkdir], [], [sdkdir="$withval"])
+# Checks for pkg-config packages. We need to be able to override sdkdir
+# to satisfy silly distcheck requirements.
+PKG_CHECK_MODULES(XORG, xorg-server xproto $REQUIRED_MODULES)
+XORG_CFLAGS="$CWARNFLAGS $XORG_CFLAGS"
+AC_ARG_WITH([sdkdir], [],
+    [sdkdir="$withval"],
+    [sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`])
 AC_SUBST([sdkdir])
 
+# Checks for libraries.
+
+# Checks for header files.
+AC_HEADER_STDC
+
 DRIVER_NAME=evdev
 AC_SUBST([DRIVER_NAME])
 
-AC_CONFIG_FILES([Makefile
-                 src/Makefile
-                 man/Makefile
-                 include/Makefile
-                 xorg-evdev.pc])
-AC_OUTPUT
+AC_OUTPUT([Makefile
+           src/Makefile
+           man/Makefile
+           include/Makefile
+           xorg-evdev.pc])

include/Makefile.am

@@ -1 +1,2 @@
+EXTRA_DIST = evdev-properties.h
 sdk_HEADERS = evdev-properties.h

include/evdev-properties.h

@@ -33,8 +33,6 @@
 #define EVDEV_PROP_MIDBUTTON "Evdev Middle Button Emulation"
 /* CARD32 */
 #define EVDEV_PROP_MIDBUTTON_TIMEOUT "Evdev Middle Button Timeout"
-/* CARD8 */
-#define EVDEV_PROP_MIDBUTTON_BUTTON "Evdev Middle Button Button"
 
 /* Wheel emulation */
 /* BOOL */
@@ -58,7 +56,7 @@
 
 /* Reopen attempts. */
 /* CARD8 */
-#define EVDEV_PROP_REOPEN "Evdev Reopen Attempts" /* OBSOLETE */
+#define EVDEV_PROP_REOPEN "Evdev Reopen Attempts"
 
 /* Run-time calibration */
 /* CARD32, 4 values [minx, maxx, miny, maxy], or no values for unset */
@@ -68,29 +66,4 @@
 /* BOOL */
 #define EVDEV_PROP_SWAP_AXES "Evdev Axes Swap"
 
-/* BOOL */
-#define EVDEV_PROP_THIRDBUTTON "Evdev Third Button Emulation"
-/* CARD32 */
-#define EVDEV_PROP_THIRDBUTTON_TIMEOUT "Evdev Third Button Emulation Timeout"
-/* CARD8 */
-#define EVDEV_PROP_THIRDBUTTON_BUTTON "Evdev Third Button Emulation Button"
-/* CARD32 */
-#define EVDEV_PROP_THIRDBUTTON_THRESHOLD "Evdev Third Button Emulation Threshold"
-
-/* CARD8, 1 value,
-   This property is initialized on devices that have multimedia keys on the
-   function keys. The value of the property selects the default behaviour
-   for the function keys. The behaviour of the fn key (if any exists) is
-   hardware specific. On some hardware, fn may toggle the other set of
-   functions available on the keys.
-
-   0 send functions keys by default, fn may toggle to multimedia keys
-   1 send multimedia keys by default, fn may toggle to function keys
-*/
-#define EVDEV_PROP_FUNCTION_KEYS "Evdev Function Keys"
-
-/* Smooth scroll */
-/* INT32, 3 values (vertical, horizontal, dial) */
-#define EVDEV_PROP_SCROLL_DISTANCE "Evdev Scrolling Distance"
-
 #endif

man/Makefile.am

@@ -1,37 +1,57 @@
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
+# 
+# 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.
 # 
 
 drivermandir = $(DRIVER_MAN_DIR)
 
-driverman_PRE = $(DRIVER_NAME).man
+driverman_PRE = @DRIVER_NAME@.man
 
-driverman_DATA = $(driverman_PRE:man=$(DRIVER_MAN_SUFFIX))
+driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
 
-EXTRA_DIST = $(DRIVER_NAME).man
+EXTRA_DIST = @DRIVER_NAME@.man
 
 CLEANFILES = $(driverman_DATA)
 
+SED = sed
+
+# Strings to replace in man pages
+XORGRELSTRING = @PACKAGE_STRING@
+  XORGMANNAME = X Version 11
+
+MAN_SUBSTS = \
+	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+	-e 's|__xservername__|Xorg|g' \
+	-e 's|__xconfigfile__|xorg.conf|g' \
+	-e 's|__projectroot__|$(prefix)|g' \
+	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
+	-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
+	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
+	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
+	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
+
 SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
 
-# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
 .man.$(DRIVER_MAN_SUFFIX):
-	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
+	sed $(MAN_SUBSTS) < $< > $@

man/evdev.man

@@ -19,24 +19,15 @@ evdev \- Generic Linux input driver
 .B evdev 
 is an __xservername__ input driver for Linux\'s generic event devices.  It
 therefore supports all input devices that the kernel knows about, including
-most mice, keyboards, tablets and touchscreens.
-.B evdev
-is the default driver on the major Linux distributions.
+most mice and keyboards.
 .PP
 The 
 .B evdev
-driver can serve as both a pointer and a keyboard input device. Multiple
-input devices are supported by multiple instances of this driver, with one
-InputDevice section of your __xconfigfile__ for each input device that will
-use this driver.
-.PP
-It is recommended that
-.B evdev
-devices are configured through the
-.B InputClass
-directive (refer to __xconfigfile__(__filemansuffix__)) instead of manual
-per-device configuration. Devices configured in the
-__xconfigfile__(__filemansuffix__) are not hot-plug capable.
+driver can serve as both a pointer and a keyboard input device, and may be
+used as both the core keyboard and the core pointer.  Multiple input devices
+are supported by multiple instances of this driver, with one Load
+directive for evdev in the Module section of your __xconfigfile__ for each
+input device that will use this driver.
 .PP
 .SH SUPPORTED HARDWARE
 In general, any input device that the kernel has a driver for can be accessed
@@ -66,8 +57,7 @@ is used. Buttons not specified in the user's mapping use the default mapping.
 .BI "Option \*qDevice\*q \*q" string \*q
 Specifies the device through which the device can be accessed.  This will 
 generally be of the form \*q/dev/input/eventX\*q, where X is some integer.
-The mapping from device node to hardware is system-dependent. Property:
-"Device Node" (read-only).
+The mapping from device node to hardware is system-dependent.
 .TP 7
 .BI "Option \*qDragLockButtons\*q \*q" "L1 B2 L3 B4" \*q
 Sets \*qdrag lock buttons\*q that simulate holding a button down, so
@@ -86,19 +76,13 @@ indicating that the next button pressed is to be
 .BI "Option \*qEmulate3Buttons\*q \*q" boolean \*q
 Enable/disable the emulation of the third (middle) mouse button for mice
 which only have two physical buttons.  The third button is emulated by
-pressing both buttons simultaneously.  Default: off. Property: "Evdev Middle
-Button Emulation".
+pressing both buttons simultaneously.  Default: on, until a middle mouse
+button event is registered. Property: "Evdev Middle Button Emulation".
 .TP 7
 .BI "Option \*qEmulate3Timeout\*q \*q" integer \*q
 Sets the timeout (in milliseconds) that the driver waits before deciding
 if two buttons where pressed "simultaneously" when 3 button emulation is
 enabled.  Default: 50. Property: "Evdev Middle Button Timeout".
-.TP 7
-.BI "Option \*qEmulate3Button\*q \*q" integer \*q
-Specifies the physical button number to be emitted if middle button emulation
-is triggered.
-Default: 2.  Property: "Evdev Middle Button Button".
-.TP 7
 .BI "Option \*qEmulateWheel\*q \*q" boolean \*q
 Enable/disable "wheel" emulation.  Wheel emulation means emulating button
 press/release events when the mouse is moved while a specific real button
@@ -130,19 +114,6 @@ Property: "Evdev Wheel Emulation Button".
 Specifies how far (in pixels) the pointer must move to generate button
 press/release events in wheel emulation mode.  Default: 10. Property: "Evdev
 Wheel Emulation Inertia".
-.IP
-This value must be set for any device does not resemble a standard mouse.
-Specifically, on absolute devices such as tablets the value should be set to
-a reasonable fraction of the expected movement to avoid excess scroll events.
-.IP
-.B WARNING:
-the name \*qinertia\*q is a misnomer. This option defines the distance
-required to generate one scroll event similar to the
-.B VertScrollDelta
-and
-.B HorizScrollDelta
-options. It does not enable inertia in the
-physical sense, scrolling stops immediately once the movement has stopped.
 .TP 7
 .BI "Option \*qEmulateWheelTimeout\*q \*q" integer \*q
 Specifies the time in milliseconds the
@@ -152,31 +123,6 @@ must be pressed before wheel emulation is started. If the
 is released before this timeout, the original button press/release event
 is sent.  Default: 200. Property: "Evdev Wheel Emulation Timeout".
 .TP 7
-.BI "Option \*qEmulateThirdButton\*q \*q" boolean \*q
-Enable third button emulation. Third button emulation emits a right button
-event (by default) by pressing and holding the first button. The first
-button must be held down for the configured timeout and must not move more
-than the configured threshold for the emulation to activate. Otherwise, the
-first button event is posted as normal. Default: off.  Property: "Evdev
-Third Button Emulation".
-.TP 7
-.BI "Option \*qEmulateThirdButtonTimeout\*q \*q" integer \*q
-Specifies the timeout in milliseconds between the initial button press and
-the generation of the emulated button event.
-Default: 1000. Property: "Evdev Third Button Emulation Timeout".
-.TP 7
-.BI "Option \*qEmulateThirdButtonButton\*q \*q" integer \*q
-Specifies the physical button number to be emitted if third button emulation
-is triggered.
-Default: 3.  Property: "Evdev Third Button Button".
-.TP 7
-.BI "Option \*qEmulateThirdButtonMoveThreshold\*q \*q" integer \*q
-Specifies the maximum move fuzz in device coordinates for third button
-emulation. If the device moves by more than this threshold before the third
-button emulation is triggered, the emulation is cancelled and a first button
-event is generated as normal.
-Default: 20. Property: "Evdev Third Button Emulation Threshold".
-.TP 7
 .BI "Option \*qGrabDevice\*q \*q" boolean \*q
 Force a grab on the event device. Doing so will ensure that no other driver
 can initialise the same device and it will also stop the device from sending
@@ -205,6 +151,10 @@ axes regardless of the presence of other axes. This may trigger buggy
 behavior and events from this axis are always forwarded. Users are
 discouraged from setting this option.
 .TP 7
+.BI "Option \*qReopenAttempts\*q \*q" integer \*q
+Number of reopen attempts after a read error occurs on the device (e.g. after
+waking up from suspend). In between each attempt is a 100ms wait. Default: 10.
+.TP 7
 .BI "Option \*qCalibration\*q \*q" "min-x max-x min-y max-y" \*q
 Calibrates the X and Y axes for devices that need to scale to a different
 coordinate system than reported to the X server. This feature is required
@@ -213,11 +163,6 @@ originally reported by the kernel (e.g. touchscreens). The scaling to the
 custom coordinate system is done in-driver and the X server is unaware of
 the transformation. Property: "Evdev Axis Calibration".
 .TP 7
-.B Option \*qMode\*q \*qRelative\*q\fP|\fP\*qAbsolute\*q
-Sets the mode of the device if device has absolute axes.
-The default value for touchpads is relative, for other absolute.
-This option has no effect on devices without absolute axes.
-.TP 7
 .BI "Option \*qSwapAxes\*q \*q" Bool \*q
 Swap x/y axes. Default: off. Property: "Evdev Axes Swap".
 .TP 7
@@ -238,30 +183,6 @@ is mapped to the negative Y axis motion and button number
 .I N2
 is mapped to the positive Y axis motion.  Default: "4 5". Property:
 "Evdev Wheel Emulation Axes".
-.TP 7
-.BI "Option \*qTypeName\*q \*q"type"\*q
-Specify the X Input 1.x type (see XListInputDevices(__libmansuffix__)).
-There is rarely a need to use this option, evdev will guess the device type
-based on the device's capabilities. This option is provided for devices that
-need quirks.
-.TP 7
-.BI "Option \*qVertScrollDelta\*q \*q" integer \*q
-The amount of motion considered one unit of scrolling vertically.
-Default: "1".  Property: "Evdev Scrolling Distance".
-.TP 7
-.BI "Option \*qHorizScrollDelta\*q \*q" integer \*q
-The amount of motion considered one unit of scrolling horizontally.
-Default: "1".  Property: "Evdev Scrolling Distance".
-.TP 7
-.BI "Option \*qDialDelta\*q \*q" integer \*q
-The amount of motion considered one unit of turning the dial.  Default: "1".
-Property: "Evdev Scrolling Distance".
-.TP 7
-.BI "Option \*qResolution\*q \*q" integer \*q
-Sets the resolution of the device in dots per inch. The resolution is used
-to scale relative motion events from mouse devices to 1000 DPI resolution. This
-can be used to make high resolution mice less sensitive without turning off
-acceleration. If set to 0 no scaling will be performed. Default: "0".
 
 .SH SUPPORTED PROPERTIES
 The following properties are provided by the
@@ -288,9 +209,6 @@ value.
 .BI "Evdev Middle Button Timeout"
 1 16-bit positive value.
 .TP 7
-.BI "Evdev Middle Button Button"
-1 8-bit value, allowed range 0-32, 0 disables the button.
-.TP 7
 .BI "Evdev Wheel Emulation"
 1 boolean value (8 bit, 0 or 1).
 .TP 7
@@ -305,11 +223,9 @@ value.
 .TP 7
 .BI "Evdev Wheel Emulation Timeout"
 1 16-bit positive value.
-.TP 7
-.BI "Evdev Scrolling Distance"
-3 32-bit values: vertical, horizontal and dial.
 
 .SH AUTHORS
-Kristian Høgsberg, Peter Hutterer
+Kristian Høgsberg.
 .SH "SEE ALSO"
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__),
+README.mouse.

src/Makefile.am

@@ -24,21 +24,17 @@
 # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
 # _ladir passes a dummy rpath to libtool so the thing will actually link
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-
-AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS)
-AM_CPPFLAGS =-I$(top_srcdir)/include $(LIBEVDEV_CFLAGS)
+AM_CFLAGS = $(XORG_CFLAGS)
 
 @DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
 @DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
-@DRIVER_NAME@_drv_la_LIBADD = $(MTDEV_LIBS) $(UDEV_LIBS) $(LIBEVDEV_LIBS)
 @DRIVER_NAME@_drv_ladir = @inputdir@
 
+INCLUDES=-I$(top_srcdir)/include/
+
 @DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.c \
                                @DRIVER_NAME@.h \
                                emuMB.c \
-                               emuThird.c \
                                emuWheel.c \
-                               draglock.c \
-                               apple.c \
-                               axis_labels.h
+                               draglock.c
 

src/apple.c

@@ -1,313 +0,0 @@
-/*
- * Copyright © 2011 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.
- *
- * Authors:
- *	Peter Hutterer (peter.hutterer@redhat.com)
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <evdev.h>
-#include <evdev-properties.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-#include <exevents.h>
-#include <xf86.h>
-#include <xf86Xinput.h>
-#include <X11/Xatom.h>
-
-/* Apple-specific controls.
- *
- * On Apple keyboards, the multimedia function keys are overlaid with the F
- * keys. F1 is also BrightnessDown, F10 is Mute, etc. The kernel provides a
- * tweak to enable/disable this.
- *
- * /sys/module/hid_apple/parameters/fnmode
- *     0 .. keyboard sends Fx keys, fn is disabled
- *     1 .. keyboard sends multimedia keys, fn sends Fx keys
- *     2 .. keyboard sends Fx keys, fn sends multimedia keys
- *
- * We only handle 1 and 2, don't care about 0. If fnmode is found to be on
- * 0, we force it to 2 instead.
- */
-
-/* In this file: fkeymode refers to the evdev-specific enums and parameters,
- * fnmode refers to the fnmode parameter exposed by the kernel. fnmode is
- * apple-specific */
-#define FNMODE_PATH "/sys/module/hid_apple/parameters/fnmode"
-
-/* Taken from the kernel */
-#define USB_VENDOR_ID_APPLE                             0x05ac
-#define USB_DEVICE_ID_APPLE_ALU_MINI_ANSI               0x021d
-#define USB_DEVICE_ID_APPLE_ALU_MINI_ISO                0x021e
-#define USB_DEVICE_ID_APPLE_ALU_MINI_JIS                0x021f
-#define USB_DEVICE_ID_APPLE_ALU_ANSI                    0x0220
-#define USB_DEVICE_ID_APPLE_ALU_ISO                     0x0221
-#define USB_DEVICE_ID_APPLE_ALU_JIS                     0x0222
-#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI           0x022c
-#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO            0x022d
-#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS            0x022e
-#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI      0x0239
-#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO       0x023a
-#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS       0x023b
-
-static int EvdevAppleGetProperty (DeviceIntPtr dev, Atom property);
-static int EvdevAppleSetProperty(DeviceIntPtr dev, Atom atom,
-                      XIPropertyValuePtr val, BOOL checkonly);
-
-static Atom prop_fkeymode;
-static Bool fnmode_readonly; /* set if we can only read fnmode */
-
-struct product_table
-{
-    unsigned int vendor;
-    unsigned int product;
-} apple_keyboard_table[] = {
-    { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_MINI_ANSI},
-    { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_MINI_ISO},
-    { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_MINI_JIS},
-    { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ANSI},
-    { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ISO},
-    { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_JIS},
-    { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI},
-    { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO},
-    { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS},
-    { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI},
-    { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO},
-    { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS},
-    { 0, 0}
-};
-
-/**
- * @return TRUE if the device matches a product in the given product table,
- *         FALSE otherwise
- */
-static Bool product_check(const struct product_table *t, int vendor, int product)
-{
-    while (t->vendor)
-    {
-        if (vendor == t->vendor && product == t->product)
-            return TRUE;
-        t++;
-    }
-
-    return FALSE;
-}
-
-/**
- * @return 0 on success, -1 otherwise (check errno)
- */
-static int
-set_fnmode(enum fkeymode fkeymode)
-{
-    int fd;
-    char mode;
-    int bytes_written;
-
-    if (fkeymode == FKEYMODE_UNKNOWN)
-    {
-        errno = EINVAL; /* silly you */
-        return -1;
-    }
-
-    fd = open(FNMODE_PATH, O_WRONLY);
-    if (fd < 0)
-        return -1;
-
-    mode = (fkeymode == FKEYMODE_FKEYS) ? '2' : '1';
-
-    bytes_written = write(fd, &mode, 1);
-    close(fd);
-
-    return (bytes_written == 1) ? 0 : -1;
-}
-
-/**
- * Get the current value of fnmode. If fnmode is found to be on 0, we set it
- * to 2 in the process. Yes, quite daring, I know. I live on the edge.
- *
- * @return The current setting of fnmode or FKEYMODE_UNKNOWN on error (check
- * errno)
- */
-static enum fkeymode
-get_fnmode(void)
-{
-    int fd;
-    char retvalue;
-
-    fd = open(FNMODE_PATH, O_RDWR);
-    if (fd < 0 && errno == EACCES)
-    {
-        fnmode_readonly = TRUE;
-        fd = open(FNMODE_PATH, O_RDONLY);
-    }
-
-    if (fd < 0)
-        goto err;
-
-    if (read(fd, &retvalue, 1) != 1)
-        goto err;
-
-    if (retvalue != '0' && retvalue != '1' && retvalue != '2')
-    {
-        xf86Msg(X_ERROR, "Invalid fnmode value: %c\n", retvalue);
-        errno = EINVAL;
-        goto err;
-    }
-
-    close(fd);
-
-    /* we don't want 0, switch to 2 */
-    if (retvalue == '0')
-    {
-        if (fnmode_readonly)
-            xf86Msg(X_WARNING, "fnmode is disabled and read-only. Fn key will"
-                    "not toggle to multimedia keys.\n");
-        else
-            set_fnmode(FKEYMODE_FKEYS);
-    }
-
-
-    return retvalue == '1' ? FKEYMODE_MMKEYS : FKEYMODE_FKEYS;
-
-err:
-    if (fd >= 0)
-        close(fd);
-    return FKEYMODE_UNKNOWN;
-}
-
-/**
- * Set the property value to fkeymode. If the property doesn't exist,
- * initialize it.
- */
-static void set_fkeymode_property(InputInfoPtr pInfo, enum fkeymode fkeymode)
-{
-    DeviceIntPtr dev = pInfo->dev;
-    BOOL init = FALSE;
-    char data;
-
-    switch(fkeymode)
-    {
-        case FKEYMODE_FKEYS: data = 0; break;
-        case FKEYMODE_MMKEYS: data = 1; break;
-        case FKEYMODE_UNKNOWN:
-            xf86IDrvMsg(pInfo, X_ERROR, "Failed to get fnmode (%s)\n", strerror(errno));
-            return;
-    }
-
-    if (!prop_fkeymode) {
-        init = TRUE;
-        prop_fkeymode = MakeAtom(EVDEV_PROP_FUNCTION_KEYS, strlen(EVDEV_PROP_FUNCTION_KEYS), TRUE);
-    }
-
-    /* Don't send an event if we're initializing the property */
-    XIChangeDeviceProperty(dev, prop_fkeymode, XA_INTEGER, 8,
-                           PropModeReplace, 1, &data, !init);
-
-    if (init)
-    {
-        XISetDevicePropertyDeletable(dev, prop_fkeymode, FALSE);
-        XIRegisterPropertyHandler(dev, EvdevAppleSetProperty, EvdevAppleGetProperty, NULL);
-    }
-}
-
-
-/**
- * Called when a client reads the property state.
- * Update with current kernel state, it may have changed behind our back.
- */
-static int
-EvdevAppleGetProperty (DeviceIntPtr dev, Atom property)
-{
-    if (property == prop_fkeymode)
-    {
-        InputInfoPtr pInfo  = dev->public.devicePrivate;
-        EvdevPtr     pEvdev = pInfo->private;
-        enum fkeymode fkeymode;
-
-        fkeymode = get_fnmode();
-        if (fkeymode != pEvdev->fkeymode) {
-            /* set internal copy first, so we don't write to the file in
-             * SetProperty handler */
-            pEvdev->fkeymode = fkeymode;
-            set_fkeymode_property(pInfo, fkeymode);
-        }
-    }
-    return Success;
-}
-
-static int
-EvdevAppleSetProperty(DeviceIntPtr dev, Atom atom,
-                      XIPropertyValuePtr val, BOOL checkonly)
-{
-    InputInfoPtr pInfo  = dev->public.devicePrivate;
-    EvdevPtr pEvdev = pInfo->private;
-
-    if (atom == prop_fkeymode)
-    {
-        CARD8 v = *(CARD8*)val->data;
-
-        if (val->format != 8 || val->type != XA_INTEGER)
-            return BadMatch;
-
-        if (fnmode_readonly)
-            return BadAccess;
-
-        if (v > 1)
-            return BadValue;
-
-        if (!checkonly)
-        {
-            if ((!v && pEvdev->fkeymode != FKEYMODE_FKEYS) ||
-                (v && pEvdev->fkeymode != FKEYMODE_MMKEYS))
-            {
-                pEvdev->fkeymode = v ? FKEYMODE_MMKEYS : FKEYMODE_FKEYS;
-                set_fnmode(pEvdev->fkeymode);
-            }
-        }
-    }
-
-    return Success;
-}
-
-void
-EvdevAppleInitProperty(DeviceIntPtr dev)
-{
-    InputInfoPtr pInfo  = dev->public.devicePrivate;
-    EvdevPtr     pEvdev = pInfo->private;
-    enum fkeymode fkeymode;
-
-    if (!product_check(apple_keyboard_table,
-                       libevdev_get_id_vendor(pEvdev->dev),
-                       libevdev_get_id_product(pEvdev->dev)))
-        return;
-
-    fkeymode = get_fnmode();
-    pEvdev->fkeymode = fkeymode;
-    set_fkeymode_property(pInfo, fkeymode);
-}

src/axis_labels.h

@@ -1,198 +0,0 @@
-/*
- * 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <xserver-properties.h>
-
-#ifndef AXIS_LABELS
-#define AXIS_LABELS
-
-/* Aligned with linux/input.h.
-   Note that there are holes in the ABS_ range, these are simply replaced with
-   MISC here */
-static const char* abs_labels[] = {
-    AXIS_LABEL_PROP_ABS_X,              /* 0x00 */
-    AXIS_LABEL_PROP_ABS_Y,              /* 0x01 */
-    AXIS_LABEL_PROP_ABS_Z,              /* 0x02 */
-    AXIS_LABEL_PROP_ABS_RX,             /* 0x03 */
-    AXIS_LABEL_PROP_ABS_RY,             /* 0x04 */
-    AXIS_LABEL_PROP_ABS_RZ,             /* 0x05 */
-    AXIS_LABEL_PROP_ABS_THROTTLE,       /* 0x06 */
-    AXIS_LABEL_PROP_ABS_RUDDER,         /* 0x07 */
-    AXIS_LABEL_PROP_ABS_WHEEL,          /* 0x08 */
-    AXIS_LABEL_PROP_ABS_GAS,            /* 0x09 */
-    AXIS_LABEL_PROP_ABS_BRAKE,          /* 0x0a */
-    AXIS_LABEL_PROP_ABS_MISC,           /* undefined */
-    AXIS_LABEL_PROP_ABS_MISC,           /* undefined */
-    AXIS_LABEL_PROP_ABS_MISC,           /* undefined */
-    AXIS_LABEL_PROP_ABS_MISC,           /* undefined */
-    AXIS_LABEL_PROP_ABS_MISC,           /* undefined */
-    AXIS_LABEL_PROP_ABS_HAT0X,          /* 0x10 */
-    AXIS_LABEL_PROP_ABS_HAT0Y,          /* 0x11 */
-    AXIS_LABEL_PROP_ABS_HAT1X,          /* 0x12 */
-    AXIS_LABEL_PROP_ABS_HAT1Y,          /* 0x13 */
-    AXIS_LABEL_PROP_ABS_HAT2X,          /* 0x14 */
-    AXIS_LABEL_PROP_ABS_HAT2Y,          /* 0x15 */
-    AXIS_LABEL_PROP_ABS_HAT3X,          /* 0x16 */
-    AXIS_LABEL_PROP_ABS_HAT3Y,          /* 0x17 */
-    AXIS_LABEL_PROP_ABS_PRESSURE,       /* 0x18 */
-    AXIS_LABEL_PROP_ABS_DISTANCE,       /* 0x19 */
-    AXIS_LABEL_PROP_ABS_TILT_X,         /* 0x1a */
-    AXIS_LABEL_PROP_ABS_TILT_Y,         /* 0x1b */
-    AXIS_LABEL_PROP_ABS_TOOL_WIDTH,     /* 0x1c */
-    AXIS_LABEL_PROP_ABS_MISC,           /* undefined */
-    AXIS_LABEL_PROP_ABS_MISC,           /* undefined */
-    AXIS_LABEL_PROP_ABS_MISC,           /* undefined */
-    AXIS_LABEL_PROP_ABS_VOLUME          /* 0x20 */
-    AXIS_LABEL_PROP_ABS_MISC,           /* undefined */
-    AXIS_LABEL_PROP_ABS_MISC,           /* undefined */
-    AXIS_LABEL_PROP_ABS_MISC,           /* undefined */
-    AXIS_LABEL_PROP_ABS_MISC,           /* undefined */
-    AXIS_LABEL_PROP_ABS_MISC,           /* undefined */
-    AXIS_LABEL_PROP_ABS_MISC,           /* undefined */
-    AXIS_LABEL_PROP_ABS_MISC,           /* undefined */
-    AXIS_LABEL_PROP_ABS_MISC,           /* undefined */
-    AXIS_LABEL_PROP_ABS_MISC,           /* undefined */
-    AXIS_LABEL_PROP_ABS_MISC,           /* undefined */
-    AXIS_LABEL_PROP_ABS_MISC,           /* undefined */
-    AXIS_LABEL_PROP_ABS_MISC,           /* undefined */
-    AXIS_LABEL_PROP_ABS_MISC,           /* undefined */
-    AXIS_LABEL_PROP_ABS_MISC,           /* undefined */
-    AXIS_LABEL_PROP_ABS_MISC,           /* undefined */
-    AXIS_LABEL_PROP_ABS_MISC,           /* undefined */
-    AXIS_LABEL_PROP_ABS_MT_TOUCH_MAJOR, /* 0x30 */
-    AXIS_LABEL_PROP_ABS_MT_TOUCH_MINOR, /* 0x31 */
-    AXIS_LABEL_PROP_ABS_MT_WIDTH_MAJOR, /* 0x32 */
-    AXIS_LABEL_PROP_ABS_MT_WIDTH_MINOR, /* 0x33 */
-    AXIS_LABEL_PROP_ABS_MT_ORIENTATION, /* 0x34 */
-    AXIS_LABEL_PROP_ABS_MT_POSITION_X,  /* 0x35 */
-    AXIS_LABEL_PROP_ABS_MT_POSITION_Y,  /* 0x36 */
-    AXIS_LABEL_PROP_ABS_MT_TOOL_TYPE,   /* 0x37 */
-    AXIS_LABEL_PROP_ABS_MT_BLOB_ID,     /* 0x38 */
-    AXIS_LABEL_PROP_ABS_MT_TRACKING_ID, /* 0x39 */
-    AXIS_LABEL_PROP_ABS_MT_PRESSURE,    /* 0x3a */
-#ifdef AXIS_LABEL_PROP_ABS_MT_DISTANCE
-    AXIS_LABEL_PROP_ABS_MT_DISTANCE,    /* 0x3b */
-    AXIS_LABEL_PROP_ABS_MT_TOOL_X,      /* 0x3c */
-    AXIS_LABEL_PROP_ABS_MT_TOOL_Y,      /* 0x3d */
-#endif /* AXIS_LABEL_PROP_ABS_MT_DISTANCE */
-};
-
-static const char* rel_labels[] = {
-    AXIS_LABEL_PROP_REL_X,
-    AXIS_LABEL_PROP_REL_Y,
-    AXIS_LABEL_PROP_REL_Z,
-    AXIS_LABEL_PROP_REL_RX,
-    AXIS_LABEL_PROP_REL_RY,
-    AXIS_LABEL_PROP_REL_RZ,
-    AXIS_LABEL_PROP_REL_HWHEEL,
-    AXIS_LABEL_PROP_REL_DIAL,
-    AXIS_LABEL_PROP_REL_WHEEL,
-    AXIS_LABEL_PROP_REL_MISC
-};
-
-static const char* btn_labels[][16] = {
-    { /* BTN_MISC group                 offset 0x100*/
-        BTN_LABEL_PROP_BTN_0,           /* 0x00 */
-        BTN_LABEL_PROP_BTN_1,           /* 0x01 */
-        BTN_LABEL_PROP_BTN_2,           /* 0x02 */
-        BTN_LABEL_PROP_BTN_3,           /* 0x03 */
-        BTN_LABEL_PROP_BTN_4,           /* 0x04 */
-        BTN_LABEL_PROP_BTN_5,           /* 0x05 */
-        BTN_LABEL_PROP_BTN_6,           /* 0x06 */
-        BTN_LABEL_PROP_BTN_7,           /* 0x07 */
-        BTN_LABEL_PROP_BTN_8,           /* 0x08 */
-        BTN_LABEL_PROP_BTN_9            /* 0x09 */
-    },
-    { /* BTN_MOUSE group                offset 0x110 */
-        BTN_LABEL_PROP_BTN_LEFT,        /* 0x00 */
-        BTN_LABEL_PROP_BTN_RIGHT,       /* 0x01 */
-        BTN_LABEL_PROP_BTN_MIDDLE,      /* 0x02 */
-        BTN_LABEL_PROP_BTN_SIDE,        /* 0x03 */
-        BTN_LABEL_PROP_BTN_EXTRA,       /* 0x04 */
-        BTN_LABEL_PROP_BTN_FORWARD,     /* 0x05 */
-        BTN_LABEL_PROP_BTN_BACK,        /* 0x06 */
-        BTN_LABEL_PROP_BTN_TASK         /* 0x07 */
-    },
-    { /* BTN_JOYSTICK group             offset 0x120 */
-        BTN_LABEL_PROP_BTN_TRIGGER,     /* 0x00 */
-        BTN_LABEL_PROP_BTN_THUMB,       /* 0x01 */
-        BTN_LABEL_PROP_BTN_THUMB2,      /* 0x02 */
-        BTN_LABEL_PROP_BTN_TOP,         /* 0x03 */
-        BTN_LABEL_PROP_BTN_TOP2,        /* 0x04 */
-        BTN_LABEL_PROP_BTN_PINKIE,      /* 0x05 */
-        BTN_LABEL_PROP_BTN_BASE,        /* 0x06 */
-        BTN_LABEL_PROP_BTN_BASE2,       /* 0x07 */
-        BTN_LABEL_PROP_BTN_BASE3,       /* 0x08 */
-        BTN_LABEL_PROP_BTN_BASE4,       /* 0x09 */
-        BTN_LABEL_PROP_BTN_BASE5,       /* 0x0a */
-        BTN_LABEL_PROP_BTN_BASE6,       /* 0x0b */
-        NULL,
-        NULL,
-        NULL,
-        BTN_LABEL_PROP_BTN_DEAD         /* 0x0f */
-    },
-    { /* BTN_GAMEPAD group              offset 0x130 */
-        BTN_LABEL_PROP_BTN_A,           /* 0x00 */
-        BTN_LABEL_PROP_BTN_B,           /* 0x01 */
-        BTN_LABEL_PROP_BTN_C,           /* 0x02 */
-        BTN_LABEL_PROP_BTN_X,           /* 0x03 */
-        BTN_LABEL_PROP_BTN_Y,           /* 0x04 */
-        BTN_LABEL_PROP_BTN_Z,           /* 0x05 */
-        BTN_LABEL_PROP_BTN_TL,          /* 0x06 */
-        BTN_LABEL_PROP_BTN_TR,          /* 0x07 */
-        BTN_LABEL_PROP_BTN_TL2,         /* 0x08 */
-        BTN_LABEL_PROP_BTN_TR2,         /* 0x09 */
-        BTN_LABEL_PROP_BTN_SELECT,      /* 0x0a */
-        BTN_LABEL_PROP_BTN_START,       /* 0x0b */
-        BTN_LABEL_PROP_BTN_MODE,        /* 0x0c */
-        BTN_LABEL_PROP_BTN_THUMBL,      /* 0x0d */
-        BTN_LABEL_PROP_BTN_THUMBR       /* 0x0e */
-    },
-    { /* BTN_DIGI group                         offset 0x140 */
-        BTN_LABEL_PROP_BTN_TOOL_PEN,            /* 0x00 */
-        BTN_LABEL_PROP_BTN_TOOL_RUBBER,         /* 0x01 */
-        BTN_LABEL_PROP_BTN_TOOL_BRUSH,          /* 0x02 */
-        BTN_LABEL_PROP_BTN_TOOL_PENCIL,         /* 0x03 */
-        BTN_LABEL_PROP_BTN_TOOL_AIRBRUSH,       /* 0x04 */
-        BTN_LABEL_PROP_BTN_TOOL_FINGER,         /* 0x05 */
-        BTN_LABEL_PROP_BTN_TOOL_MOUSE,          /* 0x06 */
-        BTN_LABEL_PROP_BTN_TOOL_LENS,           /* 0x07 */
-        NULL,
-        NULL,
-        BTN_LABEL_PROP_BTN_TOUCH,               /* 0x0a */
-        BTN_LABEL_PROP_BTN_STYLUS,              /* 0x0b */
-        BTN_LABEL_PROP_BTN_STYLUS2,             /* 0x0c */
-        BTN_LABEL_PROP_BTN_TOOL_DOUBLETAP,      /* 0x0d */
-        BTN_LABEL_PROP_BTN_TOOL_TRIPLETAP       /* 0x0e */
-    },
-    { /* BTN_WHEEL group                        offset 0x150 */
-        BTN_LABEL_PROP_BTN_GEAR_DOWN,           /* 0x00 */
-        BTN_LABEL_PROP_BTN_GEAR_UP              /* 0x01 */
-    }
-};
-
-#endif

src/draglock.c

@@ -35,7 +35,6 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include "evdev.h"
 
 #include <xf86.h>
 #include <xf86Xinput.h>
@@ -43,8 +42,11 @@
 #include <exevents.h>
 
 #include <evdev-properties.h>
+#include "evdev.h"
 
+#ifdef HAVE_PROPERTIES
 static Atom prop_dlock     = 0; /* Drag lock buttons. */
+#endif
 
 void EvdevDragLockLockButton(InputInfoPtr pInfo, unsigned int button);
 
@@ -103,12 +105,13 @@ EvdevDragLockPreInit(InputInfoPtr pInfo)
                     /* We only have a meta button */
                     pEvdev->dragLock.meta = meta_button;
 
-                    xf86IDrvMsg(pInfo, X_CONFIG, "DragLockButtons : "
-                                "%i as meta\n", meta_button);
+                    xf86Msg(X_CONFIG, "%s: DragLockButtons : "
+                            "%i as meta\n",
+                            pInfo->name, meta_button);
                 } else {
-                    xf86IDrvMsg(pInfo, X_ERROR, "DragLockButtons : "
-                                "Incomplete pair specifying button pairs %s\n",
-                                option_string);
+                    xf86Msg(X_ERROR, "%s: DragLockButtons : "
+                            "Incomplete pair specifying button pairs %s\n",
+                            pInfo->name, option_string);
                 }
             } else {
 
@@ -116,24 +119,23 @@ EvdevDragLockPreInit(InputInfoPtr pInfo)
                 if ((meta_button <= EVDEV_MAXBUTTONS) && (meta_button >= 0 ) &&
                     (lock_button <= EVDEV_MAXBUTTONS) && (lock_button >= 0)) {
 
-                    xf86IDrvMsg(pInfo, X_CONFIG,
-                                "DragLockButtons : %i -> %i\n",
-                                meta_button, lock_button);
+                    xf86Msg(X_CONFIG, "%s: DragLockButtons : %i -> %i\n",
+                            pInfo->name, meta_button, lock_button);
 
                     pEvdev->dragLock.lock_pair[meta_button - 1] = lock_button;
                     pairs=TRUE;
                 } else {
                     /* Let the user know something was wrong
                        with this pair of buttons */
-                    xf86IDrvMsg(pInfo, X_CONFIG,"DragLockButtons : "
-                                "Invalid button pair %i -> %i\n",
-                                meta_button, lock_button);
+                    xf86Msg(X_CONFIG, "%s: DragLockButtons : "
+                            "Invalid button pair %i -> %i\n",
+                            pInfo->name, meta_button, lock_button);
                 }
             }
         } else {
-            xf86IDrvMsg(pInfo, X_ERROR, "Found DragLockButtons "
-                        "with invalid lock button string : '%s'\n",
-                        option_string);
+            xf86Msg(X_ERROR, "%s: Found DragLockButtons "
+                    "with  invalid lock button string : '%s'\n",
+                    pInfo->name, option_string);
 
             /* This should be the case anyhow, just make sure */
             next_num = NULL;
@@ -143,8 +145,6 @@ EvdevDragLockPreInit(InputInfoPtr pInfo)
         if (next_num != NULL && *next_num == '\0')
             next_num = NULL;
     }
-
-    free(option_string);
 }
 
 /* Updates DragLock button state and fires button event messges */
@@ -209,6 +209,7 @@ EvdevDragLockFilterEvent(InputInfoPtr pInfo, unsigned int button, int value)
     return FALSE;
 }
 
+#ifdef HAVE_PROPERTIES
 /**
  * Set the drag lock property.
  * If only one value is supplied, then this is used as the meta button.
@@ -316,3 +317,5 @@ EvdevDragLockInitProperty(DeviceIntPtr dev)
 
     XIRegisterPropertyHandler(dev, EvdevDragLockSetProperty, NULL, NULL);
 }
+
+#endif

src/emuMB.c

@@ -34,18 +34,24 @@
 #include "config.h"
 #endif
 
-#include "evdev.h"
-
 #include <X11/Xatom.h>
 #include <xf86.h>
 #include <xf86Xinput.h>
 #include <exevents.h>
 
 #include <evdev-properties.h>
+#include "evdev.h"
 
+enum {
+    MBEMU_DISABLED = 0,
+    MBEMU_ENABLED,
+    MBEMU_AUTO
+};
+
+#ifdef HAVE_PROPERTIES
 static Atom prop_mbemu     = 0; /* Middle button emulation on/off property */
 static Atom prop_mbtimeout = 0; /* Middle button timeout property */
-static Atom prop_mbbuton   = 0; /* Middle button target button property */
+#endif
 /*
  * Lets create a simple finite-state machine for 3 button emulation:
  *
@@ -185,34 +191,22 @@ int
 EvdevMBEmuTimer(InputInfoPtr pInfo)
 {
     EvdevPtr pEvdev = pInfo->private;
+    int	sigstate;
     int id;
-    int mapped_id;
 
-#if HAVE_THREADED_INPUT
-    input_lock();
-#else
-    int sigstate = xf86BlockSIGIO();
-#endif
+    sigstate = xf86BlockSIGIO ();
 
     pEvdev->emulateMB.pending = FALSE;
     if ((id = stateTab[pEvdev->emulateMB.state][4][0]) != 0) {
-        mapped_id = abs(id);
-        if (mapped_id == 2)
-            mapped_id = pEvdev->emulateMB.button;
-        EvdevPostButtonEvent(pInfo, mapped_id,
-                             (id >= 0) ? BUTTON_PRESS : BUTTON_RELEASE);
+        EvdevPostButtonEvent(pInfo, abs(id), (id >= 0));
         pEvdev->emulateMB.state =
             stateTab[pEvdev->emulateMB.state][4][2];
     } else {
-        xf86IDrvMsg(pInfo, X_ERROR, "Got unexpected buttonTimer in state %d\n",
-                    pEvdev->emulateMB.state);
+        ErrorF("Got unexpected buttonTimer in state %d\n",
+                pEvdev->emulateMB.state);
     }
 
-#if HAVE_THREADED_INPUT
-    input_unlock();
-#else
-    xf86UnblockSIGIO(sigstate);
-#endif
+    xf86UnblockSIGIO (sigstate);
     return 0;
 }
 
@@ -231,13 +225,17 @@ EvdevMBEmuFilterEvent(InputInfoPtr pInfo, int button, BOOL press)
 {
     EvdevPtr pEvdev = pInfo->private;
     int id;
-    int mapped_id;
     int *btstate;
     int ret = FALSE;
 
     if (!pEvdev->emulateMB.enabled)
         return ret;
 
+    if (button == 2) {
+        EvdevMBEmuEnable(pInfo, FALSE);
+        return ret;
+    }
+
     /* don't care about other buttons */
     if (button != 1 && button != 3)
         return ret;
@@ -250,10 +248,7 @@ EvdevMBEmuFilterEvent(InputInfoPtr pInfo, int button, BOOL press)
 
     if ((id = stateTab[pEvdev->emulateMB.state][*btstate][0]) != 0)
     {
-        mapped_id = abs(id);
-        if (mapped_id == 2)
-            mapped_id = pEvdev->emulateMB.button;
-        EvdevQueueButtonEvent(pInfo, mapped_id, (id >= 0));
+        EvdevQueueButtonEvent(pInfo, abs(id), (id >= 0));
         ret = TRUE;
     }
     if ((id = stateTab[pEvdev->emulateMB.state][*btstate][1]) != 0)
@@ -277,7 +272,9 @@ EvdevMBEmuFilterEvent(InputInfoPtr pInfo, int button, BOOL press)
 }
 
 
-void EvdevMBEmuWakeupHandler(WAKEUP_HANDLER_ARGS)
+void EvdevMBEmuWakeupHandler(pointer data,
+                             int i,
+                             pointer LastSelectMask)
 {
     InputInfoPtr pInfo = (InputInfoPtr)data;
     EvdevPtr     pEvdev = (EvdevPtr)pInfo->private;
@@ -291,7 +288,9 @@ void EvdevMBEmuWakeupHandler(WAKEUP_HANDLER_ARGS)
     }
 }
 
-void EvdevMBEmuBlockHandler(BLOCK_HANDLER_ARGS)
+void EvdevMBEmuBlockHandler(pointer data,
+                            struct timeval **waitTime,
+                            pointer LastSelectMask)
 {
     InputInfoPtr    pInfo = (InputInfoPtr) data;
     EvdevPtr        pEvdev= (EvdevPtr) pInfo->private;
@@ -310,23 +309,19 @@ void
 EvdevMBEmuPreInit(InputInfoPtr pInfo)
 {
     EvdevPtr pEvdev = (EvdevPtr)pInfo->private;
-    int bt;
+    pEvdev->emulateMB.enabled = MBEMU_AUTO;
 
-    pEvdev->emulateMB.enabled = xf86SetBoolOption(pInfo->options,
-                                                  "Emulate3Buttons",
-                                                  FALSE);
-    pEvdev->emulateMB.timeout = xf86SetIntOption(pInfo->options,
-                                                 "Emulate3Timeout", 50);
-    bt = xf86SetIntOption(pInfo->options, "Emulate3Button", 2);
-    if (bt < 0 || bt > EVDEV_MAXBUTTONS) {
-        xf86IDrvMsg(pInfo, X_WARNING, "Invalid Emulate3Button value: %d\n",
-                    bt);
-        xf86IDrvMsg(pInfo, X_WARNING, "Middle button emulation disabled.\n");
-
-        pEvdev->emulateMB.enabled = FALSE;
+    if (xf86FindOption(pInfo->options, "Emulate3Buttons"))
+    {
+        pEvdev->emulateMB.enabled = xf86SetBoolOption(pInfo->options,
+                                                      "Emulate3Buttons",
+                                                      MBEMU_ENABLED);
+        xf86Msg(X_INFO, "%s: Forcing middle mouse button emulation %s.\n",
+                pInfo->name, (pEvdev->emulateMB.enabled) ? "on" : "off");
     }
 
-    pEvdev->emulateMB.button = bt;
+    pEvdev->emulateMB.timeout = xf86SetIntOption(pInfo->options,
+                                                 "Emulate3Timeout", 50);
 }
 
 void
@@ -352,13 +347,23 @@ EvdevMBEmuFinalize(InputInfoPtr pInfo)
 
 }
 
+/* Enable/disable middle mouse button emulation. */
+void
+EvdevMBEmuEnable(InputInfoPtr pInfo, BOOL enable)
+{
+    EvdevPtr pEvdev = (EvdevPtr)pInfo->private;
+    if (pEvdev->emulateMB.enabled == MBEMU_AUTO)
+        pEvdev->emulateMB.enabled = enable;
+}
+
+
+#ifdef HAVE_PROPERTIES
 static int
 EvdevMBEmuSetProperty(DeviceIntPtr dev, Atom atom, XIPropertyValuePtr val,
                       BOOL checkonly)
 {
     InputInfoPtr pInfo  = dev->public.devicePrivate;
     EvdevPtr     pEvdev = pInfo->private;
-    int bt;
 
     if (atom == prop_mbemu)
     {
@@ -374,18 +379,6 @@ EvdevMBEmuSetProperty(DeviceIntPtr dev, Atom atom, XIPropertyValuePtr val,
 
         if (!checkonly)
             pEvdev->emulateMB.timeout = *((CARD32*)val->data);
-    } else if (atom == prop_mbbuton)
-    {
-        if (val->format != 8 || val->size != 1 || val->type != XA_INTEGER)
-            return BadMatch;
-
-        bt = *((CARD8*)val->data);
-
-        if (bt < 0 || bt > EVDEV_MAXBUTTONS)
-            return BadValue;
-
-        if (!checkonly)
-            pEvdev->emulateMB.button = bt;
     }
 
     return Success;
@@ -423,15 +416,6 @@ EvdevMBEmuInitProperty(DeviceIntPtr dev)
         return;
     XISetDevicePropertyDeletable(dev, prop_mbtimeout, FALSE);
 
-    prop_mbbuton = MakeAtom(EVDEV_PROP_MIDBUTTON_BUTTON,
-                              strlen(EVDEV_PROP_MIDBUTTON_BUTTON),
-                              TRUE);
-    rc = XIChangeDeviceProperty(dev, prop_mbbuton, XA_INTEGER, 8, PropModeReplace, 1,
-                                &pEvdev->emulateMB.button, FALSE);
-
-    if (rc != Success)
-        return;
-    XISetDevicePropertyDeletable(dev, prop_mbbuton, FALSE);
-
     XIRegisterPropertyHandler(dev, EvdevMBEmuSetProperty, NULL, NULL);
 }
+#endif

src/emuThird.c

@@ -1,423 +0,0 @@
-/*
- * Copyright © 2011 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 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.
- *
- */
-
-/* Right mouse button emulation code.
- * Emulates a right button event if the first button is held down for a
- * timeout. If the device moves more than a certain amount before the
- * timeout is over, the emulation is cancelled and a normal button event is
- * generated.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "evdev.h"
-
-#include <X11/Xatom.h>
-#include <xf86.h>
-#include <xf86Xinput.h>
-#include <exevents.h>
-
-#include <evdev-properties.h>
-
-/* Threshold (in device coordinates) for devices to cancel emulation */
-#define DEFAULT_MOVE_THRESHOLD 20
-
-static Atom prop_3bemu;         /* Right button emulation on/off property   */
-static Atom prop_3btimeout;     /* Right button timeout property            */
-static Atom prop_3bbutton;      /* Right button target physical button      */
-static Atom prop_3bthreshold;   /* Right button move cancellation threshold */
-
-/* State machine for 3rd button emulation */
-enum EmulationState {
-    EM3B_OFF,             /* no event      */
-    EM3B_PENDING,         /* timer pending */
-    EM3B_EMULATING        /* in emulation  */
-};
-
-static void
-Evdev3BEmuPostButtonEvent(InputInfoPtr pInfo, int button, enum ButtonAction act)
-{
-    EvdevPtr          pEvdev   = pInfo->private;
-    struct emulate3B *emu3B    = &pEvdev->emulate3B;
-    int               absolute = Relative;
-
-    /* if we cancel, emit the button down event at our start position,
-     * not at the current position. Only for absolute devices though. For
-     * relative events, this may be a bit iffy since pointer accel may shoot
-     * us back more than we moved and confuse the user.
-     */
-    if (emu3B->flags & EVDEV_ABSOLUTE_EVENTS)
-        absolute = Absolute;
-
-    xf86PostButtonEventP(pInfo->dev, absolute, button,
-                         (act == BUTTON_PRESS) ? 1 : 0, 0,
-                         (absolute ? 2 : 0), emu3B->startpos);
-}
-
-
-/**
- * Timer function. Post a button down event to the server.
- *
- * @param arg The InputInfoPtr for this device.
- */
-CARD32
-Evdev3BEmuTimer(OsTimerPtr timer, CARD32 time, pointer arg)
-{
-    InputInfoPtr      pInfo    = (InputInfoPtr)arg;
-    EvdevPtr          pEvdev   = pInfo->private;
-    struct emulate3B *emu3B    = &pEvdev->emulate3B;
-
-#if HAVE_THREADED_INPUT
-    input_lock();
-#else
-    int sigstate = xf86BlockSIGIO();
-#endif
-    emu3B->state = EM3B_EMULATING;
-    Evdev3BEmuPostButtonEvent(pInfo, emu3B->button, BUTTON_PRESS);
-#if HAVE_THREADED_INPUT
-    input_unlock();
-#else
-    xf86UnblockSIGIO(sigstate);
-#endif
-    return 0;
-}
-
-
-/**
- * Cancel all emulation, reset the timer and reset deltas.
- */
-static void
-Evdev3BCancel(InputInfoPtr pInfo)
-{
-    EvdevPtr          pEvdev = pInfo->private;
-    struct emulate3B *emu3B  = &pEvdev->emulate3B;
-
-    if (emu3B->state != EM3B_OFF)
-    {
-        TimerCancel(emu3B->timer);
-        emu3B->state = EM3B_OFF;
-        memset(emu3B->delta, 0, sizeof(emu3B->delta));
-    }
-
-    emu3B->flags = 0;
-}
-
-/**
- * Emulate a third button on button press. Note that emulation only triggers
- * on button 1.
- *
- * Return TRUE if event was swallowed by middle mouse button emulation,
- * FALSE otherwise.
- */
-BOOL
-Evdev3BEmuFilterEvent(InputInfoPtr pInfo, int button, BOOL press)
-{
-    EvdevPtr          pEvdev = pInfo->private;
-    struct emulate3B *emu3B  = &pEvdev->emulate3B;
-    int               ret    = FALSE;
-
-    if (!emu3B->enabled)
-        goto out;
-
-    if (press)
-        emu3B->buttonstate |= button;
-    else
-        emu3B->buttonstate &= ~button;
-
-    /* Any other button pressed? Cancel timer */
-    if (button != 1)
-    {
-        switch (emu3B->state)
-        {
-            case EM3B_PENDING:
-                Evdev3BEmuPostButtonEvent(pInfo, 1, BUTTON_PRESS);
-                Evdev3BCancel(pInfo);
-                break;
-            case EM3B_EMULATING:
-                /* We're emulating and now the user pressed a different
-                 * button. Just release the emulating one, tell the user to
-                 * not do that and get on with life */
-                Evdev3BEmuPostButtonEvent(pInfo, emu3B->button, BUTTON_RELEASE);
-                Evdev3BCancel(pInfo);
-                break;
-            default:
-                break;
-        }
-        goto out;
-    }
-
-    /* Don't emulate if any other button is down */
-    if ((emu3B->buttonstate & ~0x1) != 0)
-        goto out;
-
-    /* Release event → cancel, send press and release now. */
-    if (!press)
-    {
-        switch(emu3B->state)
-        {
-            case EM3B_PENDING:
-                Evdev3BEmuPostButtonEvent(pInfo, 1, BUTTON_PRESS);
-                Evdev3BCancel(pInfo);
-                break;
-            case EM3B_EMULATING:
-                Evdev3BEmuPostButtonEvent(pInfo, emu3B->button, BUTTON_RELEASE);
-                Evdev3BCancel(pInfo);
-                ret = TRUE;
-                break;
-            default:
-                break;
-        }
-
-        goto out;
-    }
-
-    if (press && emu3B->state == EM3B_OFF)
-    {
-        emu3B->state = EM3B_PENDING;
-        emu3B->timer = TimerSet(emu3B->timer, 0, emu3B->timeout,
-                                Evdev3BEmuTimer, pInfo);
-        ret = TRUE;
-        goto out;
-    }
-
-out:
-    return ret;
-}
-
-/**
- * Handle absolute x/y motion. If the motion is above the threshold, cancel
- * emulation.
- */
-void
-Evdev3BEmuProcessAbsMotion(InputInfoPtr pInfo, ValuatorMask *vals)
-{
-    EvdevPtr          pEvdev = pInfo->private;
-    struct emulate3B *emu3B  = &pEvdev->emulate3B;
-    int               cancel = FALSE;
-    int               axis   = 0;
-
-    if (emu3B->state != EM3B_PENDING)
-    {
-        if (valuator_mask_isset(vals, 0))
-            emu3B->startpos[0] = valuator_mask_get(vals, 0);
-        if (valuator_mask_isset(vals, 1))
-            emu3B->startpos[1] = valuator_mask_get(vals, 1);
-
-        return;
-    }
-
-    if ((emu3B->flags & EVDEV_ABSOLUTE_EVENTS) == 0)
-        emu3B->flags |= EVDEV_ABSOLUTE_EVENTS;
-
-    while (axis <= 1 && !cancel)
-    {
-        if (valuator_mask_isset(vals, axis))
-        {
-            double delta = valuator_mask_get_double(vals, axis) - emu3B->startpos[axis];
-            if (fabs(delta) > emu3B->threshold)
-                cancel = TRUE;
-        }
-        axis++;
-    }
-
-    if (cancel)
-    {
-        Evdev3BEmuPostButtonEvent(pInfo, 1, BUTTON_PRESS);
-        Evdev3BCancel(pInfo);
-    }
-}
-
-/**
- * Handle relative x/y motion. If the motion is above the threshold, cancel
- * emulation.
- */
-void
-Evdev3BEmuProcessRelMotion(InputInfoPtr pInfo, double dx, double dy)
-{
-    EvdevPtr          pEvdev = pInfo->private;
-    struct emulate3B *emu3B  = &pEvdev->emulate3B;
-
-    if (emu3B->state != EM3B_PENDING)
-        return;
-
-    emu3B->delta[0] += dx;
-    emu3B->delta[1] += dy;
-    emu3B->flags |= EVDEV_RELATIVE_EVENTS;
-
-    if (fabs(emu3B->delta[0]) > emu3B->threshold ||
-        fabs(emu3B->delta[1]) > emu3B->threshold)
-    {
-        Evdev3BEmuPostButtonEvent(pInfo, 1, BUTTON_PRESS);
-        Evdev3BCancel(pInfo);
-    }
-}
-
-void
-Evdev3BEmuPreInit(InputInfoPtr pInfo)
-{
-    EvdevPtr          pEvdev = pInfo->private;
-    struct emulate3B *emu3B  = &pEvdev->emulate3B;
-
-    emu3B->enabled = xf86SetBoolOption(pInfo->options,
-                                       "EmulateThirdButton",
-                                       FALSE);
-    emu3B->timeout = xf86SetIntOption(pInfo->options,
-                                      "EmulateThirdButtonTimeout",
-                                      1000);
-    emu3B->button = xf86SetIntOption(pInfo->options,
-                                      "EmulateThirdButtonButton",
-                                      3);
-    /* FIXME: this should be auto-configured based on axis ranges */
-    emu3B->threshold = xf86SetIntOption(pInfo->options,
-                                         "EmulateThirdButtonMoveThreshold",
-                                         DEFAULT_MOVE_THRESHOLD);
-    /* allocate now so we don't allocate in the signal handler */
-    emu3B->timer = TimerSet(NULL, 0, 0, NULL, NULL);
-}
-
-void
-Evdev3BEmuOn(InputInfoPtr pInfo)
-{
-    /* This function just exists for symmetry in evdev.c */
-}
-
-void
-Evdev3BEmuFinalize(InputInfoPtr pInfo)
-{
-    EvdevPtr          pEvdev = pInfo->private;
-    struct emulate3B *emu3B  = &pEvdev->emulate3B;
-
-    TimerFree(emu3B->timer);
-    emu3B->timer = NULL;
-}
-
-static int
-Evdev3BEmuSetProperty(DeviceIntPtr dev, Atom atom, XIPropertyValuePtr val,
-                      BOOL checkonly)
-{
-    InputInfoPtr      pInfo  = dev->public.devicePrivate;
-    EvdevPtr          pEvdev = pInfo->private;
-    struct emulate3B *emu3B  = &pEvdev->emulate3B;
-
-    if (atom == prop_3bemu)
-    {
-        if (val->format != 8 || val->size != 1 || val->type != XA_INTEGER)
-            return BadMatch;
-
-        if (!checkonly)
-            emu3B->enabled = *((BOOL*)val->data);
-
-    } else if (atom == prop_3btimeout)
-    {
-        if (val->format != 32 || val->size != 1 || val->type != XA_INTEGER)
-            return BadMatch;
-
-        if (!checkonly)
-            emu3B->timeout = *((CARD32*)val->data);
-
-    } else if (atom == prop_3bbutton)
-    {
-        if (val->format != 8 || val->size != 1 || val->type != XA_INTEGER)
-            return BadMatch;
-
-        if (!checkonly)
-            emu3B->button = *((CARD8*)val->data);
-    } else if (atom == prop_3bthreshold)
-    {
-        if (val->format != 32 || val->size != 1 || val->type != XA_INTEGER)
-            return BadMatch;
-
-        if (!checkonly)
-            emu3B->threshold = *((CARD32*)val->data);
-    }
-
-
-    return Success;
-}
-
-/**
- * Initialise properties for third button emulation
- */
-void
-Evdev3BEmuInitProperty(DeviceIntPtr dev)
-{
-    InputInfoPtr      pInfo  = dev->public.devicePrivate;
-    EvdevPtr          pEvdev = pInfo->private;
-    struct emulate3B *emu3B  = &pEvdev->emulate3B;
-    int               rc;
-
-    if (!dev->button) /* don't init prop for keyboards */
-        return;
-
-    /* third button emulation on/off */
-    prop_3bemu = MakeAtom(EVDEV_PROP_THIRDBUTTON, strlen(EVDEV_PROP_THIRDBUTTON), TRUE);
-    rc = XIChangeDeviceProperty(dev, prop_3bemu, XA_INTEGER, 8,
-                                PropModeReplace, 1,
-                                &emu3B->enabled,
-                                FALSE);
-    if (rc != Success)
-        return;
-
-    XISetDevicePropertyDeletable(dev, prop_3bemu, FALSE);
-
-    /* third button emulation timeout */
-    prop_3btimeout = MakeAtom(EVDEV_PROP_THIRDBUTTON_TIMEOUT,
-                              strlen(EVDEV_PROP_THIRDBUTTON_TIMEOUT),
-                              TRUE);
-    rc = XIChangeDeviceProperty(dev, prop_3btimeout, XA_INTEGER, 32, PropModeReplace, 1,
-                                &emu3B->timeout, FALSE);
-
-    if (rc != Success)
-        return;
-
-    XISetDevicePropertyDeletable(dev, prop_3btimeout, FALSE);
-
-    /* third button emulation button to be triggered  */
-    prop_3bbutton = MakeAtom(EVDEV_PROP_THIRDBUTTON_BUTTON,
-                             strlen(EVDEV_PROP_THIRDBUTTON_BUTTON),
-                             TRUE);
-    rc = XIChangeDeviceProperty(dev, prop_3bbutton, XA_INTEGER, 8, PropModeReplace, 1,
-                                &emu3B->button, FALSE);
-
-    if (rc != Success)
-        return;
-
-    XISetDevicePropertyDeletable(dev, prop_3bbutton, FALSE);
-
-    /* third button emulation movement threshold */
-    prop_3bthreshold = MakeAtom(EVDEV_PROP_THIRDBUTTON_THRESHOLD,
-                                strlen(EVDEV_PROP_THIRDBUTTON_THRESHOLD),
-                                TRUE);
-    rc = XIChangeDeviceProperty(dev, prop_3bthreshold, XA_INTEGER, 32, PropModeReplace, 1,
-                                &emu3B->threshold, FALSE);
-
-    if (rc != Success)
-        return;
-
-    XISetDevicePropertyDeletable(dev, prop_3bthreshold, FALSE);
-
-    XIRegisterPropertyHandler(dev, Evdev3BEmuSetProperty, NULL, NULL);
-}

src/emuWheel.c

@@ -33,7 +33,6 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include "evdev.h"
 
 #include <X11/Xatom.h>
 #include <xf86.h>
@@ -41,16 +40,20 @@
 #include <exevents.h>
 
 #include <evdev-properties.h>
+#include "evdev.h"
 
 #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);
 static int EvdevWheelEmuInertia(InputInfoPtr pInfo, WheelAxisPtr axis, int value);
 
 /* Filter mouse button events */
@@ -95,7 +98,7 @@ BOOL
 EvdevWheelEmuFilterMotion(InputInfoPtr pInfo, struct input_event *pEv)
 {
     EvdevPtr pEvdev = (EvdevPtr)pInfo->private;
-    WheelAxisPtr pAxis = NULL;
+    WheelAxisPtr pAxis = NULL, pOtherAxis = NULL;
     int value = pEv->value;
 
     /* Has wheel emulation been configured to be enabled? */
@@ -114,38 +117,32 @@ EvdevWheelEmuFilterMotion(InputInfoPtr pInfo, struct input_event *pEv)
                 return TRUE;
         }
 
-	if(pEv->type == EV_ABS) {
-	    int axis = pEvdev->abs_axis_map[pEv->code];
-	    int oldValue;
-
-	    if (axis > -1 && valuator_mask_fetch(pEvdev->old_vals, axis, &oldValue)) {
-		valuator_mask_set(pEvdev->abs_vals, axis, value);
-		value -= oldValue; /* make value into a differential measurement */
-	    } else
-                value = 0; /* avoid a jump on the first touch */
-	}
-
+	/* We don't want to intercept real mouse wheel events */
 	switch(pEv->code) {
-
-	/* ABS_X has the same value as REL_X, so this case catches both */
 	case REL_X:
 	    pAxis = &(pEvdev->emulateWheel.X);
+	    pOtherAxis = &(pEvdev->emulateWheel.Y);
 	    break;
 
-	/* ABS_Y has the same value as REL_Y, so this case catches both */
 	case REL_Y:
 	    pAxis = &(pEvdev->emulateWheel.Y);
+	    pOtherAxis = &(pEvdev->emulateWheel.X);
 	    break;
 
 	default:
 	    break;
 	}
 
-	/* If we found REL_X, REL_Y, ABS_X or ABS_Y then emulate a mouse
-	   wheel.
-	 */
+	/* If we found REL_X or REL_Y, emulate a mouse wheel.
+           Reset the inertia of the other axis when a scroll event was sent
+           to avoid the buildup of erroneous scroll events if the user
+           doesn't move in a perfectly straight line.
+         */
 	if (pAxis)
-	    EvdevWheelEmuInertia(pInfo, pAxis, value);
+	{
+	    if (EvdevWheelEmuInertia(pInfo, pAxis, value))
+		pOtherAxis->traveled_distance = 0;
+	}
 
 	/* Eat motion events while emulateWheel button pressed. */
 	return TRUE;
@@ -191,8 +188,7 @@ EvdevWheelEmuInertia(InputInfoPtr pInfo, WheelAxisPtr axis, int value)
 /* Handle button mapping here to avoid code duplication,
 returns true if a button mapping was found. */
 static BOOL
-EvdevWheelEmuHandleButtonMap(InputInfoPtr pInfo, WheelAxisPtr pAxis,
-                             const char *axis_name)
+EvdevWheelEmuHandleButtonMap(InputInfoPtr pInfo, WheelAxisPtr pAxis, char* axis_name)
 {
     EvdevPtr pEvdev = (EvdevPtr)pInfo->private;
     char *option_string;
@@ -224,15 +220,15 @@ EvdevWheelEmuHandleButtonMap(InputInfoPtr pInfo, WheelAxisPtr pAxis,
 	    if (down_button > pEvdev->num_buttons) pEvdev->num_buttons = down_button;
 
 	} else {
-	    xf86IDrvMsg(pInfo, X_WARNING, "Invalid %s value:\"%s\"\n",
-		        axis_name, option_string);
+	    xf86Msg(X_WARNING, "%s: Invalid %s value:\"%s\"\n",
+		    pInfo->name, axis_name, option_string);
+
 	}
-	free(option_string);
 
 	/* Clean up and log what happened */
 	if (msg) {
-	    xf86IDrvMsg(pInfo, X_CONFIG, "%s: %s\n", axis_name, msg);
-	    free(msg);
+	    xf86Msg(X_CONFIG, "%s: %s: %s\n",pInfo->name, axis_name, msg);
+	    xfree(msg);
 	    return TRUE;
 	}
     }
@@ -244,10 +240,14 @@ void
 EvdevWheelEmuPreInit(InputInfoPtr pInfo)
 {
     EvdevPtr pEvdev = (EvdevPtr)pInfo->private;
+    char val[4];
     int wheelButton;
     int inertia;
     int timeout;
 
+    val[0] = 0;
+    val[1] = 0;
+
     if (xf86SetBoolOption(pInfo->options, "EmulateWheel", FALSE)) {
 	pEvdev->emulateWheel.enabled = TRUE;
     } else
@@ -256,9 +256,9 @@ EvdevWheelEmuPreInit(InputInfoPtr pInfo)
     wheelButton = xf86SetIntOption(pInfo->options, "EmulateWheelButton", 4);
 
     if ((wheelButton < 0) || (wheelButton > EVDEV_MAXBUTTONS)) {
-        xf86IDrvMsg(pInfo, X_WARNING, "Invalid EmulateWheelButton value: %d\n",
-                    wheelButton);
-        xf86IDrvMsg(pInfo, X_WARNING, "Wheel emulation disabled.\n");
+        xf86Msg(X_WARNING, "%s: Invalid EmulateWheelButton value: %d\n",
+                pInfo->name, wheelButton);
+        xf86Msg(X_WARNING, "%s: Wheel emulation disabled.\n", pInfo->name);
 
         pEvdev->emulateWheel.enabled = FALSE;
     }
@@ -268,9 +268,10 @@ EvdevWheelEmuPreInit(InputInfoPtr pInfo)
     inertia = xf86SetIntOption(pInfo->options, "EmulateWheelInertia", 10);
 
     if (inertia <= 0) {
-        xf86IDrvMsg(pInfo, X_WARNING, "Invalid EmulateWheelInertia value: %d\n",
-                    inertia);
-        xf86IDrvMsg(pInfo, X_WARNING, "Using built-in inertia value.\n");
+        xf86Msg(X_WARNING, "%s: Invalid EmulateWheelInertia value: %d\n",
+                pInfo->name, inertia);
+        xf86Msg(X_WARNING, "%s: Using built-in inertia value.\n",
+                pInfo->name);
 
         inertia = 10;
     }
@@ -280,9 +281,10 @@ EvdevWheelEmuPreInit(InputInfoPtr pInfo)
     timeout = xf86SetIntOption(pInfo->options, "EmulateWheelTimeout", 200);
 
     if (timeout < 0) {
-        xf86IDrvMsg(pInfo, X_WARNING, "Invalid EmulateWheelTimeout value: %d\n",
-                    timeout);
-        xf86IDrvMsg(pInfo, X_WARNING, "Using built-in timeout value.\n");
+        xf86Msg(X_WARNING, "%s: Invalid EmulateWheelTimeout value: %d\n",
+                pInfo->name, timeout);
+        xf86Msg(X_WARNING, "%s: Using built-in timeout value.\n",
+                pInfo->name);
 
         timeout = 200;
     }
@@ -302,9 +304,9 @@ EvdevWheelEmuPreInit(InputInfoPtr pInfo)
             pEvdev->num_buttons = 5;
 
         /* Display default Configuration */
-        xf86IDrvMsg(pInfo, X_CONFIG, "YAxisMapping: buttons %d and %d\n",
-                    pEvdev->emulateWheel.Y.up_button,
-                    pEvdev->emulateWheel.Y.down_button);
+        xf86Msg(X_CONFIG, "%s: YAxisMapping: buttons %d and %d\n",
+                pInfo->name, pEvdev->emulateWheel.Y.up_button,
+                pEvdev->emulateWheel.Y.down_button);
     }
 
 
@@ -317,13 +319,13 @@ EvdevWheelEmuPreInit(InputInfoPtr pInfo)
     pEvdev->emulateWheel.X.traveled_distance = 0;
     pEvdev->emulateWheel.Y.traveled_distance = 0;
 
-    xf86IDrvMsg(pInfo, X_CONFIG,
-                "EmulateWheelButton: %d, "
-                "EmulateWheelInertia: %d, "
-                "EmulateWheelTimeout: %d\n",
-                pEvdev->emulateWheel.button, inertia, timeout);
+    xf86Msg(X_CONFIG, "%s: EmulateWheelButton: %d, "
+            "EmulateWheelInertia: %d, "
+            "EmulateWheelTimeout: %d\n",
+            pInfo->name, pEvdev->emulateWheel.button, inertia, timeout);
 }
 
+#ifdef HAVE_PROPERTIES
 static int
 EvdevWheelEmuSetProperty(DeviceIntPtr dev, Atom atom, XIPropertyValuePtr val,
                          BOOL checkonly)
@@ -387,7 +389,7 @@ EvdevWheelEmuSetProperty(DeviceIntPtr dev, Atom atom, XIPropertyValuePtr val,
 
         inertia = *((CARD16*)val->data);
 
-        if (inertia <= 0)
+        if (inertia < 0)
             return BadValue;
 
         if (!checkonly)
@@ -473,3 +475,4 @@ EvdevWheelEmuInitProperty(DeviceIntPtr dev)
 
     XIRegisterPropertyHandler(dev, EvdevWheelEmuSetProperty, NULL, NULL);
 }
+#endif

src/evdev.h

@@ -28,26 +28,17 @@
  *	Oliver McFadden (oliver.mcfadden@nokia.com)
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #ifndef EVDEV_H
 #define EVDEV_H
 
 #include <linux/input.h>
 #include <linux/types.h>
 
-#include <xorg-server.h>
 #include <xf86Xinput.h>
 #include <xf86_OSproc.h>
 #include <xkbstr.h>
 
-#include <mtdev.h>
-
-#include <libevdev/libevdev.h>
-
-#ifndef EV_CNT /* linux 2.6.23 kernels and earlier lack _CNT defines */
+#ifndef EV_CNT /* linux 2.4 kernels and earlier lack _CNT defines */
 #define EV_CNT (EV_MAX+1)
 #endif
 #ifndef KEY_CNT
@@ -63,73 +54,34 @@
 #define LED_CNT (LED_MAX+1)
 #endif
 
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 18
-#define LogMessageVerbSigSafe xf86MsgVerb
-#endif
-
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 23
-#define HAVE_THREADED_INPUT	1
-#endif
-
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 24
-#define BLOCK_HANDLER_ARGS     	void *data, void *waitTime
-#define WAKEUP_HANDLER_ARGS	void *data, int i
-#else
-#define BLOCK_HANDLER_ARGS	pointer data, struct timeval **waitTime, pointer LastSelectMask
-#define WAKEUP_HANDLER_ARGS	void *data, int i, pointer LastSelectMask
-#endif
-
 #define EVDEV_MAXBUTTONS 32
 #define EVDEV_MAXQUEUE 32
 
-/* evdev flags */
-#define EVDEV_KEYBOARD_EVENTS	(1 << 0)
-#define EVDEV_BUTTON_EVENTS	(1 << 1)
-#define EVDEV_RELATIVE_EVENTS	(1 << 2)
-#define EVDEV_ABSOLUTE_EVENTS	(1 << 3)
-#define EVDEV_TOUCHPAD		(1 << 4)
-#define EVDEV_INITIALIZED	(1 << 5) /* WheelInit etc. called already? */
-#define EVDEV_TOUCHSCREEN	(1 << 6)
-#define EVDEV_CALIBRATED	(1 << 7) /* run-time calibrated? */
-#define EVDEV_TABLET		(1 << 8) /* device looks like a tablet? */
-#define EVDEV_UNIGNORE_ABSOLUTE (1 << 9) /* explicitly unignore abs axes */
-#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
 
-#ifndef XI_PROP_DEVICE_NODE
-#define XI_PROP_DEVICE_NODE "Device Node"
+
+#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 */
 #define NLONGS(x) (((x) + LONG_BITS - 1) / LONG_BITS)
 
-#define DEFAULT_MOUSE_DPI 1000.0
-
-/* Function key mode */
-enum fkeymode {
-    FKEYMODE_UNKNOWN = 0,
-    FKEYMODE_FKEYS,       /* function keys send function keys */
-    FKEYMODE_MMKEYS,      /* function keys send multimedia keys */
-};
-
-enum SlotState {
-    SLOTSTATE_OPEN = 8,
-    SLOTSTATE_CLOSE,
-    SLOTSTATE_UPDATE,
-    SLOTSTATE_EMPTY,
-};
-
-enum ButtonAction {
-    BUTTON_RELEASE = 0,
-    BUTTON_PRESS = 1
-};
-
 /* axis specific data for wheel emulation */
 typedef struct {
     int up_button;
@@ -142,51 +94,35 @@ typedef struct {
     enum {
         EV_QUEUE_KEY,	/* xf86PostKeyboardEvent() */
         EV_QUEUE_BTN,	/* xf86PostButtonEvent() */
-        EV_QUEUE_PROXIMITY, /* xf86PostProximityEvent() */
-        EV_QUEUE_TOUCH,	/*xf86PostTouchEvent() */
     } type;
-    union {
-        int key;	/* May be either a key code or button number. */
-        unsigned int touch; /* Touch ID */
-    } detail;
-    int val;	/* State of the key/button/touch; pressed or released. */
-    ValuatorMask *touchMask;
+    int key;		/* May be either a key code or button number. */
+    int val;		/* State of the key/button; pressed or released. */
 } EventQueueRec, *EventQueuePtr;
 
 typedef struct {
-    struct libevdev *dev;
-
-    char *device;
+    const char *device;
     int grabDevice;         /* grab the event device? */
 
     int num_vals;           /* number of valuators */
-    int num_mt_vals;        /* number of multitouch valuators */
-    int abs_axis_map[ABS_CNT]; /* Map evdev ABS_* to index */
-    int rel_axis_map[REL_CNT]; /* Map evdev REL_* to index */
-    ValuatorMask *abs_vals;     /* values for absolute axis */
-    ValuatorMask *rel_vals;     /* values for relative axis */
-    ValuatorMask *old_vals; /* old absolute values for calculating relative motion */
-    ValuatorMask *prox;     /* last absolute values set while not in proximity */
-    ValuatorMask *mt_mask;
-    ValuatorMask **last_mt_vals;
-    int cur_slot;
-    struct slot {
-        int dirty;
-        enum SlotState state;
-    } *slots;
-    struct mtdev *mtdev;
-    BOOL fake_mt;
+    int axis_map[max(ABS_CNT, REL_CNT)]; /* Map evdev <axis> to index */
+    int vals[MAX_VALUATORS];
+    int old_vals[MAX_VALUATORS]; /* Translate absolute inputs to relative */
 
     int flags;
-    int in_proximity;           /* device in proximity */
-    int use_proximity;          /* using the proximity bit? */
+    int tool;
     int num_buttons;            /* number of buttons */
     BOOL swap_axes;
     BOOL invert_x;
     BOOL invert_y;
-    int resolution;
 
-    unsigned int abs_queued, rel_queued, prox_queued;
+    int delta[REL_CNT];
+    unsigned int abs, rel;
+
+    /* 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 */
     struct {
@@ -196,21 +132,7 @@ typedef struct {
         int                 state;       /* state machine (see bt3emu.c) */
         Time                expires;     /* time of expiry */
         Time                timeout;
-        uint8_t             button;      /* phys button to emit */
     } emulateMB;
-    /* Third mouse button emulation */
-    struct emulate3B {
-        BOOL                enabled;
-        BOOL                state;       /* current state */
-        Time                timeout;     /* timeout until third button press */
-        int                 buttonstate; /* phys. button state */
-        int                 button;      /* phys button to emit */
-        int                 threshold;   /* move threshold in dev coords */
-        OsTimerPtr          timer;
-        double              delta[2];    /* delta x/y, accumulating */
-        int                 startpos[2]; /* starting pos for abs devices */
-        int                 flags;       /* remember if we had rel or abs movement */
-    } emulate3B;
     struct {
 	int                 meta;           /* meta key to lock any button */
 	BOOL                meta_state;     /* meta_button state */
@@ -227,11 +149,6 @@ typedef struct {
         Time                expires;     /* time of expiry */
         Time                timeout;
     } emulateWheel;
-    struct {
-        int                 vert_delta;
-        int                 horiz_delta;
-        int                 dial_delta;
-    } smoothScroll;
     /* run-time calibration */
     struct {
         int                 min_x;
@@ -246,47 +163,43 @@ typedef struct {
     int reopen_left;     /* number of attempts left to re-open the device */
     OsTimerPtr reopen_timer;
 
+    /* Cached info from device. */
+    char name[1024];
+    unsigned long bitmask[NLONGS(EV_CNT)];
+    unsigned long key_bitmask[NLONGS(KEY_CNT)];
+    unsigned long rel_bitmask[NLONGS(REL_CNT)];
+    unsigned long abs_bitmask[NLONGS(ABS_CNT)];
+    unsigned long led_bitmask[NLONGS(LED_CNT)];
+    struct input_absinfo absinfo[ABS_CNT];
+
     /* minor/major number */
     dev_t min_maj;
 
     /* Event queue used to defer keyboard/button events until EV_SYN time. */
     int                     num_queue;
     EventQueueRec           queue[EVDEV_MAXQUEUE];
-
-    enum fkeymode           fkeymode;
-
-    char *type_name;
 } EvdevRec, *EvdevPtr;
 
 /* Event posting functions */
 void EvdevQueueKbdEvent(InputInfoPtr pInfo, struct input_event *ev, int value);
 void EvdevQueueButtonEvent(InputInfoPtr pInfo, int button, int value);
-void EvdevQueueProximityEvent(InputInfoPtr pInfo, int value);
-void EvdevQueueTouchEvent(InputInfoPtr pInfo, unsigned int touch,
-                          ValuatorMask *mask, uint16_t type);
-void EvdevPostButtonEvent(InputInfoPtr pInfo, int button, enum ButtonAction act);
+void EvdevPostButtonEvent(InputInfoPtr pInfo, int button, int value);
 void EvdevQueueButtonClicks(InputInfoPtr pInfo, int button, int count);
-void EvdevPostRelativeMotionEvents(InputInfoPtr pInfo);
-void EvdevPostAbsoluteMotionEvents(InputInfoPtr pInfo);
+void EvdevPostRelativeMotionEvents(InputInfoPtr pInfo, int *num_v, int *first_v,
+				   int v[MAX_VALUATORS]);
+void EvdevPostAbsoluteMotionEvents(InputInfoPtr pInfo, int *num_v, int *first_v,
+				   int v[MAX_VALUATORS]);
 unsigned int EvdevUtilButtonEventToButtonNumber(EvdevPtr pEvdev, int code);
 
 /* Middle Button emulation */
 int  EvdevMBEmuTimer(InputInfoPtr);
 BOOL EvdevMBEmuFilterEvent(InputInfoPtr, int, BOOL);
-void EvdevMBEmuWakeupHandler(WAKEUP_HANDLER_ARGS);
-void EvdevMBEmuBlockHandler(BLOCK_HANDLER_ARGS);
+void EvdevMBEmuWakeupHandler(pointer, int, pointer);
+void EvdevMBEmuBlockHandler(pointer, struct timeval**, pointer);
 void EvdevMBEmuPreInit(InputInfoPtr);
 void EvdevMBEmuOn(InputInfoPtr);
 void EvdevMBEmuFinalize(InputInfoPtr);
-
-/* Third button emulation */
-CARD32 Evdev3BEmuTimer(OsTimerPtr timer, CARD32 time, pointer arg);
-BOOL Evdev3BEmuFilterEvent(InputInfoPtr, int, BOOL);
-void Evdev3BEmuPreInit(InputInfoPtr pInfo);
-void Evdev3BEmuOn(InputInfoPtr);
-void Evdev3BEmuFinalize(InputInfoPtr);
-void Evdev3BEmuProcessRelMotion(InputInfoPtr pInfo, double dx, double dy);
-void Evdev3BEmuProcessAbsMotion(InputInfoPtr pInfo, ValuatorMask *vals);
+void EvdevMBEmuEnable(InputInfoPtr, BOOL);
 
 /* Mouse Wheel emulation */
 void EvdevWheelEmuPreInit(InputInfoPtr pInfo);
@@ -297,9 +210,9 @@ BOOL EvdevWheelEmuFilterMotion(InputInfoPtr pInfo, struct input_event *pEv);
 void EvdevDragLockPreInit(InputInfoPtr pInfo);
 BOOL EvdevDragLockFilterEvent(InputInfoPtr pInfo, unsigned int button, int value);
 
+#ifdef HAVE_PROPERTIES
 void EvdevMBEmuInitProperty(DeviceIntPtr);
-void Evdev3BEmuInitProperty(DeviceIntPtr);
 void EvdevWheelEmuInitProperty(DeviceIntPtr);
 void EvdevDragLockInitProperty(DeviceIntPtr);
-void EvdevAppleInitProperty(DeviceIntPtr);
+#endif
 #endif