1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libinput: Allow setting touchscreen matrix via env var

Browse Source 
[ChangeLog][QtGui][libinput] The environment variable
QT_QPA_LIBINPUT_TOUCH_MATRIX now can be set with a string of 6
space-separated numbers to set the touchscreen transformation matrix.
See docs for libinput_device_config_calibration_set_matrix()

Fixes: QTBUG-68698
Change-Id: I72ba94e1ee6d39d31d1689ce6ce85fa8e676ff13
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
This commit is contained in:
Shawn Rutledge 2022-04-13 13:39:19 +02:00
parent a35f57d429
commit 3941fe697b
1 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/platformsupport/input/libinput/qlibinputtouch.cpp
View File

@ -61,6 +61,33 @@ QPointF QLibInputTouch::getPos(libinput_event_touch *e)
return geom.topLeft() + QPointF(x, y); 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) void QLibInputTouch::registerDevice(libinput_device *dev)
{ {
struct udev_device *udev_device; struct udev_device *udev_device;
@ -92,6 +119,7 @@ void QLibInputTouch::registerDevice(libinput_device *dev)
if (!geom.isNull()) if (!geom.isNull())
devPriv->setAvailableVirtualGeometry(geom); devPriv->setAvailableVirtualGeometry(geom);
QWindowSystemInterface::registerInputDevice(td); QWindowSystemInterface::registerInputDevice(td);
setMatrix(dev);
} }
void QLibInputTouch::unregisterDevice(libinput_device *dev) void QLibInputTouch::unregisterDevice(libinput_device *dev)