chiark / gitweb /
udev: Add builtin/rule to export evdev information as udev properties
authorCarlos Garnacho <carlosg@gnome.org>
Sun, 11 Jan 2015 19:47:19 +0000 (20:47 +0100)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Mon, 12 Jan 2015 04:41:42 +0000 (23:41 -0500)
This rule is only run on tablet/touchscreen devices, and extracts their size
in millimeters, as it can be found out through their struct input_absinfo.

The first usecase is exporting device size from tablets/touchscreens. This
may be useful to separate policy and application at the time of mapping
these devices to the available outputs in windowing environments that don't
offer that information as readily (eg. Wayland). This way the compositor can
stay deterministic, and the mix-and-match heuristics are performed outside.

Conceivably, size/resolution information can be changed through EVIOCSABS
anywhere else, but we're only interested in values prior to any calibration,
this rule is thus only run on "add", and no tracking of changes is performed.
This should only remain a problem if calibration were automatically applied
by an earlier udev rule (read: don't).

  v2: Folded rationale into commit log, made a builtin, set properties
      on device nodes themselves
  v3: Use inline function instead of macro for mm. size calculation,
      use DECIMAL_STR_MAX, other code style issues
  v4: Made rule more selective
  v5: Minor style issues, renamed to a more generic builtin, refined
      rule further.

Makefile.am
rules/60-evdev_id.rules [new file with mode: 0644]
src/udev/udev-builtin-evdev_id.c [new file with mode: 0644]
src/udev/udev-builtin.c
src/udev/udev.h

index 2d45a7b..7f9dc26 100644 (file)
@@ -3478,6 +3478,7 @@ dist_udevrules_DATA += \
        rules/42-usb-hid-pm.rules \
        rules/50-udev-default.rules \
        rules/60-drm.rules \
        rules/42-usb-hid-pm.rules \
        rules/50-udev-default.rules \
        rules/60-drm.rules \
+       rules/60-evdev_id.rules \
        rules/60-keyboard.rules \
        rules/70-mouse.rules \
        rules/60-persistent-storage-tape.rules \
        rules/60-keyboard.rules \
        rules/70-mouse.rules \
        rules/60-persistent-storage-tape.rules \
@@ -3561,6 +3562,7 @@ libudev_core_la_SOURCES = \
        src/udev/udev-builtin.c \
        src/udev/udev-builtin-btrfs.c \
        src/udev/udev-builtin-hwdb.c \
        src/udev/udev-builtin.c \
        src/udev/udev-builtin-btrfs.c \
        src/udev/udev-builtin-hwdb.c \
+       src/udev/udev-builtin-evdev_id.c \
        src/udev/udev-builtin-input_id.c \
        src/udev/udev-builtin-keyboard.c \
        src/udev/udev-builtin-net_id.c \
        src/udev/udev-builtin-input_id.c \
        src/udev/udev-builtin-keyboard.c \
        src/udev/udev-builtin-net_id.c \
diff --git a/rules/60-evdev_id.rules b/rules/60-evdev_id.rules
new file mode 100644 (file)
index 0000000..4716a10
--- /dev/null
@@ -0,0 +1,10 @@
+# do not edit this file, it will be overwritten on update
+
+ACTION!="add", GOTO="evdev_id_end"
+SUBSYSTEM!="input", GOTO="evdev_id_end"
+KERNEL!="event*", GOTO="evdev_id_end"
+
+ENV{ID_INPUT_TOUCHSCREEN}=="1", IMPORT{builtin}="evdev_id"
+ENV{ID_INPUT_TABLET}=="1", IMPORT{builtin}="evdev_id"
+
+LABEL="evdev_id_end"
diff --git a/src/udev/udev-builtin-evdev_id.c b/src/udev/udev-builtin-evdev_id.c
new file mode 100644 (file)
index 0000000..1b58bdd
--- /dev/null
@@ -0,0 +1,78 @@
+/*
+ * evdev_id - extracts miscellaneous information from evdev devices
+ *
+ * Copyright (C) 2014 Red Hat
+ * Author:
+ *   Carlos Garnacho  <carlosg@gnome.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with keymap; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+#include <linux/input.h>
+#include "udev.h"
+#include "util.h"
+
+static inline int abs_size_mm(const struct input_absinfo *absinfo) {
+        /* Resolution is defined to be in units/mm for ABS_X/Y */
+        return (absinfo->maximum - absinfo->minimum) / absinfo->resolution;
+}
+
+static void extract_info(struct udev_device *dev, const char *devpath, bool test) {
+        char width[DECIMAL_STR_MAX(int)], height[DECIMAL_STR_MAX(int)];
+        struct input_absinfo xabsinfo = {}, yabsinfo = {};
+        _cleanup_close_ int fd = -1;
+
+        fd = open(devpath, O_RDONLY|O_CLOEXEC);
+        if (fd < 0)
+                return;
+
+        if (ioctl(fd, EVIOCGABS(ABS_X), &xabsinfo) < 0 ||
+            ioctl(fd, EVIOCGABS(ABS_Y), &yabsinfo) < 0)
+                return;
+
+        if (xabsinfo.resolution <= 0 || yabsinfo.resolution <= 0)
+                return;
+
+        snprintf(width, sizeof(width), "%d", abs_size_mm(&xabsinfo));
+        snprintf(height, sizeof(height), "%d", abs_size_mm(&yabsinfo));
+
+        udev_builtin_add_property(dev, test, "ID_INPUT_WIDTH_MM", width);
+        udev_builtin_add_property(dev, test, "ID_INPUT_HEIGHT_MM", height);
+}
+
+static int builtin_evdev_id(struct udev_device *dev, int argc, char *argv[], bool test) {
+        const char *subsystem;
+        const char *devnode;
+
+        subsystem = udev_device_get_subsystem(dev);
+
+        if (!subsystem || !streq(subsystem, "input"))
+                return EXIT_SUCCESS;
+
+        devnode = udev_device_get_devnode(dev);
+        /* not an evdev node */
+        if (!devnode)
+                return EXIT_SUCCESS;
+
+        extract_info(dev, devnode, test);
+
+        return EXIT_SUCCESS;
+}
+
+const struct udev_builtin udev_builtin_evdev_id = {
+        .name = "evdev_id",
+        .cmd = builtin_evdev_id,
+        .help = "evdev devices information",
+};
index 1950ec2..9cfea5e 100644 (file)
@@ -47,6 +47,7 @@ static const struct udev_builtin *builtins[] = {
 #ifdef HAVE_ACL
         [UDEV_BUILTIN_UACCESS] = &udev_builtin_uaccess,
 #endif
 #ifdef HAVE_ACL
         [UDEV_BUILTIN_UACCESS] = &udev_builtin_uaccess,
 #endif
+        [UDEV_BUILTIN_EVDEV_ID] = &udev_builtin_evdev_id,
 };
 
 void udev_builtin_init(struct udev *udev) {
 };
 
 void udev_builtin_init(struct udev *udev) {
index dece6ec..ce4188f 100644 (file)
@@ -164,6 +164,7 @@ enum udev_builtin_cmd {
 #ifdef HAVE_ACL
         UDEV_BUILTIN_UACCESS,
 #endif
 #ifdef HAVE_ACL
         UDEV_BUILTIN_UACCESS,
 #endif
+        UDEV_BUILTIN_EVDEV_ID,
         UDEV_BUILTIN_MAX
 };
 struct udev_builtin {
         UDEV_BUILTIN_MAX
 };
 struct udev_builtin {
@@ -190,6 +191,7 @@ extern const struct udev_builtin udev_builtin_net_setup_link;
 extern const struct udev_builtin udev_builtin_path_id;
 extern const struct udev_builtin udev_builtin_usb_id;
 extern const struct udev_builtin udev_builtin_uaccess;
 extern const struct udev_builtin udev_builtin_path_id;
 extern const struct udev_builtin udev_builtin_usb_id;
 extern const struct udev_builtin udev_builtin_uaccess;
+extern const struct udev_builtin udev_builtin_evdev_id;
 void udev_builtin_init(struct udev *udev);
 void udev_builtin_exit(struct udev *udev);
 enum udev_builtin_cmd udev_builtin_lookup(const char *command);
 void udev_builtin_init(struct udev *udev);
 void udev_builtin_exit(struct udev *udev);
 enum udev_builtin_cmd udev_builtin_lookup(const char *command);