mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-01 22:58:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add wl_resource_create() and a version field to wl_resource

Browse source 
A new function, wl_resource_create(), lets the compositor create a
wl_resource for a given version of the interface.  Passing 0 for the
object ID will allocate a new ID. The implementation, user data and
destructor can be set with wl_resource_set_implementation().

These two functions deprecates wl_client_add/new_object and the
main difference and motivation is the ability to provide a version number
for the resource.  This lets the compositor track which version of the
interface a client has created and we'll use that to verify incoming requests.

Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Jason Ekstrand 2013-06-27 20:09:20 -05:00 • committed by Kristian Høgsberg
parent d35b6278c0
commit 4917a967bd
3 changed files with 80 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/wayland-shm.c
View file

@ -127,10 +127,11 @@ shm_pool_create_buffer(struct wl_client *client, struct wl_resource *resource,
buffer->pool = pool;
pool->refcount++;
buffer->resource = wl_client_add_object(client, &wl_buffer_interface,
&shm_buffer_interface,
id, buffer);
wl_resource_set_destructor(buffer->resource, destroy_buffer);
buffer->resource =
wl_resource_create(client, &wl_buffer_interface, 1, id);
wl_resource_set_implementation(buffer->resource,
&shm_buffer_interface,
buffer, destroy_buffer);
}
static void
@ -204,12 +205,14 @@ shm_create_pool(struct wl_client *client, struct wl_resource *resource,
}
close(fd);
pool->resource = wl_client_add_object(client, &wl_shm_pool_interface,
&shm_pool_interface, id, pool);
pool->resource =
wl_resource_create(client, &wl_shm_pool_interface, 1, id);
if (!pool->resource)
goto err_free;
wl_resource_set_destructor(pool->resource, destroy_pool);
wl_resource_set_implementation(pool->resource,
&shm_pool_interface,
pool, destroy_pool);
return;
@ -229,8 +232,8 @@ bind_shm(struct wl_client *client,
{
struct wl_resource *resource;
resource = wl_client_add_object(client, &wl_shm_interface,
&shm_interface, id, data);
resource = wl_resource_create(client, &wl_shm_interface, 1, id);
wl_resource_set_implementation(resource, &shm_interface, data, NULL);
wl_shm_send_format(resource, WL_SHM_FORMAT_ARGB8888);
wl_shm_send_format(resource, WL_SHM_FORMAT_XRGB8888);
@ -271,11 +274,11 @@ wl_shm_buffer_create(struct wl_client *client,
buffer->offset = 0;
buffer->pool = NULL;
buffer->resource = wl_client_add_object(client, &wl_buffer_interface,
&shm_buffer_interface,
id, buffer);
wl_resource_set_destructor(buffer->resource, destroy_buffer);
buffer->resource =
wl_resource_create(client, &wl_buffer_interface, 1, id);
wl_resource_set_implementation(buffer->resource,
&shm_buffer_interface,
buffer, destroy_buffer);
return buffer;
}