diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2017-09-20 10:50:19 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2017-09-21 12:27:46 +1000 |
| commit | 77890ecc8f39a3a3ba5016a941cf073d541fffbd (patch) | |
| tree | a138a18b9d0abbaa02e8cced3bcbdff5a673fb17 /udev | |
| parent | 0c6b5c045b4c3799fae6ab210c27726be1105a6a (diff) | |
| download | libinput-77890ecc8f39a3a3ba5016a941cf073d541fffbd.tar.gz | |
tablet: always enable the no-proximity-out quirk on HUION tablets
And instead disable it when we do get a proximity out.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
Diffstat (limited to 'udev')
| -rw-r--r-- | udev/90-libinput-model-quirks.hwdb | 13 | ||||
| -rw-r--r-- | udev/90-libinput-model-quirks.rules.in | 4 | ||||
| -rwxr-xr-x | udev/parse_hwdb.py | 2 |
3 files changed, 9 insertions, 10 deletions
diff --git a/udev/90-libinput-model-quirks.hwdb b/udev/90-libinput-model-quirks.hwdb index 867ffa53..6525b800 100644 --- a/udev/90-libinput-model-quirks.hwdb +++ b/udev/90-libinput-model-quirks.hwdb @@ -171,15 +171,10 @@ libinput:name:AlpsPS/2 ALPS GlidePoint:dmi:*svnHP:pnHPZBookStudioG3:* # matching BTN_TOOL_PEN value 0 event. The device appears as if it was # permanently in proximity. # -# If the tablet is affected by this bug, copy the two lines below into a new -# file -# /etc/udev/hwdb.d/90-libinput-huion-pentablet-proximity-quirk.hwdb, then run -# sudo udevadm hwdb --update and reboot. -# -# Note that HUION re-uses USB IDs for its devices, not ever HUION tablet is -# affected by this bug. -#libinput:name:PenTablet Pen:dmi:* -# LIBINPUT_MODEL_TABLET_NO_PROXIMITY_OUT=1 +# HUION re-uses USB IDs for its devices, not every HUION tablet is +# affected by this bug, libinput will auto-disable this feature +libinput:tablet:input:b0003v256Cp* + LIBINPUT_MODEL_TABLET_NO_PROXIMITY_OUT=1 ########################################## # LENOVO diff --git a/udev/90-libinput-model-quirks.rules.in b/udev/90-libinput-model-quirks.rules.in index 08137812..e7d56bbe 100644 --- a/udev/90-libinput-model-quirks.rules.in +++ b/udev/90-libinput-model-quirks.rules.in @@ -29,6 +29,10 @@ KERNELS=="*input*", \ ENV{ID_INPUT_TOUCHPAD}=="1", \ IMPORT{builtin}="hwdb --subsystem=input --lookup-prefix=libinput:touchpad:" +# libinput:tablet:<modalias> +ENV{ID_INPUT_TABLET}=="1", \ + IMPORT{builtin}="hwdb --subsystem=input --lookup-prefix=libinput:tablet:" + # libinput:mouse:<modalias> ENV{ID_INPUT_MOUSE}=="1", \ IMPORT{builtin}="hwdb --subsystem=input --lookup-prefix=libinput:mouse:" diff --git a/udev/parse_hwdb.py b/udev/parse_hwdb.py index f6b9ec0a..69eb65b0 100755 --- a/udev/parse_hwdb.py +++ b/udev/parse_hwdb.py @@ -59,7 +59,7 @@ REAL = Combine((INTEGER + Optional('.' + Optional(INTEGER))) ^ ('.' + INTEGER)) UDEV_TAG = Word(string.ascii_uppercase, alphanums + '_') TYPES = { - 'libinput': ('name', 'touchpad', 'mouse', 'keyboard'), + 'libinput': ('name', 'touchpad', 'mouse', 'keyboard', 'tablet'), } |