mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-03 09:01:42 -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

22
protocol/wayland.xml
View file

@ -277,18 +277,24 @@
<interface name="wl_data_device" version="1"> <interface name="wl_data_device" version="1">
<request name="start_drag"> <request name="start_drag">
<description summary="start drag and drop operation">
This request asks the compositor to start a drag and drop
operation on behalf of the client. The source argument is the
data source that provides the data for the eventual data
transfer. The origin surface is the surface where the drag
originates and the client must have an active implicit grab
that matches the timestamp. The icon surface is an optional
(can be nil) surface that provides an icon to be moved around
with the cursor. Initially, the top-left corner of the icon
surface is placed at the cursor hotspot, but subsequent
surface.attach request can move the relative position.
</description>
<arg name="source" type="object" interface="wl_data_source"/> <arg name="source" type="object" interface="wl_data_source"/>
<arg name="surface" type="object" interface="wl_surface"/> <arg name="origin" type="object" interface="wl_surface"/>
<arg name="icon" type="object" interface="wl_surface"/>
<arg name="time" type="uint"/> <arg name="time" type="uint"/>
</request> </request>
<request name="attach">
<arg name="time" type="uint"/>
<arg name="buffer" type="object" interface="wl_buffer"/>
<arg name="x" type="int"/>
<arg name="y" type="int"/>
</request>
<request name="set_selection"> <request name="set_selection">
<arg name="source" type="object" interface="wl_data_source"/> <arg name="source" type="object" interface="wl_data_source"/>
<arg name="time" type="uint"/> <arg name="time" type="uint"/>

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

1
src/wayland-server.h
View file

@ -212,6 +212,7 @@ struct wl_input_device {
struct wl_resource *drag_focus_resource; struct wl_resource *drag_focus_resource;
struct wl_listener drag_focus_listener; struct wl_listener drag_focus_listener;
struct wl_grab drag_grab; struct wl_grab drag_grab;
struct wl_surface *drag_surface;
struct wl_data_source *selection_data_source; struct wl_data_source *selection_data_source;
struct wl_listener selection_data_source_listener; struct wl_listener selection_data_source_listener;