From 6bbb04bbf4295422f7301ccd6e7c890aa128e86e Mon Sep 17 00:00:00 2001 From: Sebastian Wick Date: Thu, 4 Jul 2024 00:25:36 +0200 Subject: [PATCH] Revert "backend/native: Let get_seat_id() handle all modes" This reverts commit a3082b8eb35fffbb4c23f7794414a58c14708177. We don't find the VKMS device with this commit because it is on seat0 and not on META_BACKEND_TEST_INPUT_SEAT. The other way around, i.e. returning seat0 in all cases also doesn't work because *something* hangs if the default seat referrs to the real seat0 instead of the nonesense META_BACKEND_TEST_INPUT_SEAT. Part-of: --- src/backends/native/meta-backend-native.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/backends/native/meta-backend-native.c b/src/backends/native/meta-backend-native.c index 6f5a4ecde..c57bea944 100644 --- a/src/backends/native/meta-backend-native.c +++ b/src/backends/native/meta-backend-native.c @@ -134,10 +134,22 @@ meta_backend_native_create_default_seat (MetaBackend *backend, GError **error) { MetaBackendNative *backend_native = META_BACKEND_NATIVE (backend); - const char *seat_id; + MetaBackendNativePrivate *priv = + meta_backend_native_get_instance_private (backend_native); + const char *seat_id = NULL; MetaSeatNativeFlag flags; - seat_id = meta_backend_native_get_seat_id (backend_native); + switch (priv->mode) + { + case META_BACKEND_NATIVE_MODE_DEFAULT: + case META_BACKEND_NATIVE_MODE_HEADLESS: + case META_BACKEND_NATIVE_MODE_TEST_HEADLESS: + seat_id = meta_backend_native_get_seat_id (backend_native); + break; + case META_BACKEND_NATIVE_MODE_TEST_VKMS: + seat_id = META_BACKEND_TEST_INPUT_SEAT; + break; + } if (meta_backend_is_headless (backend)) flags = META_SEAT_NATIVE_FLAG_NO_LIBINPUT; @@ -332,9 +344,8 @@ meta_backend_native_get_seat_id (MetaBackendNative *backend_native) switch (priv->mode) { case META_BACKEND_NATIVE_MODE_DEFAULT: - return meta_launcher_get_seat_id (priv->launcher); case META_BACKEND_NATIVE_MODE_TEST_VKMS: - return META_BACKEND_TEST_INPUT_SEAT; + return meta_launcher_get_seat_id (priv->launcher); case META_BACKEND_NATIVE_MODE_HEADLESS: case META_BACKEND_NATIVE_MODE_TEST_HEADLESS: return "seat0";