Implement the new dnd/selection protocol
The new protocol splits dnd/selection from wl_shell and allows us to move the implementation out of shell.c.
This commit is contained in:
Kristian Høgsberg
@@ -16,6 +16,7 @@ wayland_compositor_SOURCES = \
|
||||
compositor.c \
|
||||
compositor.h \
|
||||
image-loader.c \
|
||||
data-device.c \
|
||||
screenshooter.c \
|
||||
screenshooter-protocol.c \
|
||||
screenshooter-server-protocol.h \
|
||||
|
||||
@@ -1457,17 +1457,10 @@ WL_EXPORT void
|
||||
wlsc_surface_activate(struct wlsc_surface *surface,
|
||||
struct wlsc_input_device *device, uint32_t time)
|
||||
{
|
||||
struct wlsc_shell *shell = surface->compositor->shell;
|
||||
|
||||
wlsc_surface_raise(surface);
|
||||
if (device->selection)
|
||||
shell->set_selection_focus(shell,
|
||||
device->selection,
|
||||
&surface->surface, time);
|
||||
|
||||
wl_input_device_set_keyboard_focus(&device->input_device,
|
||||
&surface->surface,
|
||||
time);
|
||||
&surface->surface, time);
|
||||
wlsc_data_device_set_keyboard_focus(device);
|
||||
}
|
||||
|
||||
struct wlsc_binding {
|
||||
@@ -1719,10 +1712,12 @@ input_device_attach(struct wl_client *client,
|
||||
|
||||
if (time < device->input_device.pointer_focus_time)
|
||||
return;
|
||||
#if 0
|
||||
if (device->input_device.pointer_focus == NULL)
|
||||
return;
|
||||
if (device->input_device.pointer_focus->resource.client != client)
|
||||
return;
|
||||
#endif
|
||||
|
||||
if (buffer_resource) {
|
||||
buffer = buffer_resource->data;
|
||||
@@ -1762,6 +1757,7 @@ wlsc_input_device_init(struct wlsc_input_device *device,
|
||||
struct wlsc_compositor *ec)
|
||||
{
|
||||
wl_input_device_init(&device->input_device);
|
||||
wl_list_init(&device->drag_resource_list);
|
||||
|
||||
wl_display_add_global(ec->wl_display, &wl_input_device_interface,
|
||||
device, bind_input_device);
|
||||
@@ -1781,6 +1777,7 @@ wlsc_input_device_init(struct wlsc_input_device *device,
|
||||
wl_list_insert(ec->input_device_list.prev, &device->link);
|
||||
|
||||
wlsc_input_device_set_pointer_image(device, WLSC_POINTER_LEFT_PTR);
|
||||
device->selection_data_source = NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -2102,6 +2099,8 @@ wlsc_compositor_init(struct wlsc_compositor *ec, struct wl_display *display)
|
||||
|
||||
screenshooter_create(ec);
|
||||
|
||||
wlsc_data_device_manager_init(ec);
|
||||
|
||||
glActiveTexture(GL_TEXTURE0);
|
||||
|
||||
if (wlsc_shader_init(&ec->texture_shader,
|
||||
|
||||
+15
-3
@@ -112,6 +112,16 @@ struct wlsc_input_device {
|
||||
struct wl_list link;
|
||||
uint32_t modifier_state;
|
||||
struct wl_selection *selection;
|
||||
|
||||
struct wl_list drag_resource_list;
|
||||
struct wlsc_data_source *drag_data_source;
|
||||
struct wl_surface *drag_focus;
|
||||
struct wl_resource *drag_focus_resource;
|
||||
struct wl_listener drag_focus_listener;
|
||||
|
||||
struct wlsc_data_source *selection_data_source;
|
||||
struct wl_listener selection_data_source_listener;
|
||||
struct wl_grab grab;
|
||||
};
|
||||
|
||||
enum wlsc_visual {
|
||||
@@ -163,9 +173,6 @@ struct wlsc_shell {
|
||||
void (*configure)(struct wlsc_shell *shell,
|
||||
struct wlsc_surface *surface,
|
||||
int32_t x, int32_t y, int32_t width, int32_t height);
|
||||
void (*set_selection_focus)(struct wlsc_shell *shell,
|
||||
struct wl_selection *selection,
|
||||
struct wl_surface *surface, uint32_t time);
|
||||
};
|
||||
|
||||
enum {
|
||||
@@ -410,6 +417,11 @@ struct wlsc_process {
|
||||
struct wl_list link;
|
||||
};
|
||||
|
||||
int
|
||||
wlsc_data_device_manager_init(struct wlsc_compositor *compositor);
|
||||
void
|
||||
wlsc_data_device_set_keyboard_focus(struct wlsc_input_device *device);
|
||||
|
||||
void
|
||||
wlsc_watch_process(struct wlsc_process *process);
|
||||
|
||||
|
||||
@@ -0,0 +1,459 @@
|
||||
/*
|
||||
* Copyright © 2011 Kristian Høgsberg
|
||||
*
|
||||
* Permission to use, copy, modify, distribute, and sell this software and its
|
||||
* documentation for any purpose is hereby granted without fee, provided that
|
||||
* the above copyright notice appear in all copies and that both that copyright
|
||||
* notice and this permission notice appear in supporting documentation, and
|
||||
* that the name of the copyright holders not be used in advertising or
|
||||
* publicity pertaining to distribution of the software without specific,
|
||||
* written prior permission. The copyright holders make no representations
|
||||
* about the suitability of this software for any purpose. It is provided "as
|
||||
* is" without express or implied warranty.
|
||||
*
|
||||
* THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
||||
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
|
||||
* EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
|
||||
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
|
||||
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
|
||||
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
|
||||
* OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#include "compositor.h"
|
||||
|
||||
struct wlsc_data_source {
|
||||
struct wl_resource resource;
|
||||
struct wl_array mime_types;
|
||||
int refcount;
|
||||
};
|
||||
|
||||
static void
|
||||
wlsc_data_source_unref(struct wlsc_data_source *source)
|
||||
{
|
||||
source->refcount--;
|
||||
|
||||
if (source->refcount == 1 && source->resource.object.id != 0) {
|
||||
wl_resource_post_event(&source->resource,
|
||||
WL_DATA_SOURCE_CANCELLED);
|
||||
} else if (source->refcount == 0) {
|
||||
free(source);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
data_offer_accept(struct wl_client *client, struct wl_resource *resource,
|
||||
uint32_t time, const char *mime_type)
|
||||
{
|
||||
struct wlsc_data_source *source = resource->data;
|
||||
|
||||
/* FIXME: Check that client is currently focused by the input
|
||||
* device that is currently dragging this data source. Should
|
||||
* this be a wl_data_device request? */
|
||||
|
||||
wl_resource_post_event(&source->resource,
|
||||
WL_DATA_SOURCE_TARGET, mime_type);
|
||||
}
|
||||
|
||||
static void
|
||||
data_offer_receive(struct wl_client *client, struct wl_resource *resource,
|
||||
const char *mime_type, int32_t fd)
|
||||
{
|
||||
struct wlsc_data_source *source = resource->data;
|
||||
|
||||
wl_resource_post_event(&source->resource,
|
||||
WL_DATA_SOURCE_SEND, mime_type, fd);
|
||||
close(fd);
|
||||
}
|
||||
|
||||
static void
|
||||
data_offer_destroy(struct wl_client *client, struct wl_resource *resource)
|
||||
{
|
||||
wl_resource_destroy(resource, wlsc_compositor_get_time());
|
||||
}
|
||||
|
||||
static void
|
||||
destroy_data_offer(struct wl_resource *resource)
|
||||
{
|
||||
struct wlsc_data_source *source = resource->data;
|
||||
|
||||
wlsc_data_source_unref(source);
|
||||
free(resource);
|
||||
}
|
||||
|
||||
static const struct wl_data_offer_interface data_offer_interface = {
|
||||
data_offer_accept,
|
||||
data_offer_receive,
|
||||
data_offer_destroy,
|
||||
};
|
||||
|
||||
static struct wl_resource *
|
||||
wlsc_data_source_send_offer(struct wlsc_data_source *source,
|
||||
struct wl_resource *target)
|
||||
{
|
||||
struct wl_resource *resource;
|
||||
char **p, **end;
|
||||
|
||||
resource = wl_client_new_object(target->client,
|
||||
&wl_data_offer_interface,
|
||||
&data_offer_interface, source);
|
||||
resource->destroy = destroy_data_offer;
|
||||
|
||||
source->refcount++;
|
||||
|
||||
wl_resource_post_event(target, WL_DATA_DEVICE_DATA_OFFER, resource);
|
||||
|
||||
end = source->mime_types.data + source->mime_types.size;
|
||||
for (p = source->mime_types.data; p < end; p++)
|
||||
wl_resource_post_event(resource, WL_DATA_OFFER_OFFER, *p);
|
||||
|
||||
|
||||
return resource;
|
||||
}
|
||||
|
||||
static void
|
||||
data_source_offer(struct wl_client *client,
|
||||
struct wl_resource *resource,
|
||||
const char *type)
|
||||
{
|
||||
struct wlsc_data_source *source = resource->data;
|
||||
char **p;
|
||||
|
||||
p = wl_array_add(&source->mime_types, sizeof *p);
|
||||
if (p)
|
||||
*p = strdup(type);
|
||||
if (!p || !*p)
|
||||
wl_resource_post_no_memory(resource);
|
||||
}
|
||||
|
||||
static void
|
||||
data_source_destroy(struct wl_client *client, struct wl_resource *resource)
|
||||
{
|
||||
wl_resource_destroy(resource, wlsc_compositor_get_time());
|
||||
}
|
||||
|
||||
static struct wl_data_source_interface data_source_interface = {
|
||||
data_source_offer,
|
||||
data_source_destroy
|
||||
};
|
||||
|
||||
static struct wl_resource *
|
||||
find_resource(struct wl_list *list, struct wl_client *client)
|
||||
{
|
||||
struct wl_resource *r;
|
||||
|
||||
wl_list_for_each(r, list, link) {
|
||||
if (r->client == client)
|
||||
return r;
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
destroy_drag_focus(struct wl_listener *listener,
|
||||
struct wl_resource *resource, uint32_t time)
|
||||
{
|
||||
struct wlsc_input_device *device =
|
||||
container_of(listener, struct wlsc_input_device,
|
||||
drag_focus_listener);
|
||||
|
||||
device->drag_focus_resource = NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
drag_set_focus(struct wlsc_input_device *device,
|
||||
struct wl_surface *surface, uint32_t time,
|
||||
int32_t x, int32_t y)
|
||||
{
|
||||
struct wl_resource *resource, *offer;
|
||||
|
||||
if (device->drag_focus == surface)
|
||||
return;
|
||||
|
||||
if (device->drag_focus_resource) {
|
||||
wl_resource_post_event(device->drag_focus_resource,
|
||||
WL_DATA_DEVICE_LEAVE);
|
||||
wl_list_remove(&device->drag_focus_listener.link);
|
||||
device->drag_focus_resource = NULL;
|
||||
device->drag_focus = NULL;
|
||||
}
|
||||
|
||||
if (surface)
|
||||
resource = find_resource(&device->drag_resource_list,
|
||||
surface->resource.client);
|
||||
if (surface && resource) {
|
||||
offer = wlsc_data_source_send_offer(device->drag_data_source,
|
||||
resource);
|
||||
|
||||
wl_resource_post_event(resource,
|
||||
WL_DATA_DEVICE_ENTER,
|
||||
time, surface, x, y, offer);
|
||||
|
||||
device->drag_focus = surface;
|
||||
device->drag_focus_listener.func = destroy_drag_focus;
|
||||
wl_list_insert(resource->destroy_listener_list.prev,
|
||||
&device->drag_focus_listener.link);
|
||||
device->drag_focus_resource = resource;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
drag_grab_motion(struct wl_grab *grab,
|
||||
uint32_t time, int32_t x, int32_t y)
|
||||
{
|
||||
struct wlsc_input_device *device =
|
||||
container_of(grab, struct wlsc_input_device, grab);
|
||||
struct wlsc_surface *es;
|
||||
|
||||
es = pick_surface(&device->input_device, &x, &y);
|
||||
drag_set_focus(device, &es->surface, time, x, y);
|
||||
|
||||
if (es && device->drag_focus_resource)
|
||||
wl_resource_post_event(device->drag_focus_resource,
|
||||
WL_DATA_DEVICE_MOTION, time, x, y);
|
||||
}
|
||||
|
||||
static void
|
||||
drag_grab_button(struct wl_grab *grab,
|
||||
uint32_t time, int32_t button, int32_t state)
|
||||
{
|
||||
}
|
||||
|
||||
static void
|
||||
drag_grab_end(struct wl_grab *grab, uint32_t time)
|
||||
{
|
||||
struct wlsc_input_device *device =
|
||||
container_of(grab, struct wlsc_input_device, grab);
|
||||
|
||||
if (device->drag_focus_resource)
|
||||
wl_resource_post_event(device->drag_focus_resource,
|
||||
WL_DATA_DEVICE_DROP);
|
||||
|
||||
drag_set_focus(device, NULL, time, 0, 0);
|
||||
wlsc_data_source_unref(device->drag_data_source);
|
||||
device->drag_data_source = NULL;
|
||||
}
|
||||
|
||||
static const struct wl_grab_interface drag_grab_interface = {
|
||||
drag_grab_motion,
|
||||
drag_grab_button,
|
||||
drag_grab_end
|
||||
};
|
||||
|
||||
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 wlsc_input_device *device = resource->data;
|
||||
struct wlsc_surface *surface = surface_resource->data;
|
||||
struct wlsc_surface *target;
|
||||
int32_t sx, sy;
|
||||
|
||||
/* FIXME: Check that client has implicit grab on the surface
|
||||
* that matches the given time. */
|
||||
|
||||
/* FIXME: Check that the data source type array isn't empty. */
|
||||
|
||||
if (wl_input_device_update_grab(&device->input_device, &device->grab,
|
||||
&surface->surface, time) < 0)
|
||||
return;
|
||||
|
||||
device->grab.interface = &drag_grab_interface;
|
||||
device->drag_data_source = source_resource->data;
|
||||
device->drag_data_source->refcount++;
|
||||
|
||||
target = pick_surface(&device->input_device, &sx, &sy);
|
||||
wl_input_device_set_pointer_focus(&device->input_device,
|
||||
NULL, time, 0, 0, 0, 0);
|
||||
drag_set_focus(device, &target->surface, time, sx, sy);
|
||||
}
|
||||
|
||||
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)
|
||||
{
|
||||
}
|
||||
|
||||
static void
|
||||
destroy_selection_data_source(struct wl_listener *listener,
|
||||
struct wl_resource *resource, uint32_t time)
|
||||
{
|
||||
struct wlsc_input_device *device =
|
||||
container_of(listener, struct wlsc_input_device,
|
||||
selection_data_source_listener);
|
||||
struct wl_resource *data_device, *focus;
|
||||
|
||||
device->selection_data_source = NULL;
|
||||
|
||||
focus = device->input_device.keyboard_focus_resource;
|
||||
if (focus) {
|
||||
data_device = find_resource(&device->drag_resource_list,
|
||||
focus->client);
|
||||
wl_resource_post_event(data_device,
|
||||
WL_DATA_DEVICE_SELECTION, NULL);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
data_device_set_selection(struct wl_client *client,
|
||||
struct wl_resource *resource,
|
||||
struct wl_resource *source_resource, uint32_t time)
|
||||
{
|
||||
struct wlsc_input_device *device = resource->data;
|
||||
struct wl_resource *data_device, *focus, *offer;
|
||||
|
||||
if (!source_resource)
|
||||
return;
|
||||
|
||||
if (device->selection_data_source) {
|
||||
/* FIXME: All non-active clients will probably hold a
|
||||
* reference to the selection data source, and thus it
|
||||
* won't get destroyed until every client has been
|
||||
* activated and seen the new selection event. */
|
||||
wl_list_remove(&device->selection_data_source_listener.link);
|
||||
wlsc_data_source_unref(device->selection_data_source);
|
||||
device->selection_data_source = NULL;
|
||||
}
|
||||
|
||||
device->selection_data_source = source_resource->data;
|
||||
device->selection_data_source->refcount++;
|
||||
|
||||
focus = device->input_device.keyboard_focus_resource;
|
||||
if (focus) {
|
||||
data_device = find_resource(&device->drag_resource_list,
|
||||
focus->client);
|
||||
offer = wlsc_data_source_send_offer(device->selection_data_source,
|
||||
data_device);
|
||||
wl_resource_post_event(data_device,
|
||||
WL_DATA_DEVICE_SELECTION, offer);
|
||||
}
|
||||
|
||||
device->selection_data_source_listener.func =
|
||||
destroy_selection_data_source;
|
||||
wl_list_insert(source_resource->destroy_listener_list.prev,
|
||||
&device->selection_data_source_listener.link);
|
||||
}
|
||||
|
||||
static const struct wl_data_device_interface data_device_interface = {
|
||||
data_device_start_drag,
|
||||
data_device_attach,
|
||||
data_device_set_selection,
|
||||
};
|
||||
|
||||
static void
|
||||
destroy_data_source(struct wl_resource *resource)
|
||||
{
|
||||
struct wlsc_data_source *source =
|
||||
container_of(resource, struct wlsc_data_source, resource);
|
||||
char **p, **end;
|
||||
|
||||
end = source->mime_types.data + source->mime_types.size;
|
||||
for (p = source->mime_types.data; p < end; p++)
|
||||
free(*p);
|
||||
|
||||
wl_array_release(&source->mime_types);
|
||||
|
||||
source->resource.object.id = 0;
|
||||
wlsc_data_source_unref(source);
|
||||
}
|
||||
|
||||
static void
|
||||
create_data_source(struct wl_client *client,
|
||||
struct wl_resource *resource, uint32_t id)
|
||||
{
|
||||
struct wlsc_data_source *source;
|
||||
|
||||
source = malloc(sizeof *source);
|
||||
if (source == NULL) {
|
||||
wl_resource_post_no_memory(resource);
|
||||
return;
|
||||
}
|
||||
|
||||
source->resource.destroy = destroy_data_source;
|
||||
source->resource.object.id = id;
|
||||
source->resource.object.interface = &wl_data_source_interface;
|
||||
source->resource.object.implementation =
|
||||
(void (**)(void)) &data_source_interface;
|
||||
source->resource.data = source;
|
||||
source->refcount = 1;
|
||||
|
||||
wl_array_init(&source->mime_types);
|
||||
wl_client_add_resource(client, &source->resource);
|
||||
}
|
||||
|
||||
static void unbind_data_device(struct wl_resource *resource)
|
||||
{
|
||||
wl_list_remove(&resource->link);
|
||||
free(resource);
|
||||
}
|
||||
|
||||
static void
|
||||
get_data_device(struct wl_client *client,
|
||||
struct wl_resource *manager_resource,
|
||||
uint32_t id, struct wl_resource *input_device)
|
||||
{
|
||||
struct wlsc_input_device *device = input_device->data;
|
||||
struct wl_resource *resource;
|
||||
|
||||
resource =
|
||||
wl_client_add_object(client, &wl_data_device_interface,
|
||||
&data_device_interface, id, device);
|
||||
|
||||
wl_list_insert(&device->drag_resource_list, &resource->link);
|
||||
resource->destroy = unbind_data_device;
|
||||
}
|
||||
|
||||
static const struct wl_data_device_manager_interface manager_interface = {
|
||||
create_data_source,
|
||||
get_data_device
|
||||
};
|
||||
|
||||
static void
|
||||
bind_manager(struct wl_client *client,
|
||||
void *data, uint32_t version, uint32_t id)
|
||||
{
|
||||
wl_client_add_object(client, &wl_data_device_manager_interface,
|
||||
&manager_interface, id, NULL);
|
||||
}
|
||||
|
||||
WL_EXPORT void
|
||||
wlsc_data_device_set_keyboard_focus(struct wlsc_input_device *device)
|
||||
{
|
||||
struct wl_resource *data_device, *focus, *offer;
|
||||
struct wlsc_data_source *source;
|
||||
|
||||
focus = device->input_device.keyboard_focus_resource;
|
||||
if (!focus)
|
||||
return;
|
||||
|
||||
data_device = find_resource(&device->drag_resource_list,
|
||||
focus->client);
|
||||
if (!data_device)
|
||||
return;
|
||||
|
||||
source = device->selection_data_source;
|
||||
if (source) {
|
||||
offer = wlsc_data_source_send_offer(source, data_device);
|
||||
wl_resource_post_event(data_device,
|
||||
WL_DATA_DEVICE_SELECTION, offer);
|
||||
}
|
||||
}
|
||||
|
||||
WL_EXPORT int
|
||||
wlsc_data_device_manager_init(struct wlsc_compositor *compositor)
|
||||
{
|
||||
if (wl_display_add_global(compositor->wl_display,
|
||||
&wl_data_device_manager_interface,
|
||||
NULL, bind_manager) == NULL)
|
||||
return -1;
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -402,431 +402,9 @@ shell_set_fullscreen(struct wl_client *client,
|
||||
priv->type = SHELL_SURFACE_FULLSCREEN;
|
||||
}
|
||||
|
||||
static void
|
||||
destroy_drag(struct wl_resource *resource)
|
||||
{
|
||||
struct wl_drag *drag =
|
||||
container_of(resource, struct wl_drag, resource);
|
||||
|
||||
wl_list_remove(&drag->drag_focus_listener.link);
|
||||
if (drag->grab.input_device)
|
||||
wl_input_device_end_grab(drag->grab.input_device,
|
||||
wlsc_compositor_get_time());
|
||||
|
||||
free(drag);
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
wl_drag_set_pointer_focus(struct wl_drag *drag,
|
||||
struct wl_surface *surface, uint32_t time,
|
||||
int32_t x, int32_t y, int32_t sx, int32_t sy)
|
||||
{
|
||||
char **p, **end;
|
||||
|
||||
if (drag->drag_focus == surface)
|
||||
return;
|
||||
|
||||
if (drag->drag_focus &&
|
||||
(!surface ||
|
||||
drag->drag_focus->resource.client != surface->resource.client))
|
||||
wl_resource_post_event(&drag->drag_offer.resource,
|
||||
WL_DRAG_OFFER_POINTER_FOCUS,
|
||||
time, NULL, 0, 0, 0, 0);
|
||||
|
||||
if (surface &&
|
||||
(!drag->drag_focus ||
|
||||
drag->drag_focus->resource.client != surface->resource.client)) {
|
||||
|
||||
drag->drag_offer.resource.client = surface->resource.client;
|
||||
end = drag->types.data + drag->types.size;
|
||||
for (p = drag->types.data; p < end; p++)
|
||||
wl_resource_post_event(&drag->drag_offer.resource,
|
||||
WL_DRAG_OFFER_OFFER, *p);
|
||||
}
|
||||
|
||||
if (surface) {
|
||||
wl_resource_post_event(&drag->drag_offer.resource,
|
||||
WL_DRAG_OFFER_POINTER_FOCUS,
|
||||
time, surface,
|
||||
x, y, sx, sy);
|
||||
|
||||
}
|
||||
|
||||
drag->drag_focus = surface;
|
||||
drag->pointer_focus_time = time;
|
||||
drag->target = NULL;
|
||||
|
||||
wl_list_remove(&drag->drag_focus_listener.link);
|
||||
if (surface)
|
||||
wl_list_insert(surface->resource.destroy_listener_list.prev,
|
||||
&drag->drag_focus_listener.link);
|
||||
}
|
||||
|
||||
static void
|
||||
drag_offer_accept(struct wl_client *client, struct wl_resource *resource,
|
||||
uint32_t time, const char *type)
|
||||
{
|
||||
struct wl_drag_offer *offer = resource->data;
|
||||
struct wl_drag *drag = container_of(offer, struct wl_drag, drag_offer);
|
||||
char **p, **end;
|
||||
|
||||
/* If the client responds to drag pointer_focus or motion
|
||||
* events after the pointer has left the surface, we just
|
||||
* discard the accept requests. The drag source just won't
|
||||
* get the corresponding 'target' events and eventually the
|
||||
* next surface/root will start sending events. */
|
||||
if (time < drag->pointer_focus_time)
|
||||
return;
|
||||
|
||||
drag->target = client;
|
||||
drag->type = NULL;
|
||||
end = drag->types.data + drag->types.size;
|
||||
for (p = drag->types.data; p < end; p++)
|
||||
if (type && strcmp(*p, type) == 0)
|
||||
drag->type = *p;
|
||||
|
||||
wl_resource_post_event(&drag->resource, WL_DRAG_TARGET, drag->type);
|
||||
}
|
||||
|
||||
static void
|
||||
drag_offer_receive(struct wl_client *client,
|
||||
struct wl_resource *resource, int fd)
|
||||
{
|
||||
struct wl_drag_offer *offer = resource->data;
|
||||
struct wl_drag *drag = container_of(offer, struct wl_drag, drag_offer);
|
||||
|
||||
wl_resource_post_event(&drag->resource, WL_DRAG_FINISH, fd);
|
||||
close(fd);
|
||||
}
|
||||
|
||||
static void
|
||||
drag_offer_reject(struct wl_client *client, struct wl_resource *resource)
|
||||
{
|
||||
struct wl_drag_offer *offer = resource->data;
|
||||
struct wl_drag *drag = container_of(offer, struct wl_drag, drag_offer);
|
||||
|
||||
wl_resource_post_event(&drag->resource, WL_DRAG_REJECT);
|
||||
}
|
||||
|
||||
static const struct wl_drag_offer_interface drag_offer_interface = {
|
||||
drag_offer_accept,
|
||||
drag_offer_receive,
|
||||
drag_offer_reject
|
||||
};
|
||||
|
||||
static void
|
||||
drag_offer(struct wl_client *client,
|
||||
struct wl_resource *resource, const char *type)
|
||||
{
|
||||
struct wl_drag *drag = resource->data;
|
||||
char **p;
|
||||
|
||||
p = wl_array_add(&drag->types, sizeof *p);
|
||||
if (p)
|
||||
*p = strdup(type);
|
||||
if (!p || !*p)
|
||||
wl_resource_post_no_memory(resource);
|
||||
}
|
||||
|
||||
static void
|
||||
drag_grab_motion(struct wl_grab *grab,
|
||||
uint32_t time, int32_t x, int32_t y)
|
||||
{
|
||||
struct wl_drag *drag = container_of(grab, struct wl_drag, grab);
|
||||
struct wlsc_surface *es;
|
||||
int32_t sx, sy;
|
||||
|
||||
es = pick_surface(grab->input_device, &sx, &sy);
|
||||
wl_drag_set_pointer_focus(drag, &es->surface, time, x, y, sx, sy);
|
||||
if (es)
|
||||
wl_resource_post_event(&drag->drag_offer.resource,
|
||||
WL_DRAG_OFFER_MOTION,
|
||||
time, x, y, sx, sy);
|
||||
}
|
||||
|
||||
static void
|
||||
drag_grab_button(struct wl_grab *grab,
|
||||
uint32_t time, int32_t button, int32_t state)
|
||||
{
|
||||
}
|
||||
|
||||
static void
|
||||
drag_grab_end(struct wl_grab *grab, uint32_t time)
|
||||
{
|
||||
struct wl_drag *drag = container_of(grab, struct wl_drag, grab);
|
||||
|
||||
if (drag->target)
|
||||
wl_resource_post_event(&drag->drag_offer.resource,
|
||||
WL_DRAG_OFFER_DROP);
|
||||
|
||||
wl_drag_set_pointer_focus(drag, NULL, time, 0, 0, 0, 0);
|
||||
}
|
||||
|
||||
static const struct wl_grab_interface drag_grab_interface = {
|
||||
drag_grab_motion,
|
||||
drag_grab_button,
|
||||
drag_grab_end
|
||||
};
|
||||
|
||||
static void
|
||||
drag_activate(struct wl_client *client,
|
||||
struct wl_resource *resource,
|
||||
struct wl_resource *surface_resource,
|
||||
struct wl_resource *device_resource, uint32_t time)
|
||||
{
|
||||
struct wl_drag *drag = resource->data;
|
||||
struct wl_surface *surface = surface_resource->data;
|
||||
struct wl_input_device *device = device_resource->data;
|
||||
struct wl_display *display = wl_client_get_display (client);
|
||||
struct wlsc_surface *target;
|
||||
int32_t sx, sy;
|
||||
|
||||
if (wl_input_device_update_grab(device,
|
||||
&drag->grab, surface, time) < 0)
|
||||
return;
|
||||
|
||||
drag->grab.interface = &drag_grab_interface;
|
||||
|
||||
drag->source = surface;
|
||||
|
||||
drag->drag_offer.resource.object.interface = &wl_drag_offer_interface;
|
||||
drag->drag_offer.resource.object.implementation =
|
||||
(void (**)(void)) &drag_offer_interface;
|
||||
|
||||
wl_display_add_global(display, &wl_drag_offer_interface, drag, NULL);
|
||||
|
||||
target = pick_surface(device, &sx, &sy);
|
||||
wl_input_device_set_pointer_focus(device, NULL, time, 0, 0, 0, 0);
|
||||
wl_drag_set_pointer_focus(drag, &target->surface, time,
|
||||
device->x, device->y, sx, sy);
|
||||
}
|
||||
|
||||
static void
|
||||
drag_destroy(struct wl_client *client, struct wl_resource *resource)
|
||||
{
|
||||
wl_resource_destroy(resource, wlsc_compositor_get_time());
|
||||
}
|
||||
|
||||
static const struct wl_drag_interface drag_interface = {
|
||||
drag_offer,
|
||||
drag_activate,
|
||||
drag_destroy,
|
||||
};
|
||||
|
||||
static void
|
||||
drag_handle_surface_destroy(struct wl_listener *listener,
|
||||
struct wl_resource *resource, uint32_t time)
|
||||
{
|
||||
struct wl_drag *drag =
|
||||
container_of(listener, struct wl_drag, drag_focus_listener);
|
||||
struct wl_surface *surface = (struct wl_surface *) resource;
|
||||
|
||||
if (drag->drag_focus == surface)
|
||||
wl_drag_set_pointer_focus(drag, NULL, time, 0, 0, 0, 0);
|
||||
}
|
||||
|
||||
static void
|
||||
shell_create_drag(struct wl_client *client,
|
||||
struct wl_resource *resource, uint32_t id)
|
||||
{
|
||||
struct wl_drag *drag;
|
||||
|
||||
drag = malloc(sizeof *drag);
|
||||
if (drag == NULL) {
|
||||
wl_resource_post_no_memory(resource);
|
||||
return;
|
||||
}
|
||||
|
||||
memset(drag, 0, sizeof *drag);
|
||||
drag->resource.object.id = id;
|
||||
drag->resource.object.interface = &wl_drag_interface;
|
||||
drag->resource.object.implementation =
|
||||
(void (**)(void)) &drag_interface;
|
||||
|
||||
drag->resource.data = drag;
|
||||
drag->resource.destroy = destroy_drag;
|
||||
|
||||
drag->drag_focus_listener.func = drag_handle_surface_destroy;
|
||||
wl_list_init(&drag->drag_focus_listener.link);
|
||||
|
||||
wl_client_add_resource(client, &drag->resource);
|
||||
}
|
||||
|
||||
static void
|
||||
wlsc_selection_set_focus(struct wlsc_shell *shell,
|
||||
struct wl_selection *selection,
|
||||
struct wl_surface *surface, uint32_t time)
|
||||
{
|
||||
char **p, **end;
|
||||
|
||||
if (selection->selection_focus == surface)
|
||||
return;
|
||||
|
||||
if (selection->selection_focus != NULL)
|
||||
wl_resource_post_event(&selection->selection_offer.resource,
|
||||
WL_SELECTION_OFFER_KEYBOARD_FOCUS,
|
||||
NULL);
|
||||
|
||||
if (surface) {
|
||||
|
||||
selection->selection_offer.resource.client = surface->resource.client;
|
||||
end = selection->types.data + selection->types.size;
|
||||
for (p = selection->types.data; p < end; p++)
|
||||
wl_resource_post_event(&selection->selection_offer.resource,
|
||||
WL_SELECTION_OFFER_OFFER, *p);
|
||||
|
||||
wl_list_remove(&selection->selection_focus_listener.link);
|
||||
wl_list_insert(surface->resource.destroy_listener_list.prev,
|
||||
&selection->selection_focus_listener.link);
|
||||
|
||||
wl_resource_post_event(&selection->selection_offer.resource,
|
||||
WL_SELECTION_OFFER_KEYBOARD_FOCUS,
|
||||
selection->input_device);
|
||||
}
|
||||
|
||||
selection->selection_focus = surface;
|
||||
|
||||
wl_list_remove(&selection->selection_focus_listener.link);
|
||||
if (surface)
|
||||
wl_list_insert(surface->resource.destroy_listener_list.prev,
|
||||
&selection->selection_focus_listener.link);
|
||||
}
|
||||
|
||||
static void
|
||||
selection_offer_receive(struct wl_client *client,
|
||||
struct wl_resource *resource,
|
||||
const char *mime_type, int fd)
|
||||
{
|
||||
struct wl_selection_offer *offer = resource->data;
|
||||
struct wl_selection *selection =
|
||||
container_of(offer, struct wl_selection, selection_offer);
|
||||
|
||||
wl_resource_post_event(&selection->resource,
|
||||
WL_SELECTION_SEND, mime_type, fd);
|
||||
close(fd);
|
||||
}
|
||||
|
||||
static const struct wl_selection_offer_interface selection_offer_interface = {
|
||||
selection_offer_receive
|
||||
};
|
||||
|
||||
static void
|
||||
selection_offer(struct wl_client *client,
|
||||
struct wl_resource *resource, const char *type)
|
||||
{
|
||||
struct wl_selection *selection = resource->data;
|
||||
char **p;
|
||||
|
||||
p = wl_array_add(&selection->types, sizeof *p);
|
||||
if (p)
|
||||
*p = strdup(type);
|
||||
if (!p || !*p)
|
||||
wl_resource_post_no_memory(resource);
|
||||
}
|
||||
|
||||
static void
|
||||
selection_activate(struct wl_client *client,
|
||||
struct wl_resource *resource,
|
||||
struct wl_resource *input_resource, uint32_t time)
|
||||
{
|
||||
struct wl_selection *selection = resource->data;
|
||||
struct wlsc_input_device *wd = input_resource->data;
|
||||
struct wl_display *display = wl_client_get_display (client);
|
||||
struct wlsc_compositor *compositor = wd->compositor;
|
||||
|
||||
selection->input_device = &wd->input_device;
|
||||
|
||||
selection->selection_offer.resource.object.interface =
|
||||
&wl_selection_offer_interface;
|
||||
selection->selection_offer.resource.object.implementation =
|
||||
(void (**)(void)) &selection_offer_interface;
|
||||
|
||||
wl_display_add_global(display,
|
||||
&wl_selection_offer_interface, selection, NULL);
|
||||
|
||||
if (wd->selection) {
|
||||
wl_resource_post_event(&wd->selection->resource,
|
||||
WL_SELECTION_CANCELLED);
|
||||
}
|
||||
wd->selection = selection;
|
||||
|
||||
wlsc_selection_set_focus(compositor->shell, selection,
|
||||
wd->input_device.keyboard_focus, time);
|
||||
}
|
||||
|
||||
static void
|
||||
selection_destroy(struct wl_client *client, struct wl_resource *resource)
|
||||
{
|
||||
wl_resource_destroy(resource, wlsc_compositor_get_time());
|
||||
}
|
||||
|
||||
static const struct wl_selection_interface selection_interface = {
|
||||
selection_offer,
|
||||
selection_activate,
|
||||
selection_destroy
|
||||
};
|
||||
|
||||
static void
|
||||
destroy_selection(struct wl_resource *resource)
|
||||
{
|
||||
struct wl_selection *selection =
|
||||
container_of(resource, struct wl_selection, resource);
|
||||
struct wlsc_input_device *wd =
|
||||
(struct wlsc_input_device *) selection->input_device;
|
||||
struct wlsc_compositor *compositor = wd->compositor;
|
||||
|
||||
if (wd && wd->selection == selection) {
|
||||
wd->selection = NULL;
|
||||
wlsc_selection_set_focus(compositor->shell,
|
||||
selection, NULL,
|
||||
wlsc_compositor_get_time());
|
||||
}
|
||||
|
||||
wl_list_remove(&selection->selection_focus_listener.link);
|
||||
free(selection);
|
||||
}
|
||||
|
||||
static void
|
||||
selection_handle_surface_destroy(struct wl_listener *listener,
|
||||
struct wl_resource *resource, uint32_t time)
|
||||
{
|
||||
}
|
||||
|
||||
static void
|
||||
shell_create_selection(struct wl_client *client,
|
||||
struct wl_resource *resource, uint32_t id)
|
||||
{
|
||||
struct wl_selection *selection;
|
||||
|
||||
selection = malloc(sizeof *selection);
|
||||
if (selection == NULL) {
|
||||
wl_resource_post_no_memory(resource);
|
||||
return;
|
||||
}
|
||||
|
||||
memset(selection, 0, sizeof *selection);
|
||||
selection->resource.object.id = id;
|
||||
selection->resource.object.interface = &wl_selection_interface;
|
||||
selection->resource.object.implementation =
|
||||
(void (**)(void)) &selection_interface;
|
||||
|
||||
selection->client = client;
|
||||
selection->resource.destroy = destroy_selection;
|
||||
selection->selection_focus = NULL;
|
||||
|
||||
selection->selection_focus_listener.func =
|
||||
selection_handle_surface_destroy;
|
||||
wl_list_init(&selection->selection_focus_listener.link);
|
||||
|
||||
wl_client_add_resource(client, &selection->resource);
|
||||
}
|
||||
|
||||
static const struct wl_shell_interface shell_interface = {
|
||||
shell_move,
|
||||
shell_resize,
|
||||
shell_create_drag,
|
||||
shell_create_selection,
|
||||
shell_set_toplevel,
|
||||
shell_set_transient,
|
||||
shell_set_fullscreen
|
||||
@@ -1361,7 +939,6 @@ shell_init(struct wlsc_compositor *ec)
|
||||
shell->shell.unlock = unlock;
|
||||
shell->shell.map = map;
|
||||
shell->shell.configure = configure;
|
||||
shell->shell.set_selection_focus = wlsc_selection_set_focus;
|
||||
|
||||
wl_list_init(&shell->hidden_surface_list);
|
||||
wl_list_init(&shell->backgrounds);
|
||||
|
||||
@@ -632,14 +632,6 @@ home_key_binding(struct wl_input_device *device, uint32_t time,
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
tablet_shell_set_selection_focus(struct wlsc_shell *shell,
|
||||
struct wl_selection *selection,
|
||||
struct wl_surface *surface,
|
||||
uint32_t time)
|
||||
{
|
||||
}
|
||||
|
||||
static void
|
||||
bind_shell(struct wl_client *client, void *data, uint32_t version, uint32_t id)
|
||||
{
|
||||
@@ -699,8 +691,7 @@ shell_init(struct wlsc_compositor *compositor)
|
||||
shell->shell.unlock = tablet_shell_unlock;
|
||||
shell->shell.map = tablet_shell_map;
|
||||
shell->shell.configure = tablet_shell_configure;
|
||||
shell->shell.set_selection_focus =
|
||||
tablet_shell_set_selection_focus;
|
||||
|
||||
launch_ux_daemon(shell);
|
||||
|
||||
tablet_shell_set_state(shell, STATE_STARTING);
|
||||
|
||||
Reference in New Issue
Block a user