fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-05-06 10:18:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move Wacom touchpad tagging to the udev rules

Browse source 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Peter Hutterer 2015-06-05 16:17:04 +10:00
parent 59984fc40d
commit 452df0e8d3
4 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/evdev-mt-touchpad.c
View file

@ -1395,7 +1395,6 @@ tp_init_palmdetect(struct tp_dispatch *tp,
struct evdev_device *device) struct evdev_device *device)
{ {
int width, height; int width, height;
unsigned int vendor_id;
tp->palm.right_edge = INT_MAX; tp->palm.right_edge = INT_MAX;
tp->palm.left_edge = INT_MIN; tp->palm.left_edge = INT_MIN;
@ -1406,11 +1405,9 @@ tp_init_palmdetect(struct tp_dispatch *tp,
height = abs(device->abs.absinfo_y->maximum - height = abs(device->abs.absinfo_y->maximum -
device->abs.absinfo_y->minimum); device->abs.absinfo_y->minimum);
vendor_id = evdev_device_get_id_vendor(device);
/* Wacom doesn't have internal touchpads, /* Wacom doesn't have internal touchpads,
* Apple touchpads are always big enough to warrant palm detection */ * Apple touchpads are always big enough to warrant palm detection */
if (vendor_id == VENDOR_ID_WACOM) { if (device->model == EVDEV_MODEL_WACOM_TOUCHPAD) {
return 0; return 0;
} else if (device->model != EVDEV_MODEL_APPLE_TOUCHPAD) { } else if (device->model != EVDEV_MODEL_APPLE_TOUCHPAD) {
/* We don't know how big the touchpad is */ /* We don't know how big the touchpad is */

1
src/evdev.c
View file

@ -1514,6 +1514,7 @@ evdev_read_model(struct evdev_device *device)
{ "LIBINPUT_MODEL_SYSTEM76_KUDU", EVDEV_MODEL_SYSTEM76_KUDU }, { "LIBINPUT_MODEL_SYSTEM76_KUDU", EVDEV_MODEL_SYSTEM76_KUDU },
{ "LIBINPUT_MODEL_CLEVO_W740SU", EVDEV_MODEL_CLEVO_W740SU }, { "LIBINPUT_MODEL_CLEVO_W740SU", EVDEV_MODEL_CLEVO_W740SU },
{ "LIBINPUT_MODEL_APPLE_TOUCHPAD", EVDEV_MODEL_APPLE_TOUCHPAD }, { "LIBINPUT_MODEL_APPLE_TOUCHPAD", EVDEV_MODEL_APPLE_TOUCHPAD },
{ "LIBINPUT_MODEL_WACOM_TOUCHPAD", EVDEV_MODEL_WACOM_TOUCHPAD },
{ NULL, EVDEV_MODEL_DEFAULT }, { NULL, EVDEV_MODEL_DEFAULT },
}; };
const struct model_map *m = model_map; const struct model_map *m = model_map;

1
src/evdev.h
View file

@ -104,6 +104,7 @@ enum evdev_device_model {
EVDEV_MODEL_SYSTEM76_KUDU, EVDEV_MODEL_SYSTEM76_KUDU,
EVDEV_MODEL_CLEVO_W740SU, EVDEV_MODEL_CLEVO_W740SU,
EVDEV_MODEL_APPLE_TOUCHPAD, EVDEV_MODEL_APPLE_TOUCHPAD,
EVDEV_MODEL_WACOM_TOUCHPAD,
}; };
struct mt_slot { struct mt_slot {

6
udev/90-libinput-model-quirks.hwdb
View file

@ -71,3 +71,9 @@ libinput:name:SynPS/2 Synaptics TouchPad:dmi:*svnSystem76*pvrgalu1*
# Kudu Professional # Kudu Professional
libinput:name:SynPS/2 Synaptics TouchPad:dmi:*svnSystem76*pvrkudp1* libinput:name:SynPS/2 Synaptics TouchPad:dmi:*svnSystem76*pvrkudp1*
LIBINPUT_MODEL_SYSTEM76_KUDU=1 LIBINPUT_MODEL_SYSTEM76_KUDU=1
##########################################
# Wacom
##########################################
libinput:touchpad:input:b0003v056Ap*
LIBINPUT_MODEL_WACOM_TOUCHPAD=1