diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2015-02-10 15:23:38 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2015-02-10 15:23:38 +1000 |
| commit | 2365f7d3d12d3720e0f4686693bc4d82171c51ba (patch) | |
| tree | 8ca60cc8bbb50f5e608ff38101be023cb41bfe4c /test/litest-int.h | |
| parent | b9e4638b9d68a4893b1c5682dd5ea28a569becc3 (diff) | |
| parent | 911059b1e7a0ffb25de1f0395d0e6b88b998e77a (diff) | |
Merge branch 'master' into tablet-support
Added: udev-tag detection for the tablet.
libwacom assigns ID_INPUT_TABLET to all known devices but also
ID_INPUT_TOUCHPAD to all known devices with a touch interface. That's a bug
and should be fixed there but we can work around it by checking both and
making sure only one is set.
Conflicts:
src/evdev.c
test/misc.c
Diffstat (limited to 'test/litest-int.h')
| -rw-r--r-- | test/litest-int.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/test/litest-int.h b/test/litest-int.h index d989b2f0..5a55d6dc 100644 --- a/test/litest-int.h +++ b/test/litest-int.h @@ -69,6 +69,8 @@ struct litest_test_device { */ struct input_absinfo *absinfo; struct litest_device_interface *interface; + + const char *udev_rule; }; struct litest_device_interface { |