Hello community,
here is the log from the commit of package xorg-x11-driver-input for openSUSE:Factory
checked in at Fri Jan 7 12:41:45 CET 2011.
--------
--- xorg-x11-driver-input/xorg-x11-driver-input.changes 2010-12-21 04:18:45.000000000 +0100
+++ /mounts/work_src_done/STABLE/xorg-x11-driver-input/xorg-x11-driver-input.changes 2011-01-05 03:19:06.000000000 +0100
@@ -1,0 +2,14 @@
+Wed Jan 5 02:14:37 UTC 2011 - sndirsch@novell.com
+
+- xf86-input-evdev 2.5.99.903 (2.6 RC3)
+ This should have been the 2.6 release but we found a nasty
+ crasher bug late last year (#32480).
+ * Fix grammar typo in comment.
+ * Rename proximity to in_proximity.
+ * Revert "Don't count BTN_TOUCH as tool. (#29428)"
+ * Add use_proximity bit for BTN_TOOL handling.
+ * Don't update first_val and num_val if we don't have data (#32480)
+ * evdev 2.5.99.903
+ * evdev: rename EvdevCacheCompare() to EvdevCache()
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
xf86-input-evdev-2.5.99.902.tar.bz2
New:
----
xf86-input-evdev-2.5.99.903.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-driver-input.spec ++++++
--- /var/tmp/diff_new_pack.oSS2xJ/_old 2011-01-07 12:41:13.000000000 +0100
+++ /var/tmp/diff_new_pack.oSS2xJ/_new 2011-01-07 12:41:13.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package xorg-x11-driver-input (Version 7.6)
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -23,7 +23,7 @@
BuildRequires: Mesa-devel pkgconfig udev xorg-x11-proto-devel xorg-x11-server-sdk
Url: http://xorg.freedesktop.org/
Version: 7.6
-Release: 1
+Release: 2
License: MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -48,7 +48,7 @@
Source26: xf86-input-vmmouse-12.6.99.901.tar.bz2
Source27: xf86-input-void-1.3.1.tar.bz2
Source29: xf86-input-synaptics-1.3.0.tar.bz2
-Source30: xf86-input-evdev-2.5.99.902.tar.bz2
+Source30: xf86-input-evdev-2.5.99.903.tar.bz2
Source33: xf86-input-wacom-0.10.8.tar.bz2
Source42: 11-mouse.conf
Source45: 65-xorg-wacom.rules
++++++ xf86-input-evdev-2.5.99.902.tar.bz2 -> xf86-input-evdev-2.5.99.903.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-evdev-2.5.99.902/ChangeLog new/xf86-input-evdev-2.5.99.903/ChangeLog
--- old/xf86-input-evdev-2.5.99.902/ChangeLog 2010-12-08 03:41:50.000000000 +0100
+++ new/xf86-input-evdev-2.5.99.903/ChangeLog 2011-01-05 00:06:03.000000000 +0100
@@ -1,3 +1,118 @@
+commit 540a4cce9071fce183c941ded35e7e8fb8f3507e
+Author: Peter Hutterer
+Date: Wed Jan 5 09:04:56 2011 +1000
+
+ evdev 2.5.99.903
+
+ Signed-off-by: Peter Hutterer
+
+commit bed25600f66db245b895a48d6edca30568ca7559
+Author: Peter Hutterer
+Date: Thu Dec 23 12:13:16 2010 +1000
+
+ Don't update first_val and num_val if we don't have data (#32480)
+
+ For touchpads, rel_queued may be on (due to abs to rel conversion) but the
+ delta for x/y is 0/0 on the first touch. Hence, we don't have any valuators
+ to post. The current results in a num_vals of -15 and a subsequent segfault
+ when the data is posted to the server.
+
+ Start with a last valuator of -1, so that we know if we have at least one to
+ post.
+
+ X.Org Bug 32480 http://bugs.freedesktop.org/show_bug.cgi?id=32480
+
+ Signed-off-by: Peter Hutterer
+ Reviewed-by: Chase Douglas
+
+commit 9aea1c5fa09c25ad83bcf2fd4ee4bd853d889e5e
+Author: Peter Hutterer
+Date: Tue Dec 21 10:53:06 2010 +1000
+
+ Add use_proximity bit for BTN_TOOL handling.
+
+ Touchpads send garbage data between BTN_TOOL_FINGER and BTN_TOUCH. This
+ leads to cursor movement towards invalid positions (bottom left corner,
+ usually).
+
+ Add a new flag "use_proximity" as a delimiter for BTN_TOUCH handling. If
+ unset, the actual proximity bits are ignored, no proximity events are sent
+ and BTN_TOUCH is used for the tool handling.
+
+ Example event stream for synaptics:
+
+ Event: time 1292893041.002731, -------------- Report Sync ------------
+ Event: time 1292893041.015807, type 1 (Key), code 330 (Touch), value 0
+ Event: time 1292893041.015812, type 3 (Absolute), code 0 (X), value 4283
+ Event: time 1292893041.015813, type 3 (Absolute), code 1 (Y), value 4860
+ Event: time 1292893041.015815, type 3 (Absolute), code 24 (Pressure), value 23
+ Event: time 1292893041.015817, type 3 (Absolute), code 28 (Tool Width), value 5
+ Event: time 1292893041.027537, -------------- Report Sync ------------
+ Event: time 1292893041.038854, type 3 (Absolute), code 0 (X), value 1
+ Event: time 1292893041.038857, type 3 (Absolute), code 1 (Y), value 5855
+ Event: time 1292893041.038859, type 3 (Absolute), code 24 (Pressure), value 1
+ Event: time 1292893041.038861, type 3 (Absolute), code 28 (Tool Width), value 5
+ Event: time 1292893041.038864, -------------- Report Sync ------------
+ Event: time 1292893041.062432, type 3 (Absolute), code 24 (Pressure), value 0
+ Event: time 1292893041.062435, type 3 (Absolute), code 28 (Tool Width), value 0
+ Event: time 1292893041.062437, type 1 (Key), code 325 (ToolFinger), value 0
+ Event: time 1292893041.062438, -------------- Report Sync ------------
+
+ Reported-by: Dave Airlie
+ Signed-off-by: Peter Hutterer
+ Reviewed-by: Chris Bagwell
+
+commit 0c987a929dd4c98d4a80d8b7f75286902eb572f2
+Author: Peter Hutterer
+Date: Tue Dec 21 10:45:11 2010 +1000
+
+ Revert "Don't count BTN_TOUCH as tool. (#29428)"
+
+ Synaptics devices send garbage between BTN_TOUCH and BTN_TOOL_FINGER. By
+ switching to use this as proximity data now, the pointer is reset to the
+ garbage data position (usually around 1/5855).
+
+ This reverts commit 899218e18120918138f6d7420465763422d5b3b7.
+
+ Reported-by: Dave Airlie
+ Signed-off-by: Peter Hutterer
+ Reviewed-by: Chris Bagwell
+
+commit 242a01eb0f2f9b56fb6d6f0b41fc6a899cadb857
+Author: Peter Hutterer
+Date: Tue Dec 21 10:40:45 2010 +1000
+
+ Rename proximity to in_proximity.
+
+ No functional change, just making it a bit more obvious to read.
+
+ Signed-off-by: Peter Hutterer
+ Reviewed-by: Dan Nicholson
+ Reviewed-by: Chris Bagwell
+
+commit 7415953b9afac3221d1bb834aadcc7c1917366fd
+Author: Peter Hutterer
+Date: Tue Dec 21 10:44:14 2010 +1000
+
+ Fix grammar typo in comment.
+
+ Signed-off-by: Peter Hutterer
+
+commit 1ced7ec7e23c57c0e1aaddeb3c113e67a5cb7341
+Author: Peter Korsgaard
+Date: Fri Dec 10 16:16:59 2010 +0100
+
+ evdev: rename EvdevCacheCompare() to EvdevCache()
+
+ Since 59056e656c64 (Remove the reopen timer logic) from last year,
+ EvdevCacheCompare() is only used for caching ioctl values and not for
+ comparing, so remove the unused compare logic and rename the function
+ to EvdevCache().
+
+ Signed-off-by: Peter Korsgaard
+ Reviewed-by: Benjamin Tissoires
+ Signed-off-by: Peter Hutterer
+
commit 1c5ad6f8a0f098da89aa88102f424c667addf376
Author: Peter Hutterer
Date: Wed Dec 8 12:40:49 2010 +1000
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-evdev-2.5.99.902/configure new/xf86-input-evdev-2.5.99.903/configure
--- old/xf86-input-evdev-2.5.99.902/configure 2010-12-08 03:41:32.000000000 +0100
+++ new/xf86-input-evdev-2.5.99.903/configure 2011-01-05 00:05:54.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.66 for xf86-input-evdev 2.5.99.902.
+# Generated by GNU Autoconf 2.66 for xf86-input-evdev 2.5.99.903.
#
# Report bugs to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg.
#
@@ -563,8 +563,8 @@
# Identity of this package.
PACKAGE_NAME='xf86-input-evdev'
PACKAGE_TARNAME='xf86-input-evdev'
-PACKAGE_VERSION='2.5.99.902'
-PACKAGE_STRING='xf86-input-evdev 2.5.99.902'
+PACKAGE_VERSION='2.5.99.903'
+PACKAGE_STRING='xf86-input-evdev 2.5.99.903'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
PACKAGE_URL=''
@@ -1314,7 +1314,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xf86-input-evdev 2.5.99.902 to adapt to many kinds of systems.
+\`configure' configures xf86-input-evdev 2.5.99.903 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1385,7 +1385,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-input-evdev 2.5.99.902:";;
+ short | recursive ) echo "Configuration of xf86-input-evdev 2.5.99.903:";;
esac
cat <<\_ACEOF
@@ -1502,7 +1502,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-input-evdev configure 2.5.99.902
+xf86-input-evdev configure 2.5.99.903
generated by GNU Autoconf 2.66
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1826,7 +1826,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xf86-input-evdev $as_me 2.5.99.902, which was
+It was created by xf86-input-evdev $as_me 2.5.99.903, which was
generated by GNU Autoconf 2.66. Invocation command line was
$ $0 $@
@@ -2646,7 +2646,7 @@
# Define the identity of the package.
PACKAGE='xf86-input-evdev'
- VERSION='2.5.99.902'
+ VERSION='2.5.99.903'
cat >>confdefs.h <<_ACEOF
@@ -11743,7 +11743,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xf86-input-evdev $as_me 2.5.99.902, which was
+This file was extended by xf86-input-evdev $as_me 2.5.99.903, which was
generated by GNU Autoconf 2.66. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -11809,7 +11809,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-xf86-input-evdev config.status 2.5.99.902
+xf86-input-evdev config.status 2.5.99.903
configured by $0, generated by GNU Autoconf 2.66,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-evdev-2.5.99.902/configure.ac new/xf86-input-evdev-2.5.99.903/configure.ac
--- old/xf86-input-evdev-2.5.99.902/configure.ac 2010-12-08 03:40:45.000000000 +0100
+++ new/xf86-input-evdev-2.5.99.903/configure.ac 2011-01-05 00:04:34.000000000 +0100
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-input-evdev],
- [2.5.99.902],
+ [2.5.99.903],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-input-evdev])
AC_CONFIG_SRCDIR([Makefile.am])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-evdev-2.5.99.902/src/evdev.c new/xf86-input-evdev-2.5.99.903/src/evdev.c
--- old/xf86-input-evdev-2.5.99.902/src/evdev.c 2010-12-06 04:21:29.000000000 +0100
+++ new/xf86-input-evdev-2.5.99.903/src/evdev.c 2010-12-23 03:13:15.000000000 +0100
@@ -107,7 +107,7 @@
};
static int EvdevOn(DeviceIntPtr);
-static int EvdevCacheCompare(InputInfoPtr pInfo, BOOL compare);
+static int EvdevCache(InputInfoPtr pInfo);
static void EvdevKbdCtrl(DeviceIntPtr device, KeybdCtrl *ctrl);
static int EvdevSwitchMode(ClientPtr client, DeviceIntPtr device, int mode);
static BOOL EvdevGrabDevice(InputInfoPtr pInfo, int grab, int ungrab);
@@ -385,7 +385,7 @@
/* convert to relative motion for touchpads */
if (pEvdev->abs_queued && (pEvdev->flags & EVDEV_RELATIVE_MODE)) {
- if (pEvdev->proximity) {
+ 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)
@@ -402,7 +402,7 @@
}
if (pEvdev->rel_queued) {
- int first = REL_CNT, last = 0;
+ int first = REL_CNT, last = -1;
int i;
if (pEvdev->swap_axes) {
@@ -428,19 +428,22 @@
}
}
- *num_v = (last - first + 1);
- *first_v = first;
+ if (last >= 0)
+ {
+ *num_v = (last - first + 1);
+ *first_v = first;
+ }
}
/*
* Some devices only generate valid abs coords when BTN_TOOL_PEN is
* pressed. On wacom tablets, this means that the pen is in
* proximity of the tablet. After the pen is removed, BTN_TOOL_PEN is
* released, and a (0, 0) absolute event is generated. Checking
- * pEvdev->proximity here lets us ignore that event. pEvdev is
- * initialized to 1 so devices that doesn't use this scheme still
+ * pEvdev->in_proximity here lets us ignore that event. pEvdev is
+ * initialized to 1 so devices that don't use this scheme still
* just works.
*/
- else if (pEvdev->abs_queued && pEvdev->proximity) {
+ else if (pEvdev->abs_queued && pEvdev->in_proximity) {
memcpy(v, pEvdev->vals, sizeof(int) * pEvdev->num_vals);
if (pEvdev->swap_axes) {
@@ -486,6 +489,9 @@
{
EvdevPtr pEvdev = pInfo->private;
+ if (!pEvdev->use_proximity)
+ return;
+
pEvdev->prox_queued = 1;
EvdevQueueProximityEvent(pInfo, ev->value);
@@ -515,7 +521,7 @@
/* no proximity change in the queue */
if (!pEvdev->prox_queued)
{
- if (pEvdev->abs_queued && !pEvdev->proximity)
+ if (pEvdev->abs_queued && !pEvdev->in_proximity)
pEvdev->abs_prox = pEvdev->abs_queued;
return 0;
}
@@ -529,8 +535,8 @@
}
}
- if ((prox_state && !pEvdev->proximity) ||
- (!prox_state && pEvdev->proximity))
+ if ((prox_state && !pEvdev->in_proximity) ||
+ (!prox_state && pEvdev->in_proximity))
{
/* We're about to go into/out of proximity but have no abs events
* within the EV_SYN. Use the last coordinates we have. */
@@ -541,7 +547,7 @@
}
}
- pEvdev->proximity = prox_state;
+ pEvdev->in_proximity = prox_state;
return 1;
}
@@ -679,6 +685,10 @@
switch (ev->code) {
case BTN_TOUCH:
+ /* For devices that have but don't use proximity, use
+ * BTN_TOUCH as the proximity notifier */
+ if (!pEvdev->use_proximity)
+ pEvdev->in_proximity = value ? ev->code : 0;
if (!(pEvdev->flags & (EVDEV_TOUCHSCREEN | EVDEV_TABLET)))
break;
/* Treat BTN_TOUCH from devices that only have BTN_TOUCH as
@@ -720,11 +730,11 @@
* pressed. On wacom tablets, this means that the pen is in
* proximity of the tablet. After the pen is removed, BTN_TOOL_PEN is
* released, and a (0, 0) absolute event is generated. Checking
- * pEvdev->proximity here lets us ignore that event. pEvdev->proximity is
- * initialized to 1 so devices that don't use this scheme still
- * just work.
+ * pEvdev->in_proximity here lets us ignore that event.
+ * pEvdev->in_proximity is initialized to 1 so devices that don't use
+ * this scheme still just work.
*/
- if (pEvdev->abs_queued && pEvdev->proximity) {
+ if (pEvdev->abs_queued && pEvdev->in_proximity) {
xf86PostMotionEventP(pInfo->dev, TRUE, first_v, num_v, v + first_v);
}
}
@@ -767,7 +777,7 @@
break;
case EV_QUEUE_BTN:
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 11
- if (pEvdev->abs_queued && pEvdev->proximity) {
+ if (pEvdev->abs_queued && pEvdev->in_proximity) {
xf86PostButtonEventP(pInfo->dev, 1, pEvdev->queue[i].key,
pEvdev->queue[i].val, first_v, num_v,
v + first_v);
@@ -1345,6 +1355,9 @@
for (i = 0; i < ArrayLength(proximity_bits); i++)
{
+ if (!pEvdev->use_proximity)
+ break;
+
if (TestBit(proximity_bits[i], pEvdev->key_bitmask))
{
InitProximityClassDeviceStruct(device);
@@ -1744,14 +1757,11 @@
/**
* Get as much information as we can from the fd and cache it.
- * If compare is True, then the information retrieved will be compared to the
- * one already cached. If the information does not match, then this function
- * returns an error.
*
* @return Success if the information was cached, or !Success otherwise.
*/
static int
-EvdevCacheCompare(InputInfoPtr pInfo, BOOL compare)
+EvdevCache(InputInfoPtr pInfo)
{
EvdevPtr pEvdev = pInfo->private;
int i, len;
@@ -1768,13 +1778,7 @@
goto error;
}
- if (!compare) {
- strcpy(pEvdev->name, name);
- } else if (strcmp(pEvdev->name, name)) {
- xf86Msg(X_ERROR, "%s: device name changed: %s != %s\n",
- pInfo->name, pEvdev->name, name);
- goto error;
- }
+ strcpy(pEvdev->name, name);
len = ioctl(pInfo->fd, EVIOCGBIT(0, sizeof(bitmask)), bitmask);
if (len < 0) {
@@ -1783,12 +1787,7 @@
goto error;
}
- if (!compare) {
- memcpy(pEvdev->bitmask, bitmask, len);
- } else if (memcmp(pEvdev->bitmask, bitmask, len)) {
- xf86Msg(X_ERROR, "%s: device bitmask has changed\n", pInfo->name);
- goto error;
- }
+ memcpy(pEvdev->bitmask, bitmask, len);
len = ioctl(pInfo->fd, EVIOCGBIT(EV_REL, sizeof(rel_bitmask)), rel_bitmask);
if (len < 0) {
@@ -1797,12 +1796,7 @@
goto error;
}
- if (!compare) {
- memcpy(pEvdev->rel_bitmask, rel_bitmask, len);
- } else if (memcmp(pEvdev->rel_bitmask, rel_bitmask, len)) {
- xf86Msg(X_ERROR, "%s: device rel_bitmask has changed\n", pInfo->name);
- goto error;
- }
+ memcpy(pEvdev->rel_bitmask, rel_bitmask, len);
len = ioctl(pInfo->fd, EVIOCGBIT(EV_ABS, sizeof(abs_bitmask)), abs_bitmask);
if (len < 0) {
@@ -1811,12 +1805,7 @@
goto error;
}
- if (!compare) {
- memcpy(pEvdev->abs_bitmask, abs_bitmask, len);
- } else if (memcmp(pEvdev->abs_bitmask, abs_bitmask, len)) {
- xf86Msg(X_ERROR, "%s: device abs_bitmask has changed\n", pInfo->name);
- goto error;
- }
+ memcpy(pEvdev->abs_bitmask, abs_bitmask, len);
len = ioctl(pInfo->fd, EVIOCGBIT(EV_LED, sizeof(led_bitmask)), led_bitmask);
if (len < 0) {
@@ -1825,12 +1814,7 @@
goto error;
}
- if (!compare) {
- memcpy(pEvdev->led_bitmask, led_bitmask, len);
- } else if (memcmp(pEvdev->led_bitmask, led_bitmask, len)) {
- xf86Msg(X_ERROR, "%s: device led_bitmask has changed\n", pInfo->name);
- goto error;
- }
+ memcpy(pEvdev->led_bitmask, led_bitmask, len);
/*
* Do not try to validate absinfo data since it is not expected
@@ -1854,27 +1838,6 @@
goto error;
}
- if (compare) {
- /*
- * Keys are special as user can adjust keymap at any time (on
- * devices that support EVIOCSKEYCODE. However we do not expect
- * buttons reserved for mice/tablets/digitizers and so on to
- * appear/disappear so we will check only those in
- * [BTN_MISC, KEY_OK) range.
- */
- size_t start_word = BTN_MISC / LONG_BITS;
- size_t start_byte = start_word * sizeof(unsigned long);
- size_t end_word = KEY_OK / LONG_BITS;
- size_t end_byte = end_word * sizeof(unsigned long);
-
- if (len >= start_byte &&
- memcmp(&pEvdev->key_bitmask[start_word], &key_bitmask[start_word],
- min(len, end_byte) - start_byte + 1)) {
- xf86Msg(X_ERROR, "%s: device key_bitmask has changed\n", pInfo->name);
- goto error;
- }
- }
-
/* Copy the data so we have reasonably up-to-date info */
memcpy(pEvdev->key_bitmask, key_bitmask, len);
@@ -2088,6 +2051,7 @@
if (pEvdev->flags & EVDEV_TOUCHPAD) {
xf86Msg(X_INFO, "%s: Configuring as touchpad\n", pInfo->name);
pInfo->type_name = XI_TOUCHPAD;
+ pEvdev->use_proximity = 0;
} else if (pEvdev->flags & EVDEV_TABLET) {
xf86Msg(X_INFO, "%s: Configuring as tablet\n", pInfo->name);
pInfo->type_name = XI_TABLET;
@@ -2250,10 +2214,11 @@
goto error;
/*
- * We initialize pEvdev->proximity to 1 so that device that doesn't use
+ * We initialize pEvdev->in_proximity to 1 so that device that doesn't use
* proximity will still report events.
*/
- pEvdev->proximity = 1;
+ pEvdev->in_proximity = 1;
+ pEvdev->use_proximity = 1;
/* Grabbing the event device stops in-kernel event forwarding. In other
words, it disables rfkill and the "Macintosh mouse button emulation".
@@ -2273,8 +2238,7 @@
EvdevInitButtonMapping(pInfo);
- if (EvdevCacheCompare(pInfo, FALSE) ||
- EvdevProbe(pInfo)) {
+ if (EvdevCache(pInfo) || EvdevProbe(pInfo)) {
rc = BadMatch;
goto error;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-evdev-2.5.99.902/src/evdev.h new/xf86-input-evdev-2.5.99.903/src/evdev.h
--- old/xf86-input-evdev-2.5.99.902/src/evdev.h 2010-12-02 07:13:45.000000000 +0100
+++ new/xf86-input-evdev-2.5.99.903/src/evdev.h 2010-12-23 03:13:13.000000000 +0100
@@ -125,7 +125,8 @@
int old_vals[MAX_VALUATORS]; /* Translate absolute inputs to relative */
int flags;
- int proximity;
+ int in_proximity; /* device in proximity */
+ int use_proximity; /* using the proximity bit? */
int num_buttons; /* number of buttons */
BOOL swap_axes;
BOOL invert_x;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org