1 files changed, 39 insertions, 3 deletions

diff --git a/src/platformsupport/input/libinput/qlibinputtouch.cpp b/src/platformsupport/input/libinput/qlibinputtouch.cpp
index 84a05f565e..e3a483dc84 100644
--- a/src/platformsupport/input/libinput/qlibinputtouch.cpp
+++ b/src/platformsupport/input/libinput/qlibinputtouch.cpp
@@ -14,12 +14,13 @@
 QT_BEGIN_NAMESPACE
 
 Q_DECLARE_LOGGING_CATEGORY(qLcLibInput)
+Q_LOGGING_CATEGORY(qLcLibInputEvents, "qt.qpa.input.events")
 
 QWindowSystemInterface::TouchPoint *QLibInputTouch::DeviceState::point(int32_t slot)
 {
     const int id = qMax(0, slot);
 
-    for (int i = 0; i < m_points.count(); ++i)
+    for (int i = 0; i < m_points.size(); ++i)
         if (m_points.at(i).id == id)
             return &m_points[i];
 
@@ -60,6 +61,33 @@ QPointF QLibInputTouch::getPos(libinput_event_touch *e)
     return geom.topLeft() + QPointF(x, y);
 }
 
+static void setMatrix(libinput_device *dev)
+{
+    if (libinput_device_config_calibration_has_matrix(dev)) {
+        QByteArray env = qgetenv("QT_QPA_LIBINPUT_TOUCH_MATRIX");
+        env = env.simplified();
+        if (env.size()) {
+            float matrix[6];
+            QList<QByteArray> list = env.split(' ');
+            if (list.length() != 6) {
+                qCWarning(qLcLibInput, "matrix length %lld wrong, should be 6", list.length());
+                return;
+            }
+            for (int i = 0; i < 6; i++) {
+                bool ok = true;
+                matrix[i] = list[i].toFloat(&ok);
+                if (!ok) {
+                    qCWarning(qLcLibInput, "Invalid matrix entry %d %s ", i, list[i].constData());
+                    return;
+                }
+            }
+            if (libinput_device_config_calibration_set_matrix(dev, matrix) != LIBINPUT_CONFIG_STATUS_SUCCESS)
+                qCWarning(qLcLibInput, "Failed to set libinput calibration matrix ");
+        }
+    } else {
+        qCWarning(qLcLibInput, "Touch device doesn't support matrix");
+    }
+}
 void QLibInputTouch::registerDevice(libinput_device *dev)
 {
     struct udev_device *udev_device;
@@ -91,6 +119,7 @@ void QLibInputTouch::registerDevice(libinput_device *dev)
     if (!geom.isNull())
         devPriv->setAvailableVirtualGeometry(geom);
     QWindowSystemInterface::registerInputDevice(td);
+    setMatrix(dev);
 }
 
 void QLibInputTouch::unregisterDevice(libinput_device *dev)
@@ -113,6 +142,7 @@ void QLibInputTouch::processTouchDown(libinput_event_touch *e)
         newTp.area = QRect(0, 0, 8, 8);
         newTp.area.moveCenter(getPos(e));
         state->m_points.append(newTp);
+        qCDebug(qLcLibInputEvents) << "touch down" << newTp;
     }
 }
 
@@ -132,6 +162,7 @@ void QLibInputTouch::processTouchMotion(libinput_event_touch *e)
         // Handle this by compressing and keeping the Pressed state until the 'frame'.
         if (tp->state != QEventPoint::State::Pressed && tp->state != QEventPoint::State::Released)
             tp->state = tmpState;
+        qCDebug(qLcLibInputEvents) << "touch move" << tp;
     } else {
         qWarning("Inconsistent touch state (got 'motion' without 'down')");
     }
@@ -146,10 +177,13 @@ void QLibInputTouch::processTouchUp(libinput_event_touch *e)
         tp->state = QEventPoint::State::Released;
         // There may not be a Frame event after the last Up. Work this around.
         QEventPoint::States s;
-        for (int i = 0; i < state->m_points.count(); ++i)
+        for (int i = 0; i < state->m_points.size(); ++i)
             s |= state->m_points.at(i).state;
+        qCDebug(qLcLibInputEvents) << "touch up" << s << tp;
         if (s == QEventPoint::State::Released)
             processTouchFrame(e);
+        else
+            qCDebug(qLcLibInputEvents, "waiting for all points to be released");
     } else {
         qWarning("Inconsistent touch state (got 'up' without 'down')");
     }
@@ -158,6 +192,7 @@ void QLibInputTouch::processTouchUp(libinput_event_touch *e)
 void QLibInputTouch::processTouchCancel(libinput_event_touch *e)
 {
     DeviceState *state = deviceState(e);
+    qCDebug(qLcLibInputEvents) << "touch cancel" << state->m_points;
     if (state->m_touchDevice)
         QWindowSystemInterface::handleTouchCancelEvent(nullptr, state->m_touchDevice, QGuiApplication::keyboardModifiers());
     else
@@ -171,13 +206,14 @@ void QLibInputTouch::processTouchFrame(libinput_event_touch *e)
         qWarning("TouchFrame without registered device");
         return;
     }
+    qCDebug(qLcLibInputEvents) << "touch frame" << state->m_points;
     if (state->m_points.isEmpty())
         return;
 
     QWindowSystemInterface::handleTouchEvent(nullptr, state->m_touchDevice, state->m_points,
                                              QGuiApplication::keyboardModifiers());
 
-    for (int i = 0; i < state->m_points.count(); ++i) {
+    for (int i = 0; i < state->m_points.size(); ++i) {
         QWindowSystemInterface::TouchPoint &tp(state->m_points[i]);
         if (tp.state == QEventPoint::State::Released)
             state->m_points.removeAt(i--);