1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
|
From: =?utf-8?q?Jonas_=C3=85dahl?= <jadahl@gmail.com>
Date: Thu, 11 Sep 2025 14:12:05 +0200
Subject: tests/wayland: Add test for invalid geometry with subsurface
This imitates invalid Wayland protocol semantics seen done by a client
that temporarily maps subsurfaces, setting a window geometry when
creating and destroying said subsurfaces, but then when finally
committing the buffer not accompanying that commit with a new window
geometry.
Bug: https://gitlab.gnome.org/GNOME/mutter/-/issues/4310
Forwarded: https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4648
---
src/tests/wayland-test-clients/invalid-geometry.c | 23 +++++-
src/tests/wayland-unit-tests.c | 85 ++++++++++++++++++++++-
2 files changed, 105 insertions(+), 3 deletions(-)
diff --git a/src/tests/wayland-test-clients/invalid-geometry.c b/src/tests/wayland-test-clients/invalid-geometry.c
index b487730..fb83e56 100644
--- a/src/tests/wayland-test-clients/invalid-geometry.c
+++ b/src/tests/wayland-test-clients/invalid-geometry.c
@@ -45,7 +45,28 @@ main (int argc,
wl_surface_commit (surface->wl_surface);
/* Imitate a common Wayland protocol violation. */
- xdg_surface_set_window_geometry (surface->xdg_surface, 0, 0, 200, 200);
+ if (argc == 2 && g_strcmp0 (argv[1], "with-subsurface") == 0)
+ {
+ struct wl_surface *subsurface_surface;
+
+ /* A floating window hiding subsurface window decorations, while setting
+ * bogus window geometry each step.
+ */
+
+ subsurface_surface = wl_compositor_create_surface (display->compositor);
+ wl_subcompositor_get_subsurface (display->subcompositor,
+ subsurface_surface,
+ surface->wl_surface);
+ draw_surface (display, subsurface_surface, 100, 100, 0xff00ffff);
+ wl_surface_commit (subsurface_surface);
+ xdg_surface_set_window_geometry (surface->xdg_surface, 0, 0, 150, 150);
+ wl_surface_commit (surface->wl_surface);
+
+ wl_surface_attach (subsurface_surface, NULL, 0, 0);
+ wl_surface_commit (subsurface_surface);
+ }
+
+ xdg_surface_set_window_geometry (surface->xdg_surface, 0, 0, 150, 150);
wl_surface_commit (surface->wl_surface);
while (TRUE)
diff --git a/src/tests/wayland-unit-tests.c b/src/tests/wayland-unit-tests.c
index 241ffe6..889051f 100644
--- a/src/tests/wayland-unit-tests.c
+++ b/src/tests/wayland-unit-tests.c
@@ -68,6 +68,27 @@ find_client_window (const char *title)
return meta_find_client_window (test_context, title);
}
+static MetaWindow *
+map_test_window (MetaTestClient *test_client,
+ const char *script)
+{
+ MetaWindow *window;
+ GError *error = NULL;
+
+ meta_test_client_run (test_client, script);
+
+ while (!(window = meta_test_client_find_window (test_client, "1", &error)))
+ {
+ g_assert_no_error (error);
+ g_main_context_iteration (NULL, TRUE);
+ }
+ while (meta_window_is_hidden (window))
+ g_main_context_iteration (NULL, TRUE);
+ meta_wait_for_effects (window);
+
+ return window;
+}
+
static void
cursor_shape (void)
{
@@ -807,6 +828,62 @@ toplevel_invalid_geometry_basic (void)
g_test_assert_expected_messages ();
}
+static void
+toplevel_invalid_geometry_subsurface (void)
+{
+ GSettings *settings = g_settings_new ("org.gnome.mutter");
+ GError *error = NULL;
+ MetaTestClient *test_client;
+ MetaWaylandTestClient *wayland_test_client;
+ MetaWindow *window;
+ MtkRectangle rect;
+
+ g_assert_true (g_settings_set_boolean (settings, "center-new-windows", TRUE));
+
+ test_client = meta_test_client_new (test_context,
+ "1",
+ META_WINDOW_CLIENT_TYPE_WAYLAND,
+ &error);
+ g_assert_no_error (error);
+ map_test_window (test_client,
+ "create 1 csd\n"
+ "resize 1 400 400\n"
+ "show 1\n");
+
+ wayland_test_client =
+ meta_wayland_test_client_new_with_args (test_context,
+ "invalid-geometry",
+ "with-subsurface",
+ NULL);
+
+ g_test_expect_message ("libmutter", G_LOG_LEVEL_WARNING,
+ "Client provided invalid window geometry for "
+ "xdg_surface*");
+ g_test_expect_message ("libmutter", G_LOG_LEVEL_WARNING,
+ "Client provided invalid window geometry for "
+ "xdg_surface*");
+ g_test_expect_message ("libmutter", G_LOG_LEVEL_WARNING,
+ "Client provided invalid window geometry for "
+ "xdg_surface*");
+
+ while (!(window = find_client_window ("invalid-geometry")))
+ g_main_context_iteration (NULL, TRUE);
+ while (meta_window_is_hidden (window))
+ g_main_context_iteration (NULL, TRUE);
+
+ rect = meta_window_config_get_rect (window->config);
+ g_assert_cmpint (rect.width, ==, 200);
+ g_assert_cmpint (rect.height, ==, 200);
+ g_assert_cmpint (rect.x, ==, 220);
+ g_assert_cmpint (rect.y, ==, 140);
+
+ meta_wayland_test_driver_terminate (test_driver);
+ meta_wayland_test_client_finish (wayland_test_client);
+ g_test_assert_expected_messages ();
+
+ meta_test_client_destroy (test_client);
+}
+
static void
toplevel_activation (void)
{
@@ -1920,6 +1997,8 @@ init_tests (void)
toplevel_invalid_limits);
g_test_add_func ("/wayland/toplevel/invalid-geometry/basic",
toplevel_invalid_geometry_basic);
+ g_test_add_func ("/wayland/toplevel/invalid-geometry/subsurface",
+ toplevel_invalid_geometry_subsurface);
g_test_add_func ("/wayland/toplevel/activation",
toplevel_activation);
g_test_add_func ("/wayland/toplevel/sessions/basic",
@@ -1980,10 +2059,12 @@ main (int argc,
#ifdef MUTTER_PRIVILEGED_TEST
context = meta_create_test_context (META_CONTEXT_TEST_TYPE_VKMS,
- META_CONTEXT_TEST_FLAG_NO_X11);
+ META_CONTEXT_TEST_FLAG_NO_X11 |
+ META_CONTEXT_TEST_FLAG_TEST_CLIENT);
#else
context = meta_create_test_context (META_CONTEXT_TEST_TYPE_HEADLESS,
- META_CONTEXT_TEST_FLAG_NO_X11);
+ META_CONTEXT_TEST_FLAG_NO_X11 |
+ META_CONTEXT_TEST_FLAG_TEST_CLIENT);
#endif
g_assert_true (meta_context_configure (context, &argc, &argv, NULL));
meta_context_test_set_background_color (META_CONTEXT_TEST (context),
|
