Switch to categorized logging in all the input handlers

Use the rule qt.qpa.input (similarly to xcb).

In addition, evdevkeyboard supports qt.qpa.input.keymap to enable keymap
debug messages.

For compatibility, evdevtouch retains the QT_QPA_EVDEV_DEBUG environment variable,
this will simply turn on the associated logging rule.

Change-Id: Ia038beb827346d2573ca9a2b69b8dcc53adcf0eb
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Risto Avila <risto.avila@digia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>

2 files changed, 18 insertions, 43 deletions

diff --git a/src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp b/src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp
index 11db06680a..eddf180e4a 100644
--- a/src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp
+++ b/src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp
@@ -38,6 +38,7 @@
 #include <QPoint>
 #include <QGuiApplication>
 #include <QScreen>
+#include <QLoggingCategory>
 #include <qpa/qwindowsysteminterface.h>
 
 #include <qplatformdefs.h>
@@ -48,19 +49,15 @@
 #include <linux/kd.h>
 #include <linux/input.h>
 
-#include <qdebug.h>
-
-//#define QT_QPA_MOUSE_HANDLER_DEBUG
-
 #define TEST_BIT(array, bit)    (array[bit/8] & (1<<(bit%8)))
 
 QT_BEGIN_NAMESPACE
 
+Q_LOGGING_CATEGORY(qLcEvdevMouse, "qt.qpa.input")
+
 QEvdevMouseHandler *QEvdevMouseHandler::create(const QString &device, const QString &specification)
 {
-#ifdef QT_QPA_MOUSE_HANDLER_DEBUG
-    qWarning() << "Try to create mouse handler for" << device << specification;
-#endif
+    qCDebug(qLcEvdevMouse) << "create mouse handler for" << device << specification;
 
     bool compression = true;
     int jitterLimit = 0;
@@ -85,7 +82,7 @@ QEvdevMouseHandler *QEvdevMouseHandler::create(const QString &device, const QStr
         ::ioctl(fd, EVIOCGRAB, grab);
         return new QEvdevMouseHandler(device, fd, abs, compression, jitterLimit);
     } else {
-        qWarning("Cannot open mouse input device '%s': %s", qPrintable(device), strerror(errno));
+        qErrnoWarning(errno, "Cannot open mouse input device %s", qPrintable(device));
         return 0;
     }
 }
@@ -148,12 +145,10 @@ bool QEvdevMouseHandler::getHardwareMaximum()
     m_hardwareScalerX = static_cast<qreal>(m_hardwareWidth) / (g.right() - g.left());
     m_hardwareScalerY = static_cast<qreal>(m_hardwareHeight) / (g.bottom() - g.top());
 
-#ifdef QT_QPA_MOUSE_HANDLER_DEBUG
-    qDebug() << "Absolute pointing device";
-    qDebug() << "hardware max x" << m_hardwareWidth;
-    qDebug() << "hardware max y" << m_hardwareHeight;
-    qDebug() << "hardware scalers x" << m_hardwareScalerX << "y" << m_hardwareScalerY;
-#endif
+    qCDebug(qLcEvdevMouse) << "Absolute pointing device"
+                           << "hardware max x" << m_hardwareWidth
+                           << "hardware max y" << m_hardwareHeight
+                           << "hardware scalers x" << m_hardwareScalerX << "y" << m_hardwareScalerY;
 
     return true;
 }
