Timo Aaltonen pushed to branch upstream-unstable at X Strike Force / driver / xserver-xorg-input-evdev
Commits:
-
67681097
by Peter Hutterer at 2017-01-26T01:13:25Z
-
49219123
by Emil Velikov at 2017-01-26T01:13:25Z
-
8c1058f2
by Mihail Konev at 2017-01-26T04:00:21Z
-
192fdb06
by Andrey Zabolotnyi at 2018-01-16T06:30:59Z
-
ab1d9adf
by Christian Gmeiner at 2018-01-30T03:37:57Z
-
456f23cb
by Peter Hutterer at 2018-05-29T00:00:05Z
-
2fb95783
by Andrey Zabolotnyi at 2018-05-29T00:00:26Z
-
67a97afb
by Peter Hutterer at 2018-05-29T00:05:22Z
3 changed files:
Changes:
1 | 1 |
#! /bin/sh
|
2 | 2 |
|
3 |
-srcdir=`dirname $0`
|
|
3 |
+srcdir=`dirname "$0"`
|
|
4 | 4 |
test -z "$srcdir" && srcdir=.
|
5 | 5 |
|
6 | 6 |
ORIGDIR=`pwd`
|
7 |
-cd $srcdir
|
|
7 |
+cd "$srcdir"
|
|
8 | 8 |
|
9 | 9 |
autoreconf -v --install || exit 1
|
10 |
-cd $ORIGDIR || exit $?
|
|
10 |
+cd "$ORIGDIR" || exit $?
|
|
11 |
+ |
|
12 |
+git config --local --get format.subjectPrefix >/dev/null 2>&1 ||
|
|
13 |
+ git config --local format.subjectPrefix "PATCH xf86-input-evdev"
|
|
11 | 14 |
|
12 | 15 |
if test -z "$NOCONFIGURE"; then
|
13 |
- $srcdir/configure "$@"
|
|
16 |
+ exec "$srcdir"/configure "$@"
|
|
14 | 17 |
fi
|
... | ... | @@ -23,7 +23,7 @@ |
23 | 23 |
# Initialize Autoconf
|
24 | 24 |
AC_PREREQ([2.60])
|
25 | 25 |
AC_INIT([xf86-input-evdev],
|
26 |
- [2.10.5],
|
|
26 |
+ [2.10.6],
|
|
27 | 27 |
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
|
28 | 28 |
[xf86-input-evdev])
|
29 | 29 |
AC_CONFIG_SRCDIR([Makefile.am])
|
... | ... | @@ -551,6 +551,16 @@ EvdevProcessProximityState(InputInfoPtr pInfo) |
551 | 551 |
}
|
552 | 552 |
}
|
553 | 553 |
|
554 |
+ /* Wacom's last frame resets all values to 0, including x/y.
|
|
555 |
+ Skip over this. */
|
|
556 |
+ if (prox_state == 0) {
|
|
557 |
+ int v;
|
|
558 |
+ if (valuator_mask_fetch(pEvdev->abs_vals, 0, &v) && v == 0)
|
|
559 |
+ valuator_mask_unset(pEvdev->abs_vals, 0);
|
|
560 |
+ if (valuator_mask_fetch(pEvdev->abs_vals, 1, &v) && v == 0)
|
|
561 |
+ valuator_mask_unset(pEvdev->abs_vals, 1);
|
|
562 |
+ }
|
|
563 |
+ |
|
554 | 564 |
if ((prox_state && !pEvdev->in_proximity) ||
|
555 | 565 |
(!prox_state && pEvdev->in_proximity))
|
556 | 566 |
{
|
... | ... | @@ -905,7 +915,7 @@ EvdevPostProximityEvents(InputInfoPtr pInfo, int which) |
905 | 915 |
break;
|
906 | 916 |
case EV_QUEUE_PROXIMITY:
|
907 | 917 |
if (pEvdev->queue[i].val == which)
|
908 |
- xf86PostProximityEvent(pInfo->dev, which, 0, 0);
|
|
918 |
+ xf86PostProximityEventM(pInfo->dev, which, pEvdev->old_vals);
|
|
909 | 919 |
break;
|
910 | 920 |
}
|
911 | 921 |
}
|
... | ... | @@ -2353,8 +2363,10 @@ EvdevProbe(InputInfoPtr pInfo) |
2353 | 2363 |
pInfo->type_name = XI_TOUCHSCREEN;
|
2354 | 2364 |
} else {
|
2355 | 2365 |
if (!libevdev_has_event_code(pEvdev->dev, EV_REL, REL_X) ||
|
2356 |
- !libevdev_has_event_code(pEvdev->dev, EV_REL, REL_Y))
|
|
2366 |
+ !libevdev_has_event_code(pEvdev->dev, EV_REL, REL_Y)) {
|
|
2367 |
+ pEvdev->flags |= EVDEV_RELATIVE_EVENTS;
|
|
2357 | 2368 |
EvdevForceXY(pInfo, Relative);
|
2369 |
+ }
|
|
2358 | 2370 |
xf86IDrvMsg(pInfo, X_INFO, "Configuring as mouse\n");
|
2359 | 2371 |
pInfo->type_name = XI_MOUSE;
|
2360 | 2372 |
}
|
... | ... | @@ -2485,7 +2497,7 @@ EvdevOpenDevice(InputInfoPtr pInfo) |
2485 | 2497 |
}
|
2486 | 2498 |
|
2487 | 2499 |
if (pInfo->fd < 0) {
|
2488 |
- xf86IDrvMsg(pInfo, X_ERROR, "Unable to open evdev device \"%s\".\n", device);
|
|
2500 |
+ xf86IDrvMsg(pInfo, X_ERROR, "Unable to open evdev device \"%s\" (%s).\n", device, strerror(errno));
|
|
2489 | 2501 |
return BadValue;
|
2490 | 2502 |
}
|
2491 | 2503 |
|