mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2026-02-28 01:41:19 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add a resource creation signal

Browse source 
This change allows to add a resource creation listener to a wl_client,
which will be notified when a new resource is created for that client.
The alternative would be to have a per wl_display listener, but i think
that resources are really client specific objects, so it makes sense
to use the wl_client as the context.

Signed-off-by: Giulio Camuffo <giulio.camuffo@kdab.com>
Reviewed-by: Jonas Ådahl <jadahl@gmail.com>
[Pekka: added wl_list_remove() in TEST(new_resource).]
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
Giulio Camuffo 2016-08-11 17:23:09 +02:00 • committed by Pekka Paalanen
parent 596024f728
commit c55c1d787c
3 changed files with 110 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

83
tests/compositor-introspection-test.c
View file

@ -78,6 +78,29 @@ check_client_list(struct compositor *compositor)
assert(compositor->client == client);
}
static const char *
setup_compositor(struct compositor *compositor)
{
const char *socket;
require_xdg_runtime_dir();
compositor->display = wl_display_create();
socket = wl_display_add_socket_auto(compositor->display);
compositor->listener.notify = client_created;
wl_display_add_client_created_listener(compositor->display, &compositor->listener);
return socket;
}
static void
cleanup_compositor(struct compositor *compositor)
{
wl_client_destroy(compositor->client);
wl_display_destroy(compositor->display);
}
TEST(new_client_connect)
{
const char *socket;
@ -86,13 +109,7 @@ TEST(new_client_connect)
struct wl_display *display;
} client;
require_xdg_runtime_dir();
compositor.display = wl_display_create();
socket = wl_display_add_socket_auto(compositor.display);
compositor.listener.notify = client_created;
wl_display_add_client_created_listener(compositor.display, &compositor.listener);
socket = setup_compositor(&compositor);
client.display = wl_display_connect(socket);
@ -102,8 +119,54 @@ TEST(new_client_connect)
check_client_list(&compositor);
wl_display_disconnect(client.display);
wl_client_destroy(compositor.client);
wl_display_destroy(compositor.display);
wl_display_disconnect(client.display);
cleanup_compositor(&compositor);
}
struct resource_listener {
struct wl_listener listener;
int count;
};
static void
resource_created(struct wl_listener *listener, void *data)
{
struct resource_listener *l;
l = wl_container_of(listener, l, listener);
l->count++;
}
TEST(new_resource)
{
const char *socket;
struct compositor compositor = { 0 };
struct {
struct wl_display *display;
struct wl_callback *cb;
} client;
struct resource_listener resource_listener;
socket = setup_compositor(&compositor);
client.display = wl_display_connect(socket);
wl_event_loop_dispatch(wl_display_get_event_loop(compositor.display), 100);
resource_listener.count = 0;
resource_listener.listener.notify = resource_created;
wl_client_add_resource_created_listener(compositor.client,
&resource_listener.listener);
client.cb = wl_display_sync(client.display);
wl_display_flush(client.display);
wl_event_loop_dispatch(wl_display_get_event_loop(compositor.display), 100);
assert(resource_listener.count == 1);
wl_callback_destroy(client.cb);
wl_display_disconnect(client.display);
cleanup_compositor(&compositor);
/* This is defined to be safe also after client destruction */
wl_list_remove(&resource_listener.listener.link);
}