brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

backend/native: Set static seat id for headless directly

Browse Source 
This also changes the seat it for headless from seat0 to
meta-headless-seat0.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4022>
This commit is contained in:
Sebastian Wick
2024-12-16 14:57:58 +01:00
parent d42b6fd1e1
commit 86a16c3cfd
2 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/backends/native/meta-backend-native.c
View File

@ -124,26 +124,6 @@ meta_backend_native_create_clutter_backend (MetaBackend *backend,
return CLUTTER_BACKEND (meta_clutter_backend_native_new (backend, context)); 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 * static ClutterSeat *
meta_backend_native_create_default_seat (MetaBackend *backend, meta_backend_native_create_default_seat (MetaBackend *backend,
GError **error) GError **error)
@ -153,17 +133,18 @@ meta_backend_native_create_default_seat (MetaBackend *backend,
meta_backend_native_get_instance_private (backend_native); meta_backend_native_get_instance_private (backend_native);
ClutterContext *clutter_context = ClutterContext *clutter_context =
meta_backend_get_clutter_context (backend); meta_backend_get_clutter_context (backend);
MetaLauncher *launcher = meta_backend_get_launcher (backend);
const char *seat_id = NULL; const char *seat_id = NULL;
MetaSeatNativeFlag flags = META_SEAT_NATIVE_FLAG_NONE; MetaSeatNativeFlag flags = META_SEAT_NATIVE_FLAG_NONE;
switch (priv->mode) switch (priv->mode)
{ {
case META_BACKEND_NATIVE_MODE_DEFAULT: case META_BACKEND_NATIVE_MODE_DEFAULT:
seat_id = get_seat_id (backend_native); seat_id = meta_launcher_get_seat_id (launcher);
break; break;
case META_BACKEND_NATIVE_MODE_HEADLESS: case META_BACKEND_NATIVE_MODE_HEADLESS:
case META_BACKEND_NATIVE_MODE_TEST_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; flags = META_SEAT_NATIVE_FLAG_NO_LIBINPUT;
break; break;
case META_BACKEND_NATIVE_MODE_TEST_VKMS: case META_BACKEND_NATIVE_MODE_TEST_VKMS:

1
src/backends/native/meta-backend-native.h
View File

@ -28,6 +28,7 @@
#include "backends/native/meta-clutter-backend-native.h" #include "backends/native/meta-clutter-backend-native.h"
#include "backends/native/meta-kms-types.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_BACKEND_TEST_INPUT_SEAT "meta-test-seat0"
#define META_TYPE_BACKEND_NATIVE (meta_backend_native_get_type ()) #define META_TYPE_BACKEND_NATIVE (meta_backend_native_get_type ())