diff --git a/src/backends/native/meta-backend-native.c b/src/backends/native/meta-backend-native.c index 20abf9186..812811f6d 100644 --- a/src/backends/native/meta-backend-native.c +++ b/src/backends/native/meta-backend-native.c @@ -124,26 +124,6 @@ meta_backend_native_create_clutter_backend (MetaBackend *backend, return CLUTTER_BACKEND (meta_clutter_backend_native_new (backend, context)); } -static const char * -get_seat_id (MetaBackendNative *backend_native) -{ - MetaBackendNativePrivate *priv = - meta_backend_native_get_instance_private (backend_native); - MetaLauncher *launcher = - meta_backend_get_launcher (META_BACKEND (backend_native)); - - switch (priv->mode) - { - case META_BACKEND_NATIVE_MODE_DEFAULT: - case META_BACKEND_NATIVE_MODE_TEST_VKMS: - return meta_launcher_get_seat_id (launcher); - case META_BACKEND_NATIVE_MODE_HEADLESS: - case META_BACKEND_NATIVE_MODE_TEST_HEADLESS: - return "seat0"; - } - g_assert_not_reached (); -} - static ClutterSeat * meta_backend_native_create_default_seat (MetaBackend *backend, GError **error) @@ -153,17 +133,18 @@ meta_backend_native_create_default_seat (MetaBackend *backend, meta_backend_native_get_instance_private (backend_native); ClutterContext *clutter_context = meta_backend_get_clutter_context (backend); + MetaLauncher *launcher = meta_backend_get_launcher (backend); const char *seat_id = NULL; MetaSeatNativeFlag flags = META_SEAT_NATIVE_FLAG_NONE; switch (priv->mode) { case META_BACKEND_NATIVE_MODE_DEFAULT: - seat_id = get_seat_id (backend_native); + seat_id = meta_launcher_get_seat_id (launcher); break; case META_BACKEND_NATIVE_MODE_HEADLESS: case META_BACKEND_NATIVE_MODE_TEST_HEADLESS: - seat_id = get_seat_id (backend_native); + seat_id = META_BACKEND_HEADLESS_INPUT_SEAT; flags = META_SEAT_NATIVE_FLAG_NO_LIBINPUT; break; case META_BACKEND_NATIVE_MODE_TEST_VKMS: diff --git a/src/backends/native/meta-backend-native.h b/src/backends/native/meta-backend-native.h index 00ff86419..19e14f933 100644 --- a/src/backends/native/meta-backend-native.h +++ b/src/backends/native/meta-backend-native.h @@ -28,6 +28,7 @@ #include "backends/native/meta-clutter-backend-native.h" #include "backends/native/meta-kms-types.h" +#define META_BACKEND_HEADLESS_INPUT_SEAT "meta-headless-seat0" #define META_BACKEND_TEST_INPUT_SEAT "meta-test-seat0" #define META_TYPE_BACKEND_NATIVE (meta_backend_native_get_type ())