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

tests/monitor-unit: Test initial rotation workaround for portrait-panels

Browse Source 
There's a workaround (ec18a559c687 ("monitor-manager: Ignore
tablet-mode-switch on initial config of native portrait mode panels")) for
panels that default to portrait mode, where touch mode is disabled, but
a touchscreen is present. This workaround gets applied when we receive
the first reading from the orientation manager.

Make sure this workaround is applied as expected by adding a test for it.
The test needs to be first in the list of orientation tests, because mutter
only applies the workaround on the first orientation event it receives.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4126>
This commit is contained in:
Jonas Dreßler 2024-11-10 17:04:43 +01:00 committed by Marge Bot
parent 43cad8d68b
commit 2fdba8cfce
1 changed files with 139 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139
src/tests/monitor-unit-tests.c
View File

@ -4386,6 +4386,143 @@ input_device_test_remove (ClutterAutoRemoveInputDevice *virtual_device)
G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterAutoRemoveInputDevice,
input_device_test_remove)
static void
meta_test_monitor_orientation_initial_portrait_mode_workaround (void)
{
MonitorTestCase test_case = {
.setup = {
.modes = {
{
.width = 1080,
.height = 1920,
.refresh_rate = 60.000495910644531
}
},
.n_modes = 1,
.outputs = {
{
.crtc = 0,
.modes = { 0 },
.n_modes = 1,
.preferred_mode = 0,
.possible_crtcs = { 0 },
.n_possible_crtcs = 1,
.width_mm = 125,
.height_mm = 222,
.is_laptop_panel = TRUE,
.serial = "0x123456",
},
},
.n_outputs = 1,
.crtcs = {
{
.current_mode = 0
},
},
.n_crtcs = 1
},
.expect = {
.monitors = {
{
.outputs = { 0 },
.n_outputs = 1,
.modes = {
{
.width = 1080,
.height = 1920,
.refresh_rate = 60.000495910644531,
.crtc_modes = {
{
.output = 0,
.crtc_mode = 0
}
}
}
},
.n_modes = 1,
.current_mode = 0,
.width_mm = 125,
.height_mm = 222,
}
},
.n_monitors = 1,
.logical_monitors = {
{
.monitors = { 0 },
.n_monitors = 1,
.layout = { .x = 0, .y = 0, .width = 1080, .height = 1920 },
.scale = 1
}
},
.n_logical_monitors = 1,
.primary_logical_monitor = 0,
.n_outputs = 1,
.crtcs = {
{
.current_mode = 0,
}
},
.n_crtcs = 1,
.n_tiled_monitors = 0,
.screen_width = 1080,
.screen_height = 1920
}
};
MetaMonitorTestSetup *test_setup;
MetaBackend *backend = meta_context_get_backend (test_context);
g_autoptr (MetaSensorsProxyAutoResetMock) orientation_mock = NULL;
g_autoptr (ClutterAutoRemoveInputDevice) touch_device = NULL;
g_autoptr (ClutterAutoRemoveInputDevice) pointer_device = NULL;
ClutterBackend *clutter_backend = meta_backend_get_clutter_backend (backend);
ClutterSeat *seat = clutter_backend_get_default_seat (clutter_backend);
MetaOrientationManager *orientation_manager =
meta_backend_get_orientation_manager (backend);
g_test_message ("%s", G_STRFUNC);
orientation_mock = meta_sensors_proxy_mock_get ();
/* Add a touch device *and* a pointer device. This means a touchscreen is
* present, but touch mode is disabled. That should be enough to trigger the
* initial-orientation workaround.
*/
touch_device =
meta_backend_test_add_test_device (META_BACKEND_TEST (backend),
CLUTTER_TOUCHSCREEN_DEVICE, 1);
pointer_device =
meta_backend_test_add_test_device (META_BACKEND_TEST (backend),
CLUTTER_POINTER_DEVICE, 1);
test_setup = meta_create_monitor_test_setup (test_backend,
&test_case.setup,
MONITOR_TEST_FLAG_NO_STORED);
emulate_hotplug (test_setup);
g_assert_false (clutter_seat_get_touch_mode (seat));
meta_sensors_proxy_mock_set_orientation (orientation_mock,
META_ORIENTATION_RIGHT_UP);
meta_wait_for_orientation (orientation_manager, META_ORIENTATION_RIGHT_UP, NULL);
META_TEST_LOG_CALL ("Checking configuration per orientation",
check_monitor_configuration_per_orientation (
&test_case, 0, META_ORIENTATION_RIGHT_UP,
1080, 1920));
/* Change the orientation to portrait and the orientation change should
* now be ignored, because it's no longer the initial one.
*/
meta_sensors_proxy_mock_set_orientation (orientation_mock,
META_ORIENTATION_NORMAL);
meta_wait_for_orientation (orientation_manager, META_ORIENTATION_NORMAL, NULL);
META_TEST_LOG_CALL ("Checking configuration per orientation",
check_monitor_configuration_per_orientation (
&test_case, 0, META_ORIENTATION_RIGHT_UP,
1080, 1920));
}
static void
meta_test_monitor_orientation_is_managed (void)
{
@ -10502,6 +10639,8 @@ init_monitor_tests (void)
add_monitor_test ("/backends/monitor/has-external-monitor",
meta_test_monitor_has_external_monitor);
add_monitor_test ("/backends/monitor/orientation/initial-portrait-mode-workaround",
meta_test_monitor_orientation_initial_portrait_mode_workaround);
add_monitor_test ("/backends/monitor/orientation/is-managed",
meta_test_monitor_orientation_is_managed);
add_monitor_test ("/backends/monitor/orientation/initial-rotated",