From a7161e11322950d0b02a6024c62ba44a3e03d4f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Wed, 11 May 2022 23:46:54 +0200 Subject: [PATCH] tests/wayland/subsurface-reparenting: Port to WaylandDisplay Part-of: --- .../subsurface-reparenting.c | 105 ++---------------- 1 file changed, 10 insertions(+), 95 deletions(-) diff --git a/src/tests/wayland-test-clients/subsurface-reparenting.c b/src/tests/wayland-test-clients/subsurface-reparenting.c index f3f79c327..8ab5f6a9d 100644 --- a/src/tests/wayland-test-clients/subsurface-reparenting.c +++ b/src/tests/wayland-test-clients/subsurface-reparenting.c @@ -25,9 +25,6 @@ #include "wayland-test-client-utils.h" -#include "test-driver-client-protocol.h" -#include "xdg-shell-client-protocol.h" - typedef enum _State { STATE_INIT = 0, @@ -39,13 +36,7 @@ typedef enum _State STATE_WAIT_FOR_FRAME_3 } 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 WaylandDisplay *display; static struct wl_surface *surface; static struct xdg_surface *xdg_surface; @@ -104,7 +95,7 @@ create_shm_buffer (int width, return FALSE; } - pool = wl_shm_create_pool (shm, fd, size); + pool = wl_shm_create_pool (display->shm, fd, size); buffer = wl_shm_pool_create_buffer (pool, 0, width, height, stride, @@ -211,7 +202,7 @@ reset_surface (void) { struct wl_callback *callback; - callback = test_driver_sync_actor_destroyed (test_driver, surface); + callback = test_driver_sync_actor_destroyed (display->test_driver, surface); wl_callback_add_listener (callback, &actor_destroy_listener, NULL); xdg_toplevel_destroy (xdg_toplevel); @@ -268,81 +259,24 @@ handle_xdg_surface_configure (void *data, frame_callback = wl_surface_frame (surface); wl_callback_add_listener (frame_callback, &frame_listener, NULL); wl_surface_commit (surface); - wl_display_flush (display); + wl_display_flush (display->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 -}; - static void init_surfaces (void) { - surface = wl_compositor_create_surface (compositor); - xdg_surface = xdg_wm_base_get_xdg_surface (xdg_wm_base, surface); + surface = wl_compositor_create_surface (display->compositor); + xdg_surface = xdg_wm_base_get_xdg_surface (display->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); xdg_toplevel_set_title (xdg_toplevel, "subsurface-reparenting-test"); - subsurface = wl_subcompositor_get_subsurface (subcompositor, + subsurface = wl_subcompositor_get_subsurface (display->subcompositor, subsurface_surface, surface); wl_subsurface_set_position (subsurface, 100, 100); @@ -353,28 +287,9 @@ 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); + display = wayland_display_new (WAYLAND_DISPLAY_CAPABILITY_TEST_DRIVER); - 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); - - subsurface_surface = wl_compositor_create_surface (compositor); + subsurface_surface = wl_compositor_create_surface (display->compositor); draw_subsurface (); wl_surface_commit (subsurface_surface); @@ -383,7 +298,7 @@ main (int argc, while (TRUE) { - if (wl_display_dispatch (display) == -1) + if (wl_display_dispatch (display->display) == -1) return EXIT_FAILURE; }