[mutter] tests: Add test for setting min/max wayland toplevel limits
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] tests: Add test for setting min/max wayland toplevel limits
- Date: Tue, 6 Jul 2021 10:05:52 +0000 (UTC)
commit 258b85a5a7e096dc2dbc3ab86098333ee5cf94b0
Author: Christian Rauch <Rauch Christian gmx de>
Date: Fri Jun 18 22:51:39 2021 +0100
tests: Add test for setting min/max wayland toplevel limits
Fixes: https://gitlab.gnome.org/GNOME/mutter/-/issues/1716
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1795>
src/tests/wayland-test-clients/meson.build | 1 +
src/tests/wayland-test-clients/xdg-apply-limits.c | 408 ++++++++++++++++++++++
src/tests/wayland-unit-tests.c | 88 +++++
3 files changed, 497 insertions(+)
---
diff --git a/src/tests/wayland-test-clients/meson.build b/src/tests/wayland-test-clients/meson.build
index 5646493430..551a0d9468 100644
--- a/src/tests/wayland-test-clients/meson.build
+++ b/src/tests/wayland-test-clients/meson.build
@@ -49,6 +49,7 @@ wayland_test_clients = [
'subsurface-remap-toplevel',
'invalid-subsurfaces',
'invalid-xdg-shell-actions',
+ 'xdg-apply-limits',
]
foreach test : wayland_test_clients
diff --git a/src/tests/wayland-test-clients/xdg-apply-limits.c
b/src/tests/wayland-test-clients/xdg-apply-limits.c
new file mode 100644
index 0000000000..aa5ab6e70e
--- /dev/null
+++ b/src/tests/wayland-test-clients/xdg-apply-limits.c
@@ -0,0 +1,408 @@
+/*
+ * Copyright (C) 2021 Christian Rauch
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <glib.h>
+#include <sys/mman.h>
+#include <unistd.h>
+#include <wayland-client.h>
+
+#include "wayland-test-client-utils.h"
+
+#include "test-driver-client-protocol.h"
+#include "xdg-shell-client-protocol.h"
+
+typedef enum _State
+{
+ STATE_INIT = 0,
+ STATE_WAIT_FOR_CONFIGURE_1,
+ STATE_WAIT_FOR_FRAME_1,
+ STATE_WAIT_FOR_ACTOR_DESTROYED,
+ STATE_WAIT_FOR_CONFIGURE_2,
+ STATE_WAIT_FOR_FRAME_2
+} State;
+
+static struct wl_display *display;
+static struct wl_registry *registry;
+static struct wl_compositor *compositor;
+static struct wl_subcompositor *subcompositor;
+static struct xdg_wm_base *xdg_wm_base;
+static struct wl_shm *shm;
+static struct test_driver *test_driver;
+
+static struct wl_surface *surface;
+static struct xdg_surface *xdg_surface;
+static struct xdg_toplevel *xdg_toplevel;
+
+static struct wl_surface *subsurface_surface;
+static struct wl_subsurface *subsurface;
+
+static struct wl_callback *frame_callback;
+
+static gboolean running;
+
+static State state;
+
+static void
+init_surface (void)
+{
+ xdg_toplevel_set_title (xdg_toplevel, "toplevel-limits-test");
+ wl_surface_commit (surface);
+}
+
+static void
+actor_destroyed (void *data,
+ struct wl_callback *callback,
+ uint32_t serial)
+{
+ g_assert_cmpint (state, ==, STATE_WAIT_FOR_ACTOR_DESTROYED);
+
+ init_surface ();
+ state = STATE_WAIT_FOR_CONFIGURE_2;
+
+ wl_callback_destroy (callback);
+}
+
+static const struct wl_callback_listener actor_destroy_listener = {
+ actor_destroyed,
+};
+
+static void
+reset_surface (void)
+{
+ struct wl_callback *callback;
+
+ if (test_driver)
+ {
+ callback = test_driver_sync_actor_destroyed (test_driver, surface);
+ wl_callback_add_listener (callback, &actor_destroy_listener, NULL);
+ }
+
+ wl_surface_attach (surface, NULL, 0, 0);
+ wl_surface_commit (surface);
+
+ state = STATE_WAIT_FOR_ACTOR_DESTROYED;
+}
+
+static void
+handle_buffer_release (void *data,
+ struct wl_buffer *buffer)
+{
+ wl_buffer_destroy (buffer);
+}
+
+static const struct wl_buffer_listener buffer_listener = {
+ handle_buffer_release
+};
+
+static gboolean
+create_shm_buffer (int width,
+ int height,
+ struct wl_buffer **out_buffer,
+ void **out_data,
+ int *out_size)
+{
+ struct wl_shm_pool *pool;
+ static struct wl_buffer *buffer;
+ int fd, size, stride;
+ int bytes_per_pixel;
+ void *data;
+
+ bytes_per_pixel = 4;
+ stride = width * bytes_per_pixel;
+ size = stride * height;
+
+ fd = create_anonymous_file (size);
+ if (fd < 0)
+ {
+ fprintf (stderr, "Creating a buffer file for %d B failed: %m\n",
+ size);
+ return FALSE;
+ }
+
+ data = mmap (NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
+ if (data == MAP_FAILED)
+ {
+ fprintf (stderr, "mmap failed: %m\n");
+ close (fd);
+ return FALSE;
+ }
+
+ pool = wl_shm_create_pool (shm, fd, size);
+ buffer = wl_shm_pool_create_buffer (pool, 0,
+ width, height,
+ stride,
+ WL_SHM_FORMAT_ARGB8888);
+ wl_buffer_add_listener (buffer, &buffer_listener, buffer);
+ wl_shm_pool_destroy (pool);
+ close (fd);
+
+ *out_buffer = buffer;
+ *out_data = data;
+ *out_size = size;
+
+ return TRUE;
+}
+
+static void
+fill (void *buffer_data,
+ int width,
+ int height,
+ uint32_t color)
+{
+ uint32_t *pixels = buffer_data;
+ int x, y;
+
+ for (y = 0; y < height; y++)
+ {
+ for (x = 0; x < width; x++)
+ pixels[y * width + x] = color;
+ }
+}
+
+static void
+draw (struct wl_surface *surface,
+ int width,
+ int height,
+ uint32_t color)
+{
+ struct wl_buffer *buffer;
+ void *buffer_data;
+ int size;
+
+ if (!create_shm_buffer (width, height,
+ &buffer, &buffer_data, &size))
+ g_error ("Failed to create shm buffer");
+
+ fill (buffer_data, width, height, color);
+
+ wl_surface_attach (surface, buffer, 0, 0);
+}
+
+static void
+draw_main (void)
+{
+ draw (surface, 700, 500, 0xff00ff00);
+}
+
+static void
+draw_subsurface (void)
+{
+ draw (subsurface_surface, 500, 300, 0xff007f00);
+}
+
+static void
+handle_xdg_toplevel_configure (void *data,
+ struct xdg_toplevel *xdg_toplevel,
+ int32_t width,
+ int32_t height,
+ struct wl_array *state)
+{
+}
+
+static void
+handle_xdg_toplevel_close(void *data,
+ struct xdg_toplevel *xdg_toplevel)
+{
+ g_assert_not_reached ();
+}
+
+static const struct xdg_toplevel_listener xdg_toplevel_listener = {
+ handle_xdg_toplevel_configure,
+ handle_xdg_toplevel_close,
+};
+
+static void
+handle_frame_callback (void *data,
+ struct wl_callback *callback,
+ uint32_t time)
+{
+ switch (state)
+ {
+ case STATE_WAIT_FOR_FRAME_1:
+ reset_surface ();
+ test_driver_sync_point (test_driver, 1);
+ break;
+ case STATE_WAIT_FOR_FRAME_2:
+ exit (EXIT_SUCCESS);
+ case STATE_INIT:
+ g_assert_not_reached ();
+ case STATE_WAIT_FOR_CONFIGURE_1:
+ g_assert_not_reached ();
+ case STATE_WAIT_FOR_ACTOR_DESTROYED:
+ g_assert_not_reached ();
+ case STATE_WAIT_FOR_CONFIGURE_2:
+ g_assert_not_reached ();
+ }
+}
+
+static const struct wl_callback_listener frame_listener = {
+ handle_frame_callback,
+};
+
+static void
+handle_xdg_surface_configure (void *data,
+ struct xdg_surface *xdg_surface,
+ uint32_t serial)
+{
+ switch (state)
+ {
+ case STATE_INIT:
+ g_assert_not_reached ();
+ case STATE_WAIT_FOR_CONFIGURE_1:
+ draw_main ();
+ state = STATE_WAIT_FOR_FRAME_1;
+ break;
+ case STATE_WAIT_FOR_CONFIGURE_2:
+ draw_main ();
+ state = STATE_WAIT_FOR_FRAME_2;
+ break;
+ case STATE_WAIT_FOR_ACTOR_DESTROYED:
+ g_assert_not_reached ();
+ case STATE_WAIT_FOR_FRAME_1:
+ case STATE_WAIT_FOR_FRAME_2:
+ /* ignore */
+ return;
+ }
+
+ xdg_surface_ack_configure (xdg_surface, serial);
+ frame_callback = wl_surface_frame (surface);
+ wl_callback_add_listener (frame_callback, &frame_listener, NULL);
+ wl_surface_commit (surface);
+ wl_display_flush (display);
+}
+
+static const struct xdg_surface_listener xdg_surface_listener = {
+ handle_xdg_surface_configure,
+};
+
+static void
+handle_xdg_wm_base_ping (void *data,
+ struct xdg_wm_base *xdg_wm_base,
+ uint32_t serial)
+{
+ xdg_wm_base_pong (xdg_wm_base, serial);
+}
+
+static const struct xdg_wm_base_listener xdg_wm_base_listener = {
+ handle_xdg_wm_base_ping,
+};
+
+static void
+handle_registry_global (void *data,
+ struct wl_registry *registry,
+ uint32_t id,
+ const char *interface,
+ uint32_t version)
+{
+ if (strcmp (interface, "wl_compositor") == 0)
+ {
+ compositor = wl_registry_bind (registry, id, &wl_compositor_interface, 1);
+ }
+ else if (strcmp (interface, "wl_subcompositor") == 0)
+ {
+ subcompositor = wl_registry_bind (registry,
+ id, &wl_subcompositor_interface, 1);
+ }
+ else if (strcmp (interface, "xdg_wm_base") == 0)
+ {
+ xdg_wm_base = wl_registry_bind (registry, id,
+ &xdg_wm_base_interface, 1);
+ xdg_wm_base_add_listener (xdg_wm_base, &xdg_wm_base_listener, NULL);
+ }
+ else if (strcmp (interface, "wl_shm") == 0)
+ {
+ shm = wl_registry_bind (registry,
+ id, &wl_shm_interface, 1);
+ }
+ else if (strcmp (interface, "test_driver") == 0)
+ {
+ test_driver = wl_registry_bind (registry, id, &test_driver_interface, 1);
+ }
+}
+
+static void
+handle_registry_global_remove (void *data,
+ struct wl_registry *registry,
+ uint32_t name)
+{
+}
+
+static const struct wl_registry_listener registry_listener = {
+ handle_registry_global,
+ handle_registry_global_remove
+};
+
+int
+main (int argc,
+ char **argv)
+{
+ display = wl_display_connect (NULL);
+ registry = wl_display_get_registry (display);
+ wl_registry_add_listener (registry, ®istry_listener, NULL);
+ wl_display_roundtrip (display);
+
+ if (!shm)
+ {
+ fprintf (stderr, "No wl_shm global\n");
+ return EXIT_FAILURE;
+ }
+
+ if (!xdg_wm_base)
+ {
+ fprintf (stderr, "No xdg_wm_base global\n");
+ return EXIT_FAILURE;
+ }
+
+ wl_display_roundtrip (display);
+
+ // g_assert_nonnull (test_driver);
+
+ surface = wl_compositor_create_surface (compositor);
+ xdg_surface = xdg_wm_base_get_xdg_surface (xdg_wm_base, surface);
+ xdg_surface_add_listener (xdg_surface, &xdg_surface_listener, NULL);
+ xdg_toplevel = xdg_surface_get_toplevel (xdg_surface);
+ xdg_toplevel_add_listener (xdg_toplevel, &xdg_toplevel_listener, NULL);
+
+ subsurface_surface = wl_compositor_create_surface (compositor);
+ subsurface = wl_subcompositor_get_subsurface (subcompositor,
+ subsurface_surface,
+ surface);
+ wl_subsurface_set_position (subsurface, 100, 100);
+ draw_subsurface ();
+ wl_surface_commit (subsurface_surface);
+
+ init_surface ();
+ state = STATE_WAIT_FOR_CONFIGURE_1;
+
+ /* set minimum and maximum size and commit */
+ xdg_toplevel_set_min_size(xdg_toplevel, 700, 500);
+ xdg_toplevel_set_max_size(xdg_toplevel, 700, 500);
+ wl_surface_commit (surface);
+
+ test_driver_sync_point (test_driver, 0);
+
+ running = TRUE;
+ while (running)
+ {
+ if (wl_display_dispatch (display) == -1)
+ return EXIT_FAILURE;
+ }
+
+ return EXIT_SUCCESS;
+}
diff --git a/src/tests/wayland-unit-tests.c b/src/tests/wayland-unit-tests.c
index f8e6508d98..98c2d905ad 100644
--- a/src/tests/wayland-unit-tests.c
+++ b/src/tests/wayland-unit-tests.c
@@ -21,6 +21,8 @@
#include <gio/gio.h>
+#include "core/display-private.h"
+#include "core/window-private.h"
#include "tests/meta-wayland-test-driver.h"
#include "wayland/meta-wayland.h"
#include "wayland/meta-wayland-surface.h"
@@ -118,6 +120,25 @@ wayland_test_client_finish (WaylandTestClient *wayland_test_client)
g_free (wayland_test_client);
}
+static MetaWindow *
+find_client_window (const char *title)
+{
+ MetaDisplay *display = meta_get_display ();
+ g_autoptr (GSList) windows = NULL;
+ GSList *l;
+
+ windows = meta_display_list_windows (display, META_LIST_DEFAULT);
+ for (l = windows; l; l = l->next)
+ {
+ MetaWindow *window = l->data;
+
+ if (g_strcmp0 (meta_window_get_title (window), title) == 0)
+ return window;
+ }
+
+ return NULL;
+}
+
static void
subsurface_remap_toplevel (void)
{
@@ -153,6 +174,71 @@ subsurface_invalid_xdg_shell_actions (void)
g_test_assert_expected_messages ();
}
+typedef enum _ApplyLimitState
+{
+ APPLY_LIMIT_STATE_INIT,
+ APPLY_LIMIT_STATE_RESET,
+ APPLY_LIMIT_STATE_FINISH,
+} ApplyLimitState;
+
+typedef struct _ApplyLimitData
+{
+ GMainLoop *loop;
+ WaylandTestClient *wayland_test_client;
+ ApplyLimitState state;
+} ApplyLimitData;
+
+static void
+on_sync_point (MetaWaylandTestDriver *test_driver,
+ unsigned int sequence,
+ struct wl_client *wl_client,
+ ApplyLimitData *data)
+{
+ MetaWindow *window;
+
+ if (sequence == 0)
+ g_assert (data->state == APPLY_LIMIT_STATE_INIT);
+ else if (sequence == 0)
+ g_assert (data->state == APPLY_LIMIT_STATE_RESET);
+
+ window = find_client_window ("toplevel-limits-test");
+
+ if (sequence == 0)
+ {
+ g_assert_nonnull (window);
+ g_assert_cmpint (window->size_hints.max_width, ==, 700);
+ g_assert_cmpint (window->size_hints.max_height, ==, 500);
+ g_assert_cmpint (window->size_hints.min_width, ==, 700);
+ g_assert_cmpint (window->size_hints.min_height, ==, 500);
+
+ data->state = APPLY_LIMIT_STATE_RESET;
+ }
+ else if (sequence == 1)
+ {
+ g_assert_null (window);
+ data->state = APPLY_LIMIT_STATE_FINISH;
+ g_main_loop_quit (data->loop);
+ }
+ else
+ {
+ g_assert_not_reached ();
+ }
+}
+
+static void
+toplevel_apply_limits (void)
+{
+ ApplyLimitData data = {};
+
+ data.loop = g_main_loop_new (NULL, FALSE);
+ data.wayland_test_client = wayland_test_client_new ("xdg-apply-limits");
+ g_signal_connect (test_driver, "sync-point", G_CALLBACK (on_sync_point), &data);
+ g_main_loop_run (data.loop);
+ g_assert_cmpint (data.state, ==, APPLY_LIMIT_STATE_FINISH);
+ wayland_test_client_finish (data.wayland_test_client);
+ g_test_assert_expected_messages ();
+}
+
void
pre_run_wayland_tests (void)
{
@@ -173,4 +259,6 @@ init_wayland_tests (void)
subsurface_invalid_subsurfaces);
g_test_add_func ("/wayland/subsurface/invalid-xdg-shell-actions",
subsurface_invalid_xdg_shell_actions);
+ g_test_add_func ("/wayland/toplevel/apply-limits",
+ toplevel_apply_limits);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]