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

backend/native: Let get_seat_id() handle all modes

Browse Source 
Instead of having get_seat_id() handle most cases, and then special
casing another case outside of it, let it handle them all, making all
users just able to call get_seat_id().

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3812>
This commit is contained in:
Jonas Ådahl 2024-06-18 15:02:17 +02:00 committed by Marge Bot
parent 16efcd4f9a
commit a3082b8eb3
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -134,22 +134,10 @@ meta_backend_native_create_default_seat (MetaBackend *backend,
GError **error) GError **error)
{ {
MetaBackendNative *backend_native = META_BACKEND_NATIVE (backend); MetaBackendNative *backend_native = META_BACKEND_NATIVE (backend);
MetaBackendNativePrivate *priv = const char *seat_id;
meta_backend_native_get_instance_private (backend_native);
const char *seat_id = NULL;
MetaSeatNativeFlag flags; MetaSeatNativeFlag flags;
switch (priv->mode) seat_id = meta_backend_native_get_seat_id (backend_native);
{
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)) if (meta_backend_is_headless (backend))
flags = META_SEAT_NATIVE_FLAG_NO_LIBINPUT; flags = META_SEAT_NATIVE_FLAG_NO_LIBINPUT;
@ -344,8 +332,9 @@ meta_backend_native_get_seat_id (MetaBackendNative *backend_native)
switch (priv->mode) switch (priv->mode)
{ {
case META_BACKEND_NATIVE_MODE_DEFAULT: case META_BACKEND_NATIVE_MODE_DEFAULT:
case META_BACKEND_NATIVE_MODE_TEST_VKMS:
return meta_launcher_get_seat_id (priv->launcher); return meta_launcher_get_seat_id (priv->launcher);
case META_BACKEND_NATIVE_MODE_TEST_VKMS:
return META_BACKEND_TEST_INPUT_SEAT;
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:
return "seat0"; return "seat0";