@@ -194,11 +189,11 @@ void QEvdevMouseHandler::readMouseData()
         int result = QT_READ(m_fd, reinterpret_cast<char *>(buffer) + n, sizeof(buffer) - n);
 
         if (result == 0) {
-            qWarning("Got EOF from the input device.");
+            qWarning("evdevmouse: Got EOF from the input device");
             return;
         } else if (result < 0) {
             if (errno != EINTR && errno != EAGAIN) {
-                qWarning("Could not read from input device: %s", strerror(errno));
+                qErrnoWarning(errno, "evdevmouse: Could not read from input device");
                 return;
             }
         } else {
@@ -212,7 +207,6 @@ void QEvdevMouseHandler::readMouseData()
 
     for (int i = 0; i < n; ++i) {
         struct ::input_event *data = &buffer[i];
-        //qDebug() << ">>" << hex << data->type << data->code << dec << data->value;
         if (data->type == EV_ABS) {
             // Touchpads: store the absolute position for now, will calculate a relative one later.
             if (data->code == ABS_X && m_x != data->value) {
diff --git a/src/platformsupport/input/evdevmouse/qevdevmousemanager.cpp b/src/platformsupport/input/evdevmouse/qevdevmousemanager.cpp
index 2b52c4e995..a0c9c9f34d 100644
--- a/src/platformsupport/input/evdevmouse/qevdevmousemanager.cpp
+++ b/src/platformsupport/input/evdevmouse/qevdevmousemanager.cpp
@@ -36,16 +36,13 @@
 #include <QStringList>
 #include <QGuiApplication>
 #include <QScreen>
+#include <QLoggingCategory>
 #include <qpa/qwindowsysteminterface.h>
 
-//#define QT_QPA_MOUSEMANAGER_DEBUG
-
-#ifdef QT_QPA_MOUSEMANAGER_DEBUG
-#include <QDebug>
-#endif
-
 QT_BEGIN_NAMESPACE
 
+Q_DECLARE_LOGGING_CATEGORY(qLcEvdevMouse)
+
 QEvdevMouseManager::QEvdevMouseManager(const QString &key, const QString &specification, QObject *parent)
     : QObject(parent), m_x(0), m_y(0), m_xoffset(0), m_yoffset(0)
 {
@@ -79,10 +76,7 @@ QEvdevMouseManager::QEvdevMouseManager(const QString &key, const QString &specif
         addMouse(device);
 
     if (devices.isEmpty()) {
-#ifdef QT_QPA_MOUSEMANAGER_DEBUG
-        qWarning() << "Use device discovery";
-#endif
-
+        qCDebug(qLcEvdevMouse) << "evdevmouse: Using device discovery";
         m_deviceDiscovery = QDeviceDiscovery::create(QDeviceDiscovery::Device_Mouse | QDeviceDiscovery::Device_Touchpad, this);
         if (m_deviceDiscovery) {
             // scan and add already connected keyboards
@@ -130,28 +124,17 @@ void QEvdevMouseManager::handleMouseEvent(int x, int y, bool abs, Qt::MouseButto
     // Cannot track the keyboard modifiers ourselves here. Instead, report the
     // modifiers from the last key event that has been seen by QGuiApplication.
     QWindowSystemInterface::handleMouseEvent(0, pos, pos, buttons, QGuiApplication::keyboardModifiers());
-
-#ifdef QT_QPA_MOUSEMANAGER_DEBUG
-    qDebug("mouse event %d %d %d", pos.x(), pos.y(), int(buttons));
-#endif
 }
 
 void QEvdevMouseManager::handleWheelEvent(int delta, Qt::Orientation orientation)
 {
     QPoint pos(m_x + m_xoffset, m_y + m_yoffset);
     QWindowSystemInterface::handleWheelEvent(0, pos, pos, delta, orientation, QGuiApplication::keyboardModifiers());
-
-#ifdef QT_QPA_MOUSEMANAGER_DEBUG
-    qDebug("mouse wheel event %dx%d %d %d", pos.x(), pos.y(), delta, int(orientation));
-#endif
 }
 
 void QEvdevMouseManager::addMouse(const QString &deviceNode)
 {
-#ifdef QT_QPA_MOUSEMANAGER_DEBUG
-    qWarning() << "Adding mouse at" << deviceNode;
-#endif
-
+    qCDebug(qLcEvdevMouse) << "Adding mouse at" << deviceNode;
     QEvdevMouseHandler *handler;
     handler = QEvdevMouseHandler::create(deviceNode, m_spec);
     if (handler) {
@@ -159,16 +142,14 @@ void QEvdevMouseManager::addMouse(const QString &deviceNode)
         connect(handler, SIGNAL(handleWheelEvent(int,Qt::Orientation)), this, SLOT(handleWheelEvent(int,Qt::Orientation)));
         m_mice.insert(deviceNode, handler);
     } else {
-        qWarning("Failed to open mouse");
+        qWarning("evdevmouse: Failed to open mouse device %s", qPrintable(deviceNode));
     }
 }
 
 void QEvdevMouseManager::removeMouse(const QString &deviceNode)
 {
     if (m_mice.contains(deviceNode)) {
-#ifdef QT_QPA_MOUSEMANAGER_DEBUG
-        qWarning() << "Removing mouse at" << deviceNode;
-#endif
+        qCDebug(qLcEvdevMouse) << "Removing mouse at" << deviceNode;
         QEvdevMouseHandler *handler = m_mice.value(deviceNode);
         m_mice.remove(deviceNode);
         delete handler;