diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2016-04-22 15:04:37 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2016-05-03 16:15:51 +1000 |
| commit | 2285fe78c04714561a0d1a164a41a38c48263f89 (patch) | |
| tree | e798d40bc6dad80b64d8bd18a70ceffafa73aa2c /config | |
| parent | fa02b05645080c285da5972262a8d37403e39d7e (diff) | |
xfree86: add support for MatchIsTabletPad
The tablet pads have been separate kernel devices for a while now and
libwacom has labelled them with the udev ID_INPUT_TABLET_PAD for over a year
now. Add a new MatchIsTabletPad directive to apply configuration options
specifically to the Pad part of a tablet.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'config')
| -rw-r--r-- | config/hal.c | 2 | ||||
| -rw-r--r-- | config/udev.c | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/config/hal.c b/config/hal.c index c76eced4c..e33e3330b 100644 --- a/config/hal.c +++ b/config/hal.c @@ -177,6 +177,8 @@ device_added(LibHalContext * hal_ctx, const char *udi) attrs.flags |= ATTR_JOYSTICK; if (libhal_device_query_capability(hal_ctx, udi, "input.tablet", NULL)) attrs.flags |= ATTR_TABLET; + if (libhal_device_query_capability(hal_ctx, udi, "input.tablet_pad", NULL)) + attrs.flags |= ATTR_TABLET_PAD; if (libhal_device_query_capability(hal_ctx, udi, "input.touchpad", NULL)) attrs.flags |= ATTR_TOUCHPAD; if (libhal_device_query_capability(hal_ctx, udi, "input.touchscreen", NULL)) diff --git a/config/udev.c b/config/udev.c index 1a6e82a3c..23b795f64 100644 --- a/config/udev.c +++ b/config/udev.c @@ -258,6 +258,10 @@ device_added(struct udev_device *udev_device) LOG_PROPERTY(path, key, value); attrs.flags |= ATTR_TABLET; } + else if (!strcmp(key, "ID_INPUT_TABLET_PAD")) { + LOG_PROPERTY(path, key, value); + attrs.flags |= ATTR_TABLET_PAD; + } else if (!strcmp(key, "ID_INPUT_TOUCHPAD")) { LOG_PROPERTY(path, key, value); attrs.flags |= ATTR_TOUCHPAD; |