libinput: add support for touchscreen set matrix

My android pad emit a strange touch input from libinput, need to rotate it in 270 degree clockwise to fix.

diff --git a/docs/rc.xml.all b/docs/rc.xml.all
index 65a6ab542f2722a90ca62437ca836cb49fc86774..546ee010c304443f9d6c6ef565e14d342f59bd4b 100644 (file)
--- a/docs/rc.xml.all
+++ b/docs/rc.xml.all
@@ -504,6 +504,9 @@
       - tapButtonMap [lrm|lmr]
       - clickMethod [none|buttonAreas|clickfinger]
       - sendEventsMode [yes|no|disabledOnExternalMouse]
+      - calibrationMatrix [six float values split by space],
+      visit https://wayland.freedesktop.org/libinput/doc/latest/absolute-axes.html#calibration-of-absolute-devices
+      for more information
   -->
   <libinput>
     <device category="default">
@@ -519,6 +522,7 @@
       <disableWhileTyping></disableWhileTyping>
       <clickMethod></clickMethod>
       <sendEventsMode></sendEventsMode>
+      <calibrationMatrix></calibrationMatrix>
     </device>
   </libinput>
 

diff --git a/include/config/libinput.h b/include/config/libinput.h
index 912009ea3d1eb15cdaa993cd92f8cc5dac1300b7..59fbf76aec54dddbddc172d23d375ad554cf0673 100644 (file)
--- a/include/config/libinput.h
+++ b/include/config/libinput.h
@@ -23,13 +23,15 @@ struct libinput_category {
        int left_handed;
        enum libinput_config_tap_state tap;
        enum libinput_config_tap_button_map tap_button_map;
-       int tap_and_drag;     /* -1 or libinput_config_drag_state */
-       int drag_lock;        /* -1 or libinput_config_drag_lock_state */
-       int accel_profile;    /* -1 or libinput_config_accel_profile */
-       int middle_emu;       /* -1 or libinput_config_middle_emulation_state */
-       int dwt;              /* -1 or libinput_config_dwt_state */
-       int click_method;     /* -1 or libinput_config_click_method */
-       int send_events_mode; /* -1 or libinput_config_send_events_mode */
+       int tap_and_drag;               /* -1 or libinput_config_drag_state */
+       int drag_lock;                  /* -1 or libinput_config_drag_lock_state */
+       int accel_profile;              /* -1 or libinput_config_accel_profile */
+       int middle_emu;                 /* -1 or libinput_config_middle_emulation_state */
+       int dwt;                        /* -1 or libinput_config_dwt_state */
+       int click_method;               /* -1 or libinput_config_click_method */
+       int send_events_mode;           /* -1 or libinput_config_send_events_mode */
+       bool no_calibration_matrix;     /* false if have calibration matrix */
+       float calibration_matrix[6];    /* calibration matrix */
 };
 
 enum lab_libinput_device_type get_device_type(const char *s);

diff --git a/src/config/libinput.c b/src/config/libinput.c
index 93ab9af262361fcab1b447612ab38f22418f3763..65ee42c8bd4f416d872014cf3fe4b2589658786a 100644 (file)
--- a/src/config/libinput.c
+++ b/src/config/libinput.c
@@ -25,6 +25,7 @@ libinput_category_init(struct libinput_category *l)
        l->dwt = -1;
        l->click_method = -1;
        l->send_events_mode = -1;
+       l->no_calibration_matrix = true;
 }
 
 enum lab_libinput_device_type

diff --git a/src/config/rcxml.c b/src/config/rcxml.c
index f749821b3aa1c9b670013049cf9435a77f3b1288..83adc4f0400f8239bb9e8fb7f8404ef6f2cbee9b 100644 (file)
--- a/src/config/rcxml.c
+++ b/src/config/rcxml.c
@@ -611,6 +611,12 @@ fill_libinput_category(char *nodename, char *content)
        } else if (!strcasecmp(nodename, "sendEventsMode")) {
                current_libinput_category->send_events_mode =
                        get_send_events_mode(content);
+       } else if (!strcasecmp(nodename, "calibrationMatrix")) {
+               float *m = current_libinput_category->calibration_matrix;
+               int r = sscanf(content, "%f%f%f%f%f%f", &m[0], &m[1], &m[2], &m[3], &m[4], &m[5]);
+               if (r == 6) {
+                       current_libinput_category->no_calibration_matrix = false;
+               }
        }
 }
 

diff --git a/src/seat.c b/src/seat.c
index 8da507e7e2d11fafd799377283efe7217c1d9891..8975088600f6cb8bb57ea532495459251741c338 100644 (file)
--- a/src/seat.c
+++ b/src/seat.c
@@ -237,6 +237,14 @@ configure_libinput(struct wlr_input_device *wlr_input_device)
                wlr_log(WLR_INFO, "send events mode configured");
                libinput_device_config_send_events_set_mode(libinput_dev, dc->send_events_mode);
        }
+
+       if (libinput_device_config_calibration_has_matrix(libinput_dev) == 0
+                       || dc->no_calibration_matrix) {
+               wlr_log(WLR_INFO, "calibration matrix not configured");
+       } else {
+               wlr_log(WLR_INFO, "calibration matrix configured");
+               libinput_device_config_calibration_set_matrix(libinput_dev, dc->calibration_matrix);
+       }
 }
 
 static struct wlr_output *