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

tests/wayland-test-clients: Make WaylandSurface a GObject

Browse Source 
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3350>
This commit is contained in:
Sebastian Wick 2023-12-06 21:55:39 +01:00 committed by Marge Bot
parent cceccc0f68
commit 8e7600322b
4 changed files with 41 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tests/wayland-test-clients/service-client.c
View File

@ -93,6 +93,6 @@ main (int argc,
return EXIT_FAILURE; return EXIT_FAILURE;
} }
wayland_surface_free (surface); g_object_unref (surface);
g_object_unref (display); g_object_unref (display);
} }

41
src/tests/wayland-test-clients/wayland-test-client-utils.c
View File

@ -47,6 +47,10 @@ G_DEFINE_TYPE (WaylandDisplay,
wayland_display, wayland_display,
G_TYPE_OBJECT) G_TYPE_OBJECT)
G_DEFINE_TYPE (WaylandSurface,
wayland_surface,
G_TYPE_OBJECT)
static int static int
create_tmpfile_cloexec (char *tmpname) create_tmpfile_cloexec (char *tmpname)
{ {
@ -450,6 +454,31 @@ static const struct xdg_surface_listener xdg_surface_listener = {
handle_xdg_surface_configure, handle_xdg_surface_configure,
}; };
static void
wayland_surface_dispose (GObject *object)
{
WaylandSurface *surface = WAYLAND_SURFACE (object);
g_clear_pointer (&surface->xdg_toplevel, xdg_toplevel_destroy);
g_clear_pointer (&surface->xdg_surface, xdg_surface_destroy);
g_clear_pointer (&surface->wl_surface, wl_surface_destroy);
G_OBJECT_CLASS (wayland_surface_parent_class)->dispose (object);
}
static void
wayland_surface_class_init (WaylandSurfaceClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->dispose = wayland_surface_dispose;
}
static void
wayland_surface_init (WaylandSurface *surface)
{
}
WaylandSurface * WaylandSurface *
wayland_surface_new (WaylandDisplay *display, wayland_surface_new (WaylandDisplay *display,
const char *title, const char *title,
@ -459,7 +488,8 @@ wayland_surface_new (WaylandDisplay *display,
{ {
WaylandSurface *surface; WaylandSurface *surface;
surface = g_new0 (WaylandSurface, 1); surface = g_object_new (WAYLAND_TYPE_SURFACE, NULL);
surface->display = display; surface->display = display;
surface->default_width = default_width; surface->default_width = default_width;
surface->default_height = default_height; surface->default_height = default_height;
@ -477,15 +507,6 @@ wayland_surface_new (WaylandDisplay *display,
return surface; return surface;
} }
void
wayland_surface_free (WaylandSurface *surface)
{
g_clear_pointer (&surface->xdg_toplevel, xdg_toplevel_destroy);
g_clear_pointer (&surface->xdg_surface, xdg_surface_destroy);
g_clear_pointer (&surface->wl_surface, wl_surface_destroy);
g_free (surface);
}
const char * const char *
lookup_property_value (WaylandDisplay *display, lookup_property_value (WaylandDisplay *display,
const char *name) const char *name)

7
src/tests/wayland-test-clients/wayland-test-client-utils.h
View File

@ -60,6 +60,11 @@ typedef struct _WaylandSurface
uint32_t color; uint32_t color;
} WaylandSurface; } WaylandSurface;
#define WAYLAND_TYPE_SURFACE (wayland_surface_get_type ())
G_DECLARE_FINAL_TYPE (WaylandSurface, wayland_surface,
WAYLAND, SURFACE,
GObject)
int create_anonymous_file (off_t size); int create_anonymous_file (off_t size);
WaylandDisplay * wayland_display_new (WaylandDisplayCapabilities capabilities); WaylandDisplay * wayland_display_new (WaylandDisplayCapabilities capabilities);
@ -73,8 +78,6 @@ WaylandSurface * wayland_surface_new (WaylandDisplay *display,
int default_height, int default_height,
uint32_t color); uint32_t color);
void wayland_surface_free (WaylandSurface *surface);
gboolean create_shm_buffer (WaylandDisplay *display, gboolean create_shm_buffer (WaylandDisplay *display,
int width, int width,
int height, int height,

13
src/tests/wayland-test-clients/xdg-foreign.c
View File

@ -130,10 +130,10 @@ int
main (int argc, main (int argc,
char **argv) char **argv)
{ {
WaylandSurface *window1; g_autoptr (WaylandSurface) window1;
WaylandSurface *window2; g_autoptr (WaylandSurface) window2;
WaylandSurface *window3; g_autoptr (WaylandSurface) window3;
WaylandSurface *window4; g_autoptr (WaylandSurface) window4;
g_autofree char *handle1 = NULL; g_autofree char *handle1 = NULL;
g_autofree char *handle3 = NULL; g_autofree char *handle3 = NULL;
struct wl_registry *registry; struct wl_registry *registry;
@ -222,11 +222,6 @@ main (int argc,
return EXIT_FAILURE; return EXIT_FAILURE;
} }
wayland_surface_free (window1);
wayland_surface_free (window2);
wayland_surface_free (window3);
wayland_surface_free (window4);
g_object_unref (display); g_object_unref (display);
return EXIT_SUCCESS; return EXIT_SUCCESS;