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

backend/native: Rename test mode to TEST_VKMS

Browse Source 
A later commit will add another test mode mode.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3812>
This commit is contained in:
Jonas Ådahl
2024-06-14 21:58:49 +02:00
committed by Marge Bot
parent d9d2f2c06f
commit 54ba9448ed
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/backends/native/meta-backend-native-types.h
View File

@ -41,5 +41,5 @@ typedef enum _MetaBackendNativeMode
{ {
META_BACKEND_NATIVE_MODE_DEFAULT = 0, META_BACKEND_NATIVE_MODE_DEFAULT = 0,
META_BACKEND_NATIVE_MODE_HEADLESS, META_BACKEND_NATIVE_MODE_HEADLESS,
META_BACKEND_NATIVE_MODE_TEST, META_BACKEND_NATIVE_MODE_TEST_VKMS,
} MetaBackendNativeMode; } MetaBackendNativeMode;

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

@ -145,7 +145,7 @@ meta_backend_native_create_default_seat (MetaBackend *backend,
case META_BACKEND_NATIVE_MODE_HEADLESS: case META_BACKEND_NATIVE_MODE_HEADLESS:
seat_id = meta_backend_native_get_seat_id (backend_native); seat_id = meta_backend_native_get_seat_id (backend_native);
break; break;
case META_BACKEND_NATIVE_MODE_TEST: case META_BACKEND_NATIVE_MODE_TEST_VKMS:
seat_id = META_BACKEND_TEST_INPUT_SEAT; seat_id = META_BACKEND_TEST_INPUT_SEAT;
break; break;
} }
@ -342,7 +342,7 @@ 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: 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_HEADLESS: case META_BACKEND_NATIVE_MODE_HEADLESS:
return "seat0"; return "seat0";
@ -566,7 +566,7 @@ should_ignore_device (MetaBackendNative *backend_native,
case META_BACKEND_NATIVE_MODE_DEFAULT: case META_BACKEND_NATIVE_MODE_DEFAULT:
case META_BACKEND_NATIVE_MODE_HEADLESS: case META_BACKEND_NATIVE_MODE_HEADLESS:
return meta_is_udev_device_ignore (device); return meta_is_udev_device_ignore (device);
case META_BACKEND_NATIVE_MODE_TEST: case META_BACKEND_NATIVE_MODE_TEST_VKMS:
return !meta_is_udev_test_device (device); return !meta_is_udev_test_device (device);
} }
g_assert_not_reached (); g_assert_not_reached ();
@ -640,7 +640,7 @@ init_gpus (MetaBackendNative *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: case META_BACKEND_NATIVE_MODE_TEST_VKMS:
device_type = META_UDEV_DEVICE_TYPE_CARD; device_type = META_UDEV_DEVICE_TYPE_CARD;
break; break;
case META_BACKEND_NATIVE_MODE_HEADLESS: case META_BACKEND_NATIVE_MODE_HEADLESS:
@ -740,7 +740,7 @@ meta_backend_native_initable_init (GInitable *initable,
break; break;
case META_BACKEND_NATIVE_MODE_HEADLESS: case META_BACKEND_NATIVE_MODE_HEADLESS:
break; break;
case META_BACKEND_NATIVE_MODE_TEST: case META_BACKEND_NATIVE_MODE_TEST_VKMS:
session_id = "dummy"; session_id = "dummy";
seat_id = "seat0"; seat_id = "seat0";
break; break;
@ -917,7 +917,7 @@ meta_backend_native_activate_vt (MetaBackendNative *backend_native,
case META_BACKEND_NATIVE_MODE_DEFAULT: case META_BACKEND_NATIVE_MODE_DEFAULT:
return meta_launcher_activate_vt (launcher, vt, error); return meta_launcher_activate_vt (launcher, vt, error);
case META_BACKEND_NATIVE_MODE_HEADLESS: case META_BACKEND_NATIVE_MODE_HEADLESS:
case META_BACKEND_NATIVE_MODE_TEST: case META_BACKEND_NATIVE_MODE_TEST_VKMS:
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"Can't switch VT while headless"); "Can't switch VT while headless");
return FALSE; return FALSE;

2
src/tests/meta-context-test.c
View File

@ -184,7 +184,7 @@ create_native_backend (MetaContext *context,
return g_initable_new (META_TYPE_BACKEND_NATIVE, return g_initable_new (META_TYPE_BACKEND_NATIVE,
NULL, error, NULL, error,
"context", context, "context", context,
"mode", META_BACKEND_NATIVE_MODE_TEST, "mode", META_BACKEND_NATIVE_MODE_TEST_VKMS,
NULL); NULL);
} }
#endif /* HAVE_NATIVE_BACKEND */ #endif /* HAVE_NATIVE_BACKEND */