On 8/17/2015 7:21 PM, Peter Hutterer wrote: > On Mon, Aug 17, 2015 at 05:29:14PM -0700, Jason Gerecke wrote: >> Similar to the issue mentioned in the commit message of 2365f7d, libwacom >> assigns both ID_INPUT_TABLET and ID_INPUT_TOUCHSCREEN to touchscreens like >> the Cintiq 24HDT. This patch ensures that neither touchpads nor touchscreens >> will accidentally be handled by the tablet code. > > I'm confused, isnt this the same as 10ca39cf80698cedf92? > > Cheers, > Peter >
Looks like my wires got crossed. I was apparently working off of your Github repository instead of FDO. Pardon the noise. Jason --- Now instead of four in the eights place / you’ve got three, ‘Cause you added one / (That is to say, eight) to the two, / But you can’t take seven from three, / So you look at the sixty-fours.... >> >> Signed-off-by: Jason Gerecke <jason.gere...@wacom.com> >> --- >> src/evdev.c | 6 ++++-- >> 1 file changed, 4 insertions(+), 2 deletions(-) >> >> diff --git a/src/evdev.c b/src/evdev.c >> index bbc3dce..a4bdb9a 100644 >> --- a/src/evdev.c >> +++ b/src/evdev.c >> @@ -1495,8 +1495,10 @@ evdev_configure_device(struct evdev_device *device) >> /* libwacom assigns touchpad _and_ tablet to the tablet touch bits, >> so make sure we don't initialize the tablet interface for the >> touch device */ >> - if ((udev_tags & (EVDEV_UDEV_TAG_TABLET|EVDEV_UDEV_TAG_TOUCHPAD)) == >> - EVDEV_UDEV_TAG_TABLET) { >> + if ((udev_tags & (EVDEV_UDEV_TAG_TABLET | >> + EVDEV_UDEV_TAG_TOUCHPAD | >> + EVDEV_UDEV_TAG_TOUCHSCREEN)) == >> + EVDEV_UDEV_TAG_TABLET) { >> device->dispatch = evdev_tablet_create(device); >> device->seat_caps |= EVDEV_DEVICE_TABLET; >> log_info(libinput, >> -- >> 2.5.0 >> _______________________________________________ wayland-devel mailing list wayland-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/wayland-devel