From 15d4123bd138165434c93d5de6b2cd394d1eaf0d Mon Sep 17 00:00:00 2001 From: Sebastian Wick Date: Tue, 10 Sep 2024 20:05:25 +0200 Subject: [PATCH] udev: Move from backends/native/ to backends/ This makes it possible to use udev even for backends which are not native. Specifically we want to start controling backlights in mutter which has to happen for both native and X11. Part-of: --- src/backends/{native => }/meta-udev.c | 2 +- src/backends/{native => }/meta-udev.h | 2 +- src/backends/native/meta-backend-native-private.h | 1 + src/backends/native/meta-backend-native.h | 2 +- src/backends/native/meta-kms.c | 2 +- src/backends/native/meta-renderer-native.h | 1 + src/core/meta-context-main.c | 1 + src/meson.build | 4 ++-- src/tests/native-kms-cursor-hotplug.c | 2 +- src/tests/native-kms-headless-start.c | 2 +- src/tests/native-kms-hotplug.c | 2 +- 11 files changed, 12 insertions(+), 9 deletions(-) rename src/backends/{native => }/meta-udev.c (99%) rename src/backends/{native => }/meta-udev.h (97%) diff --git a/src/backends/native/meta-udev.c b/src/backends/meta-udev.c similarity index 99% rename from src/backends/native/meta-udev.c rename to src/backends/meta-udev.c index 544394a8f..99ef66f36 100644 --- a/src/backends/native/meta-udev.c +++ b/src/backends/meta-udev.c @@ -18,7 +18,7 @@ #include "config.h" -#include "backends/native/meta-udev.h" +#include "backends/meta-udev.h" #include "backends/meta-backend-private.h" #include "backends/meta-launcher.h" diff --git a/src/backends/native/meta-udev.h b/src/backends/meta-udev.h similarity index 97% rename from src/backends/native/meta-udev.h rename to src/backends/meta-udev.h index cd445fca1..47a4fd39b 100644 --- a/src/backends/native/meta-udev.h +++ b/src/backends/meta-udev.h @@ -20,7 +20,7 @@ #include -#include "backends/native/meta-backend-native-types.h" +#include "backends/meta-backend-types.h" #include "core/util-private.h" typedef enum _MetaUdevDeviceType diff --git a/src/backends/native/meta-backend-native-private.h b/src/backends/native/meta-backend-native-private.h index c01ff1142..1a35e10cf 100644 --- a/src/backends/native/meta-backend-native-private.h +++ b/src/backends/native/meta-backend-native-private.h @@ -23,6 +23,7 @@ #pragma once #include "backends/native/meta-backend-native.h" +#include "backends/native/meta-backend-native-types.h" #include "backends/native/meta-barrier-native.h" struct _MetaBackendNativeClass diff --git a/src/backends/native/meta-backend-native.h b/src/backends/native/meta-backend-native.h index bfbd66097..315898622 100644 --- a/src/backends/native/meta-backend-native.h +++ b/src/backends/native/meta-backend-native.h @@ -24,9 +24,9 @@ #include "backends/meta-backend-private.h" #include "backends/meta-launcher.h" +#include "backends/meta-udev.h" #include "backends/native/meta-clutter-backend-native.h" #include "backends/native/meta-kms-types.h" -#include "backends/native/meta-udev.h" #define META_BACKEND_TEST_INPUT_SEAT "meta-test-seat0" diff --git a/src/backends/native/meta-kms.c b/src/backends/native/meta-kms.c index e77d101d9..fb9864b60 100644 --- a/src/backends/native/meta-kms.c +++ b/src/backends/native/meta-kms.c @@ -20,13 +20,13 @@ #include "backends/native/meta-kms-private.h" +#include "backends/meta-udev.h" #include "backends/native/meta-backend-native.h" #include "backends/native/meta-kms-cursor-manager.h" #include "backends/native/meta-kms-device-private.h" #include "backends/native/meta-kms-impl.h" #include "backends/native/meta-kms-update-private.h" #include "backends/native/meta-thread-private.h" -#include "backends/native/meta-udev.h" #include "cogl/cogl.h" #include "meta-private-enum-types.h" diff --git a/src/backends/native/meta-renderer-native.h b/src/backends/native/meta-renderer-native.h index 6c88099fc..87d7954a0 100644 --- a/src/backends/native/meta-renderer-native.h +++ b/src/backends/native/meta-renderer-native.h @@ -27,6 +27,7 @@ #include #include "backends/meta-renderer.h" +#include "backends/native/meta-backend-native-types.h" #include "backends/native/meta-gpu-kms.h" #include "backends/native/meta-monitor-manager-native.h" diff --git a/src/core/meta-context-main.c b/src/core/meta-context-main.c index 1f5a05021..0086ffe7c 100644 --- a/src/core/meta-context-main.c +++ b/src/core/meta-context-main.c @@ -42,6 +42,7 @@ #ifdef HAVE_NATIVE_BACKEND #include "backends/native/meta-backend-native.h" +#include "backends/native/meta-backend-native-types.h" #endif #if defined (HAVE_X11) && defined (HAVE_WAYLAND) diff --git a/src/meson.build b/src/meson.build index c2197ed44..dba727123 100644 --- a/src/meson.build +++ b/src/meson.build @@ -281,6 +281,8 @@ mutter_sources = [ 'backends/meta-stage-private.h', 'backends/meta-stage-view.c', 'backends/meta-stage-view-private.h', + 'backends/meta-udev.c', + 'backends/meta-udev.h', 'backends/meta-viewport-info.c', 'backends/meta-viewport-info.h', 'backends/meta-virtual-monitor.c', @@ -882,8 +884,6 @@ if have_native_backend 'backends/native/meta-thread.c', 'backends/native/meta-thread.h', 'backends/native/meta-thread-private.h', - 'backends/native/meta-udev.c', - 'backends/native/meta-udev.h', 'backends/native/meta-virtual-input-device-native.c', 'backends/native/meta-virtual-input-device-native.h', 'backends/native/meta-virtual-monitor-native.c', diff --git a/src/tests/native-kms-cursor-hotplug.c b/src/tests/native-kms-cursor-hotplug.c index 585731bf0..0b5b2c31e 100644 --- a/src/tests/native-kms-cursor-hotplug.c +++ b/src/tests/native-kms-cursor-hotplug.c @@ -19,11 +19,11 @@ #include "config.h" #include "backends/meta-monitor-config-manager.h" +#include "backends/meta-udev.h" #include "backends/meta-virtual-monitor.h" #include "backends/native/meta-backend-native.h" #include "backends/native/meta-crtc-kms.h" #include "backends/native/meta-crtc-virtual.h" -#include "backends/native/meta-udev.h" #include "core/window-private.h" #include "meta-test/meta-context-test.h" #include "meta/meta-backend.h" diff --git a/src/tests/native-kms-headless-start.c b/src/tests/native-kms-headless-start.c index 8d4d1e9a4..9f5d0b664 100644 --- a/src/tests/native-kms-headless-start.c +++ b/src/tests/native-kms-headless-start.c @@ -21,8 +21,8 @@ #include "backends/meta-logical-monitor.h" #include "backends/meta-monitor-manager-private.h" +#include "backends/meta-udev.h" #include "backends/native/meta-backend-native.h" -#include "backends/native/meta-udev.h" #include "core/display-private.h" #include "meta-test/meta-context-test.h" #include "tests/drm-mock/drm-mock.h" diff --git a/src/tests/native-kms-hotplug.c b/src/tests/native-kms-hotplug.c index 0ab24516e..9574834f0 100644 --- a/src/tests/native-kms-hotplug.c +++ b/src/tests/native-kms-hotplug.c @@ -21,9 +21,9 @@ #include "backends/meta-logical-monitor.h" #include "backends/meta-monitor-manager-private.h" +#include "backends/meta-udev.h" #include "backends/meta-virtual-monitor.h" #include "backends/native/meta-backend-native.h" -#include "backends/native/meta-udev.h" #include "meta-test/meta-context-test.h" #include "tests/drm-mock/drm-mock.h" #include "tests/meta-test-utils.h"