mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-04 13:29:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

data_device: get rid of attach request

Browse source 
In the effort to make everything a regular surface, remove
data_device.attach request. To maintan the functionality, add
an icon surface parameter to data_device.start_drag.

Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
This commit is contained in:
Ander Conselvan de Oliveira 2012-02-15 17:02:52 +02:00 • committed by Kristian Høgsberg
parent b3981136a1
commit 7243062f93
3 changed files with 35 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/data-device.c
View file

@ -240,7 +240,20 @@ drag_grab_button(struct wl_grab *grab,
if (device->button_count == 0 && state == 0) {
wl_input_device_end_grab(device, time);
if (device->drag_surface) {
struct wl_resource *surface_resource =
&device->drag_surface->resource;
struct wl_surface_interface *implementation =
(struct wl_surface_interface *)
surface_resource->object.implementation;
implementation->attach(surface_resource->client,
surface_resource, NULL, 0, 0);
}
device->drag_data_source = NULL;
device->drag_surface = NULL;
}
}
@ -253,26 +266,23 @@ static const struct wl_grab_interface drag_grab_interface = {
static void
data_device_start_drag(struct wl_client *client, struct wl_resource *resource,
struct wl_resource *source_resource,
struct wl_resource *surface_resource, uint32_t time)
struct wl_resource *origin_resource,
struct wl_resource *icon_resource, uint32_t time)
{
struct wl_input_device *device = resource->data;
/* FIXME: Check that client has implicit grab on the surface
* that matches the given time. */
/* FIXME: Check that client has implicit grab on the origin
* surface that matches the given time. */
/* FIXME: Check that the data source type array isn't empty. */
device->drag_grab.interface = &drag_grab_interface;
device->drag_data_source = source_resource->data;
wl_input_device_start_grab(device, &device->drag_grab, time);
}
if (icon_resource)
device->drag_surface = icon_resource->data;
static void
data_device_attach(struct wl_client *client, struct wl_resource *resource,
uint32_t time,
struct wl_resource *buffer, int32_t x, int32_t y)
{
wl_input_device_start_grab(device, &device->drag_grab, time);
}
static void
@ -347,7 +357,6 @@ data_device_set_selection(struct wl_client *client,
static const struct wl_data_device_interface data_device_interface = {
data_device_start_drag,
data_device_attach,
data_device_set_selection,
};