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

wayland: Remove needless indirection

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-03-11 16:00:34 -04:00
parent f397c32192
commit e34792d9f0
2 changed files with 5 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/wayland/meta-wayland-data-device.c
View File

@ -48,7 +48,7 @@ data_offer_accept (struct wl_client *client,
* this be a wl_data_device request? */ * this be a wl_data_device request? */
if (offer->source) if (offer->source)
offer->source->accept (offer->source, serial, mime_type); wl_data_source_send_target (offer->source->resource, mime_type);
} }
static void static void
@ -58,8 +58,8 @@ data_offer_receive (struct wl_client *client, struct wl_resource *resource,
MetaWaylandDataOffer *offer = wl_resource_get_user_data (resource); MetaWaylandDataOffer *offer = wl_resource_get_user_data (resource);
if (offer->source) if (offer->source)
offer->source->send (offer->source, mime_type, fd); wl_data_source_send_send (offer->source->resource, mime_type, fd);
else
close (fd); close (fd);
} }
@ -391,7 +391,7 @@ meta_wayland_seat_set_selection (MetaWaylandSeat *seat,
if (seat->selection_data_source) if (seat->selection_data_source)
{ {
seat->selection_data_source->cancel (seat->selection_data_source); wl_data_source_send_cancelled (seat->selection_data_source->resource);
wl_list_remove (&seat->selection_data_source_listener.link); wl_list_remove (&seat->selection_data_source_listener.link);
seat->selection_data_source = NULL; seat->selection_data_source = NULL;
} }
@ -461,27 +461,6 @@ destroy_data_source (struct wl_resource *resource)
g_slice_free (MetaWaylandDataSource, source); g_slice_free (MetaWaylandDataSource, source);
} }
static void
client_source_accept (MetaWaylandDataSource *source,
guint32 time, const char *mime_type)
{
wl_data_source_send_target (source->resource, mime_type);
}
static void
client_source_send (MetaWaylandDataSource *source,
const char *mime_type, int32_t fd)
{
wl_data_source_send_send (source->resource, mime_type, fd);
close (fd);
}
static void
client_source_cancel (MetaWaylandDataSource *source)
{
wl_data_source_send_cancelled (source->resource);
}
static void static void
create_data_source (struct wl_client *client, create_data_source (struct wl_client *client,
struct wl_resource *resource, guint32 id) struct wl_resource *resource, guint32 id)
@ -494,10 +473,6 @@ create_data_source (struct wl_client *client,
wl_resource_set_implementation (source->resource, &data_source_interface, wl_resource_set_implementation (source->resource, &data_source_interface,
source, destroy_data_source); source, destroy_data_source);
source->accept = client_source_accept;
source->send = client_source_send;
source->cancel = client_source_cancel;
wl_array_init (&source->mime_types); wl_array_init (&source->mime_types);
} }

6
src/wayland/meta-wayland-seat.h
View File

@ -43,12 +43,6 @@ struct _MetaWaylandDataSource
{ {
struct wl_resource *resource; struct wl_resource *resource;
struct wl_array mime_types; struct wl_array mime_types;
void (*accept) (MetaWaylandDataSource * source,
uint32_t serial, const char *mime_type);
void (*send) (MetaWaylandDataSource * source,
const char *mime_type, int32_t fd);
void (*cancel) (MetaWaylandDataSource * source);
}; };
struct _MetaWaylandSeat struct _MetaWaylandSeat