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

tests/wayland: Port xdg-shell action tests to WaylandDisplay

Browse Source 
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2416>
This commit is contained in:
Jonas Ådahl 2022-05-11 23:18:36 +02:00 committed by Marge Bot
parent d58bd948a8
commit b0528dcd53
1 changed files with 8 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
src/tests/wayland-test-clients/invalid-xdg-shell-actions.c
View File

@ -24,14 +24,7 @@
#include "wayland-test-client-utils.h"
#include "test-driver-client-protocol.h"
#include "xdg-shell-client-protocol.h"
static struct wl_display *display;
static struct wl_registry *registry;
static struct wl_compositor *compositor;
static struct xdg_wm_base *xdg_wm_base;
static struct wl_shm *shm;
static WaylandDisplay *display;
static struct wl_surface *surface;
static struct xdg_surface *xdg_surface;
@ -90,7 +83,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,
@ -184,7 +177,7 @@ handle_xdg_surface_configure (void *data,
sent_invalid_once = TRUE;
g_assert_cmpint (wl_display_roundtrip (display), !=, -1);
g_assert_cmpint (wl_display_roundtrip (display->display), !=, -1);
running = FALSE;
}
@ -192,69 +185,13 @@ 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, "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);
}
}
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
test_empty_window_geometry (void)
{
display = wl_display_connect (NULL);
registry = wl_display_get_registry (display);
wl_registry_add_listener (registry, &registry_listener, NULL);
wl_display_roundtrip (display);
display = wayland_display_new (WAYLAND_DISPLAY_CAPABILITY_NONE);
g_assert_nonnull (shm);
g_assert_nonnull (xdg_wm_base);
wl_display_roundtrip (display);
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);
@ -264,17 +201,13 @@ test_empty_window_geometry (void)
running = TRUE;
while (running)
{
if (wl_display_dispatch (display) == -1)
if (wl_display_dispatch (display->display) == -1)
return;
}
g_clear_pointer (&xdg_toplevel, xdg_toplevel_destroy);
g_clear_pointer (&xdg_surface, xdg_surface_destroy);
g_clear_pointer (&xdg_wm_base, xdg_wm_base_destroy);
g_clear_pointer (&compositor, wl_compositor_destroy);
g_clear_pointer (&shm, wl_shm_destroy);
g_clear_pointer (&registry, wl_registry_destroy);
g_clear_pointer (&display, wl_display_disconnect);
g_clear_pointer (&display, wayland_display_free);
}
int