add touchscreen stuff

taj-ny · taj-ny · commit 012bd22757bf · 2026-01-06T17:34:24.000+01:00
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -9,6 +9,7 @@ add_library(libinput-cpp STATIC
     libinput-cpp/LibinputKeyboardEvent.cpp
     libinput-cpp/LibinputPathContext.cpp
     libinput-cpp/LibinputPointerEvent.cpp
+    libinput-cpp/LibinputTouchEvent.cpp
     libinput-cpp/UdevDevice.cpp
 )
 target_link_libraries(libinput-cpp  PUBLIC
diff --git a/src/libinput-cpp/LibinputDevice.cpp b/src/libinput-cpp/LibinputDevice.cpp
@@ -48,6 +48,17 @@ QString LibinputDevice::sysName() const
     return libinput_device_get_sysname(m_device);
 }
 
+QSizeF LibinputDevice::size() const
+{
+    double width;
+    double height;
+    if (libinput_device_get_size(m_device, &width, &height)) {
+        return {};
+    }
+
+    return {width, height};
+}
+
 std::unique_ptr<UdevDevice> LibinputDevice::udevDevice() const
 {
     return std::make_unique<UdevDevice>(libinput_device_get_udev_device(m_device));
diff --git a/src/libinput-cpp/LibinputDevice.h b/src/libinput-cpp/LibinputDevice.h
@@ -18,6 +18,7 @@
 
 #pragma once
 
+#include <QSizeF>
 #include <QString>
 #include <QtClassHelperMacros>
 
@@ -47,6 +48,11 @@ class LibinputDevice
      */
     QString sysName() const;
 
+    /**
+     * @see libinput_device_get_size
+     */
+    QSizeF size() const;
+
     /**
      * @see libinput_device_get_udev_device
      */
diff --git a/src/libinput-cpp/LibinputEvent.cpp b/src/libinput-cpp/LibinputEvent.cpp
@@ -20,6 +20,7 @@
 #include "LibinputGestureEvent.h"
 #include "LibinputKeyboardEvent.h"
 #include "LibinputPointerEvent.h"
+#include "LibinputTouchEvent.h"
 
 namespace InputActions
 {
@@ -69,4 +70,14 @@ std::optional<LibinputPointerEvent> LibinputEvent::pointerEvent() const
     return LibinputPointerEvent(event);
 }
 
+std::optional<LibinputTouchEvent> LibinputEvent::touchEvent() const
+{
+    auto *event = libinput_event_get_touch_event(m_event);
+    if (!event) {
+        return {};
+    }
+
+    return LibinputTouchEvent(event);
+}
+
 }
diff --git a/src/libinput-cpp/LibinputEvent.h b/src/libinput-cpp/LibinputEvent.h
@@ -28,6 +28,7 @@ namespace InputActions
 class LibinputGestureEvent;
 class LibinputKeyboardEvent;
 class LibinputPointerEvent;
+class LibinputTouchEvent;
 
 class LibinputEvent
 {
@@ -54,6 +55,11 @@ class LibinputEvent
      * @see libinput_event_get_pointer_event
      */
     std::optional<LibinputPointerEvent> pointerEvent() const;
+    /**
+     * @return The touch event or std::nullopt if this event is not a touch event. The returned object becomes invalid when its parent is deleted.
+     * @see libinput_event_get_touch_event
+     */
+    std::optional<LibinputTouchEvent> touchEvent() const;
 
 private:
     libinput_event *m_event;
diff --git a/src/libinput-cpp/LibinputTouchEvent.cpp b/src/libinput-cpp/LibinputTouchEvent.cpp
@@ -0,0 +1,41 @@
+/*
+    libevdev-cpp - Minimal C++ libinput wrapper for InputActions
+    Copyright (C) 2026 Marcin Woźniak
+
+    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 3 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 this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+#include "LibinputTouchEvent.h"
+#include <libinput.h>
+
+namespace InputActions
+{
+
+LibinputTouchEvent::LibinputTouchEvent(libinput_event_touch *event)
+    : m_event(event)
+{
+}
+
+int32_t LibinputTouchEvent::slot() const
+{
+    return libinput_event_touch_get_slot(m_event);
+}
+
+QPointF LibinputTouchEvent::position() const
+{
+    return {libinput_event_touch_get_x(m_event), libinput_event_touch_get_y(m_event)};
+}
+
+
+}
diff --git a/src/libinput-cpp/LibinputTouchEvent.h b/src/libinput-cpp/LibinputTouchEvent.h
@@ -0,0 +1,49 @@
+/*
+    libevdev-cpp - Minimal C++ libinput wrapper for InputActions
+    Copyright (C) 2026 Marcin Woźniak
+
+    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 3 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 this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include <cstdint>
+#include <QPointF>
+
+struct libinput_event_touch;
+
+namespace InputActions
+{
+
+class LibinputTouchEvent
+{
+public:
+    LibinputTouchEvent(libinput_event_touch *event);
+
+    /**
+     * @see libinput_event_touch_get_slot
+     */
+    int32_t slot() const;
+
+    /**
+     * @see libinput_event_touch_get_x
+     * @see libinput_event_touch_get_y
+     */
+    QPointF position() const;
+
+private:
+    libinput_event_touch *m_event;
+};
+
+}

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ add_library(libinput-cpp STATIC`
`9`	`9`	`libinput-cpp/LibinputKeyboardEvent.cpp`
`10`	`10`	`libinput-cpp/LibinputPathContext.cpp`
`11`	`11`	`libinput-cpp/LibinputPointerEvent.cpp`
	`12`	`+ libinput-cpp/LibinputTouchEvent.cpp`
`12`	`13`	`libinput-cpp/UdevDevice.cpp`
`13`	`14`	`)`
`14`	`15`	`target_link_libraries(libinput-cpp PUBLIC`