forked from wayland-tablet/libinput
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
udev: parse the EVDEV_ABS properties for a potential fuzz setting
Where a fuzz is defined in the 60-evdev.hwdb, we rely on a udev builtin to
set the kernel device to that fuzz value. Unfortunately that happens after our
program is called with this order of events:
1. 60-evdev.rules calls IMPORT(builtin) for the hwdb which sets the EVDEV_ABS_*
properties. It also sets RUN{builtin}=keyboard but that's not invoked yet.
2. 90-libinput-fuzz-override.rules calls IMPORT{program} for our fuzz override
bits. That sets the kernel fuzz value to 0 and sets the LIBINPUT_FUZZ_*
propertie
3. The keyboard builtin is run once all the rules have been processed.
Our problem is that where the fuzz is set in a hwdb entry, the kernel fuzz is
still unset when we get to look at it, so we always end up with a fuzz of zero
for us and a nonzero kernel fuzz.
Work around this by checking the EVDEV_ABS property, extracting the fuzz from
there and re-printing that property without the fuzz. This way we ensure the
kernel remains at zero fuzz and we use the one from the hwdb instead.
Fixes #346
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>- Loading branch information
Showing
8 changed files
with
459 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,150 @@ | ||
| /* | ||
| * Copyright © 2015 Red Hat, Inc. | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a | ||
| * copy of this software and associated documentation files (the "Software"), | ||
| * to deal in the Software without restriction, including without limitation | ||
| * the rights to use, copy, modify, merge, publish, distribute, sublicense, | ||
| * and/or sell copies of the Software, and to permit persons to whom the | ||
| * Software is furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice (including the next | ||
| * paragraph) shall be included in all copies or substantial portions of the | ||
| * Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | ||
| * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
| * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | ||
| * DEALINGS IN THE SOFTWARE. | ||
| */ | ||
|
|
||
| #include "config.h" | ||
|
|
||
| #include <errno.h> | ||
| #include <fcntl.h> | ||
| #include <stdbool.h> | ||
| #include <stdio.h> | ||
| #include <stdlib.h> | ||
| #include <stdint.h> | ||
| #include <string.h> | ||
| #include <unistd.h> | ||
| #include <libudev.h> | ||
| #include <linux/input.h> | ||
| #include <libevdev/libevdev.h> | ||
|
|
||
| #include "util-prop-parsers.h" | ||
| #include "util-macros.h" | ||
|
|
||
| /** | ||
| * For a non-zero fuzz on the x/y axes, print that fuzz as property and | ||
| * reset the kernel's fuzz to 0. | ||
| * https://bugs.freedesktop.org/show_bug.cgi?id=105202 | ||
| */ | ||
| static void | ||
| handle_absfuzz(struct udev_device *device) | ||
| { | ||
| const char *devnode; | ||
| struct libevdev *evdev = NULL; | ||
| int fd = -1; | ||
| int rc; | ||
| unsigned int *code; | ||
| unsigned int axes[] = {ABS_X, | ||
| ABS_Y, | ||
| ABS_MT_POSITION_X, | ||
| ABS_MT_POSITION_Y}; | ||
|
|
||
| devnode = udev_device_get_devnode(device); | ||
| if (!devnode) | ||
| goto out; | ||
|
|
||
| fd = open(devnode, O_RDONLY); | ||
| if (fd < 0) | ||
| goto out; | ||
|
|
||
| rc = libevdev_new_from_fd(fd, &evdev); | ||
| if (rc != 0) | ||
| goto out; | ||
|
|
||
| if (!libevdev_has_event_type(evdev, EV_ABS)) | ||
| goto out; | ||
|
|
||
| ARRAY_FOR_EACH(axes, code) { | ||
| int fuzz; | ||
|
|
||
| fuzz = libevdev_get_abs_fuzz(evdev, *code); | ||
| if (fuzz) | ||
| printf("LIBINPUT_FUZZ_%02x=%d\n", *code, fuzz); | ||
| } | ||
|
|
||
| out: | ||
| close(fd); | ||
| libevdev_free(evdev); | ||
| } | ||
|
|
||
| /** | ||
| * Where a device has EVDEV_ABS_... set with a fuzz, that fuzz hasn't been | ||
| * applied to the kernel yet. So we need to extract it ourselves **and** | ||
| * update the property so the kernel won't actually set it later. | ||
| */ | ||
| static void | ||
| handle_evdev_abs(struct udev_device *device) | ||
| { | ||
| unsigned int *code; | ||
| unsigned int axes[] = {ABS_X, | ||
| ABS_Y, | ||
| ABS_MT_POSITION_X, | ||
| ABS_MT_POSITION_Y}; | ||
|
|
||
| ARRAY_FOR_EACH(axes, code) { | ||
| const char *prop; | ||
| char name[64]; | ||
| uint32_t mask; | ||
| struct input_absinfo abs; | ||
|
|
||
| snprintf(name, sizeof(name), "EVDEV_ABS_%02X", *code); | ||
| prop = udev_device_get_property_value(device, name); | ||
| if (!prop) | ||
| continue; | ||
|
|
||
| mask = parse_evdev_abs_prop(prop, &abs); | ||
| if (mask & ABS_MASK_FUZZ) | ||
| printf("LIBINPUT_FUZZ_%02x=%d\n", *code, abs.fuzz); | ||
| } | ||
| } | ||
|
|
||
| int main(int argc, char **argv) | ||
| { | ||
| int rc = 1; | ||
| struct udev *udev = NULL; | ||
| struct udev_device *device = NULL; | ||
| const char *syspath; | ||
|
|
||
| if (argc != 2) | ||
| return 1; | ||
|
|
||
| syspath = argv[1]; | ||
|
|
||
| udev = udev_new(); | ||
| if (!udev) | ||
| goto out; | ||
|
|
||
| device = udev_device_new_from_syspath(udev, syspath); | ||
| if (!device) | ||
| goto out; | ||
|
|
||
| handle_absfuzz(device); | ||
| handle_evdev_abs(device); | ||
|
|
||
| rc = 0; | ||
|
|
||
| out: | ||
| if (device) | ||
| udev_device_unref(device); | ||
| if (udev) | ||
| udev_unref(udev); | ||
|
|
||
| return rc; | ||
| } |
Oops, something went wrong.