Move input backends in their own directory

autotests/libinput/CMakeLists.txt

@@ -1,6 +1,6 @@
 include_directories(${Libinput_INCLUDE_DIRS})
 
-add_library(LibInputTestObjects STATIC ../../src/libinput/device.cpp ../../src/libinput/events.cpp ../../src/inputdevice.cpp mock_libinput.cpp)
+add_library(LibInputTestObjects STATIC ../../src/backends/libinput/device.cpp ../../src/backends/libinput/events.cpp ../../src/inputdevice.cpp mock_libinput.cpp)
 target_link_libraries(LibInputTestObjects Qt::Test Qt::Widgets Qt::DBus Qt::Gui KF5::ConfigCore)
 target_include_directories(LibInputTestObjects PUBLIC ${CMAKE_SOURCE_DIR}/src)
 

autotests/libinput/device_test.cpp

@@ -7,7 +7,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 #include "mock_libinput.h"
-#include "libinput/device.h"
+#include "backends/libinput/device.h"
 #include <config-kwin.h>
 
 #include <KSharedConfig>

autotests/libinput/gesture_event_test.cpp

@@ -8,8 +8,8 @@
 */
 #include "mock_libinput.h"
 
-#include "libinput/device.h"
-#include "libinput/events.h"
+#include "backends/libinput/device.h"
+#include "backends/libinput/events.h"
 
 #include <QtTest>
 

autotests/libinput/input_event_test.cpp

@@ -8,7 +8,7 @@
 */
 #include "mock_libinput.h"
 
-#include "libinput/device.h"
+#include "backends/libinput/device.h"
 #include "input_event.h"
 
 #include <QtTest>

autotests/libinput/key_event_test.cpp

@@ -8,8 +8,8 @@
 */
 #include "mock_libinput.h"
 
-#include "libinput/device.h"
-#include "libinput/events.h"
+#include "backends/libinput/device.h"
+#include "backends/libinput/events.h"
 
 #include <QtTest>
 

autotests/libinput/pointer_event_test.cpp

@@ -8,8 +8,8 @@
 */
 #include "mock_libinput.h"
 
-#include "libinput/device.h"
-#include "libinput/events.h"
+#include "backends/libinput/device.h"
+#include "backends/libinput/events.h"
 
 #include <QtTest>
 

autotests/libinput/switch_event_test.cpp

@@ -8,8 +8,8 @@
 */
 #include "mock_libinput.h"
 
-#include "libinput/device.h"
-#include "libinput/events.h"
+#include "backends/libinput/device.h"
+#include "backends/libinput/events.h"
 
 #include <QtTest>
 

autotests/libinput/touch_event_test.cpp

@@ -8,8 +8,8 @@
 */
 #include "mock_libinput.h"
 
-#include "libinput/device.h"
-#include "libinput/events.h"
+#include "backends/libinput/device.h"
+#include "backends/libinput/events.h"
 
 #include <QtTest>
 

src/CMakeLists.txt

@@ -46,8 +46,6 @@ set(kwin_SRCS
     effects.cpp
     egl_context_attribute_builder.cpp
     events.cpp
-    fakeinput/fakeinputbackend.cpp
-    fakeinput/fakeinputdevice.cpp
     focuschain.cpp
     ftrace.cpp
     geometrytip.cpp
@@ -73,12 +71,6 @@ set(kwin_SRCS
     layers.cpp
     layershellv1client.cpp
     layershellv1integration.cpp
-    libinput/connection.cpp
-    libinput/context.cpp
-    libinput/device.cpp
-    libinput/events.cpp
-    libinput/libinput_logging.cpp
-    libinput/libinputbackend.cpp
     linux_dmabuf.cpp
     main.cpp
     modifier_only_shortcuts.cpp
@@ -229,7 +221,6 @@ target_link_libraries(kwin
     XCB::XCB
     XCB::XFIXES
 
-    Libinput::Libinput
     UDev::UDev
     XKB::XKB
     Qt5::XkbCommonSupportPrivate
@@ -238,6 +229,8 @@ target_link_libraries(kwin
     Threads::Threads
 )
 
+add_subdirectory(backends)
+
 if (KWIN_BUILD_CMS)
     target_sources(kwin PRIVATE
         colordevice.cpp

src/backends/CMakeLists.txt

@@ -0,0 +1,2 @@
+add_subdirectory(fakeinput)
+add_subdirectory(libinput)

src/backends/fakeinput/CMakeLists.txt

@@ -0,0 +1,4 @@
+target_sources(kwin PRIVATE
+    fakeinputbackend.cpp
+    fakeinputdevice.cpp
+)

src/backends/libinput/CMakeLists.txt

@@ -0,0 +1,9 @@
+target_sources(kwin PRIVATE
+    connection.cpp
+    context.cpp
+    device.cpp
+    events.cpp
+    libinput_logging.cpp
+    libinputbackend.cpp
+)
+target_link_libraries(kwin Libinput::Libinput)

src/input.cpp

@@ -9,8 +9,10 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 #include "input.h"
+#include "backends/fakeinput/fakeinputbackend.h"
+#include "backends/libinput/connection.h"
+#include "backends/libinput/device.h"
 #include "effects.h"
-#include "fakeinput/fakeinputbackend.h"
 #include "gestures.h"
 #include "globalshortcuts.h"
 #include "input_event.h"
@@ -28,8 +30,6 @@
 #include "tabbox/tabbox.h"
 #endif
 #include "internal_client.h"
-#include "libinput/connection.h"
-#include "libinput/device.h"
 #include "platform.h"
 #include "popup_input_filter.h"
 #include "screenedge.h"

src/plugins/platforms/drm/drm_backend.cpp

@@ -7,6 +7,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 #include "drm_backend.h"
+#include "backends/libinput/libinputbackend.h"
 #include <config-kwin.h>
 #include "drm_output.h"
 #include "drm_object_connector.h"
@@ -14,7 +15,6 @@
 #include "drm_object_plane.h"
 #include "composite.h"
 #include "cursor.h"
-#include "libinput/libinputbackend.h"
 #include "logging.h"
 #include "main.h"
 #include "renderloop.h"

src/plugins/platforms/fbdev/fb_backend.cpp

@@ -8,8 +8,8 @@
 */
 #include "fb_backend.h"
 
+#include "backends/libinput/libinputbackend.h"
 #include "composite.h"
-#include "libinput/libinputbackend.h"
 #include "logging.h"
 #include "main.h"
 #include "platform.h"