fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2026-01-04 01:40:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move wl_data_device implementation to wayland-server

Browse source
This commit is contained in:
Kristian Høgsberg 2012-01-04 21:47:30 -05:00
parent faf1fee64f
commit dade64968c
5 changed files with 16 additions and 531 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Makefile.am
View file

@ -16,7 +16,6 @@ weston_SOURCES = \
compositor.c \
compositor.h \
image-loader.c \
data-device.c \
screenshooter.c \
screenshooter-protocol.c \
screenshooter-server-protocol.h \

8
src/compositor.c
View file

@ -1227,7 +1227,7 @@ weston_surface_activate(struct weston_surface *surface,
weston_surface_raise(surface);
wl_input_device_set_keyboard_focus(&device->input_device,
&surface->surface, time);
weston_data_device_set_keyboard_focus(device);
wl_data_device_set_keyboard_focus(&device->input_device);
}
WL_EXPORT void
@ -1600,7 +1600,6 @@ weston_input_device_init(struct weston_input_device *device,
struct weston_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);
@ -1614,9 +1613,6 @@ weston_input_device_init(struct weston_input_device *device,
device->num_tp = 0;
wl_list_insert(ec->input_device_list.prev, &device->link);
device->selection_data_source = NULL;
wl_list_init(&device->selection_listener_list);
}
WL_EXPORT void
@ -1947,7 +1943,7 @@ weston_compositor_init(struct weston_compositor *ec, struct wl_display *display)
ec->screenshooter = screenshooter_create(ec);
weston_data_device_manager_init(ec);
wl_data_device_manager_init(ec->wl_display);
glActiveTexture(GL_TEXTURE0);

43
src/compositor.h
View file

@ -96,12 +96,6 @@ struct weston_output {
void (*destroy)(struct weston_output *output);
};
struct weston_selection_listener {
void (*func)(struct weston_selection_listener *listener,
struct weston_input_device *device);
struct wl_list link;
};
struct weston_input_device {
struct wl_input_device input_device;
struct weston_compositor *compositor;
@ -110,17 +104,6 @@ struct weston_input_device {
struct wl_list link;
uint32_t modifier_state;
struct wl_list drag_resource_list;
struct weston_data_source *drag_data_source;
struct wl_surface *drag_focus;
struct wl_resource *drag_focus_resource;
struct wl_listener drag_focus_listener;
struct wl_grab drag_grab;
struct weston_data_source *selection_data_source;
struct wl_listener selection_data_source_listener;
struct wl_list selection_listener_list;
uint32_t num_tp;
struct wl_surface *touch_focus;
struct wl_listener touch_focus_listener;
@ -276,27 +259,6 @@ struct weston_surface {
struct wl_listener buffer_destroy_listener;
};
struct weston_data_offer {
struct wl_resource resource;
struct weston_data_source *source;
struct wl_listener source_destroy_listener;
};
struct weston_data_source {
struct wl_resource resource;
struct wl_array mime_types;
const struct wl_data_offer_interface *offer_interface;
void (*cancel)(struct weston_data_source *source);
};
void
weston_data_source_unref(struct weston_data_source *source);
void
weston_input_device_set_selection(struct weston_input_device *device,
struct weston_data_source *source,
uint32_t time);
void
weston_device_repick(struct wl_input_device *device, uint32_t time);
@ -468,11 +430,6 @@ weston_client_launch(struct weston_compositor *compositor,
const char *path,
weston_process_cleanup_func_t cleanup);
int
weston_data_device_manager_init(struct weston_compositor *compositor);
void
weston_data_device_set_keyboard_focus(struct weston_input_device *device);
void
weston_watch_process(struct weston_process *process);

465
src/data-device.c
View file

@ -1,465 +0,0 @@
/*
* 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"
static void
data_offer_accept(struct wl_client *client, struct wl_resource *resource,
uint32_t time, const char *mime_type)
{
struct weston_data_offer *offer = 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? */
if (offer->source)
wl_resource_post_event(&offer->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 weston_data_offer *offer = resource->data;
if (offer->source)
wl_resource_post_event(&offer->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, weston_compositor_get_time());
}
static void
destroy_data_offer(struct wl_resource *resource)
{
struct weston_data_offer *offer = resource->data;
wl_list_remove(&offer->source_destroy_listener.link);
free(offer);
}
static const struct wl_data_offer_interface data_offer_interface = {
data_offer_accept,
data_offer_receive,
data_offer_destroy,
};
static void
destroy_offer_data_source(struct wl_listener *listener,
struct wl_resource *resource, uint32_t time)
{
struct weston_data_offer *offer = resource->data;
offer->source = NULL;
}
static void
data_source_cancel(struct weston_data_source *source)
{
wl_resource_post_event(&source->resource, WL_DATA_SOURCE_CANCELLED);
}
static struct wl_resource *
weston_data_source_send_offer(struct weston_data_source *source,
struct wl_resource *target)
{
struct weston_data_offer *offer;
char **p, **end;
offer = malloc(sizeof *offer);
if (offer == NULL)
return NULL;
offer->resource.destroy = destroy_data_offer;
offer->resource.object.id = 0;
offer->resource.object.interface = &wl_data_offer_interface;
offer->resource.object.implementation =
(void (**)(void)) source->offer_interface;
offer->resource.data = offer;
wl_list_init(&offer->resource.destroy_listener_list);
offer->source = source;
offer->source_destroy_listener.func = destroy_offer_data_source;
wl_list_insert(&source->resource.destroy_listener_list,
&offer->source_destroy_listener.link);
wl_client_add_resource(target->client, &offer->resource);
wl_resource_post_event(target,
WL_DATA_DEVICE_DATA_OFFER, &offer->resource);
end = source->mime_types.data + source->mime_types.size;
for (p = source->mime_types.data; p < end; p++)
wl_resource_post_event(&offer->resource,
WL_DATA_OFFER_OFFER, *p);
return &offer->resource;
}
static void
data_source_offer(struct wl_client *client,
struct wl_resource *resource,
const char *type)
{
struct weston_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, weston_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 weston_input_device *device =
container_of(listener, struct weston_input_device,
drag_focus_listener);
device->drag_focus_resource = NULL;
}
static void
drag_grab_focus(struct wl_grab *grab, uint32_t time,
struct wl_surface *surface, int32_t x, int32_t y)
{
struct weston_input_device *device =
container_of(grab, struct weston_input_device, drag_grab);
struct wl_resource *resource, *offer;
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 = weston_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;
grab->focus = surface;
}
}
static void
drag_grab_motion(struct wl_grab *grab,
uint32_t time, int32_t x, int32_t y)
{
struct weston_input_device *device =
container_of(grab, struct weston_input_device, drag_grab);
if (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)
{
struct weston_input_device *device =
container_of(grab, struct weston_input_device, drag_grab);
if (device->drag_focus_resource &&
device->input_device.grab_button == button && state == 0)
wl_resource_post_event(device->drag_focus_resource,
WL_DATA_DEVICE_DROP);
if (device->input_device.button_count == 0 && state == 0) {
wl_input_device_end_grab(&device->input_device, time);
device->drag_data_source = NULL;
}
}
static const struct wl_grab_interface drag_grab_interface = {
drag_grab_focus,
drag_grab_motion,
drag_grab_button,
};
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 weston_input_device *device = resource->data;
/* 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. */
device->drag_grab.interface = &drag_grab_interface;
device->drag_data_source = source_resource->data;
wl_input_device_start_grab(&device->input_device,
&device->drag_grab, time);
}
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 weston_input_device *device =
container_of(listener, struct weston_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);
}
}
void
weston_input_device_set_selection(struct weston_input_device *device,
struct weston_data_source *source, uint32_t time)
{
struct wl_resource *data_device, *focus, *offer;
struct weston_selection_listener *listener, *next;
if (device->selection_data_source) {
device->selection_data_source->cancel(device->selection_data_source);
wl_list_remove(&device->selection_data_source_listener.link);
device->selection_data_source = NULL;
}
device->selection_data_source = source;
focus = device->input_device.keyboard_focus_resource;
if (focus) {
data_device = find_resource(&device->drag_resource_list,
focus->client);
if (data_device) {
offer = weston_data_source_send_offer(device->selection_data_source,
data_device);
wl_resource_post_event(data_device,
WL_DATA_DEVICE_SELECTION,
offer);
}
}
wl_list_for_each_safe(listener, next,
&device->selection_listener_list, link)
listener->func(listener, device);
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 void
data_device_set_selection(struct wl_client *client,
struct wl_resource *resource,
struct wl_resource *source_resource, uint32_t time)
{
if (!source_resource)
return;
weston_input_device_set_selection(resource->data,
source_resource->data, time);
}
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 weston_data_source *source =
container_of(resource, struct weston_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;
}
static void
create_data_source(struct wl_client *client,
struct wl_resource *resource, uint32_t id)
{
struct weston_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;
wl_list_init(&source->resource.destroy_listener_list);
source->offer_interface = &data_offer_interface;
source->cancel = data_source_cancel;
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 weston_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
weston_data_device_set_keyboard_focus(struct weston_input_device *device)
{
struct wl_resource *data_device, *focus, *offer;
struct weston_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 = weston_data_source_send_offer(source, data_device);
wl_resource_post_event(data_device,
WL_DATA_DEVICE_SELECTION, offer);
}
}
WL_EXPORT int
weston_data_device_manager_init(struct weston_compositor *compositor)
{
if (wl_display_add_global(compositor->wl_display,
&wl_data_device_manager_interface,
NULL, bind_manager) == NULL)
return -1;
return 0;
}

30
src/xserver-launcher.c
View file

@ -81,7 +81,7 @@ struct weston_wm {
xcb_timestamp_t selection_timestamp;
int selection_property_set;
int flush_property_on_delete;
struct weston_selection_listener selection_listener;
struct wl_selection_listener selection_listener;
struct {
xcb_atom_t wm_protocols;
@ -244,7 +244,7 @@ static void
data_offer_receive(struct wl_client *client, struct wl_resource *resource,
const char *mime_type, int32_t fd)
{
struct weston_data_offer *offer = resource->data;
struct wl_data_offer *offer = resource->data;
struct weston_wm *wm = offer->source->resource.data;
if (strcmp(mime_type, "text/plain;charset=utf-8") == 0) {
@ -278,15 +278,15 @@ static const struct wl_data_offer_interface data_offer_interface = {
};
static void
data_source_cancel(struct weston_data_source *source)
data_source_cancel(struct wl_data_source *source)
{
}
static void
weston_wm_get_selection_targets(struct weston_wm *wm)
{
struct weston_data_source *source;
struct weston_input_device *device;
struct wl_data_source *source;
struct wl_input_device *device;
xcb_get_property_cookie_t cookie;
xcb_get_property_reply_t *reply;
xcb_atom_t *value;
@ -329,10 +329,9 @@ weston_wm_get_selection_targets(struct weston_wm *wm)
}
}
device = (struct weston_input_device *)
wm->server->compositor->input_device;
weston_input_device_set_selection(device, source,
weston_compositor_get_time());
device = wm->server->compositor->input_device;
wl_input_device_set_selection(device, source,
weston_compositor_get_time());
free(reply);
}
@ -448,12 +447,12 @@ weston_wm_get_incr_chunk(struct weston_wm *wm)
}
static void
weston_wm_set_selection(struct weston_selection_listener *listener,
struct weston_input_device *device)
weston_wm_set_selection(struct wl_selection_listener *listener,
struct wl_input_device *device)
{
struct weston_wm *wm =
container_of(listener, struct weston_wm, selection_listener);
struct weston_data_source *source = device->selection_data_source;
struct wl_data_source *source = device->selection_data_source;
const char **p, **end;
int has_text_plain = 0;
@ -835,8 +834,7 @@ weston_wm_read_data_source(int fd, uint32_t mask, void *data)
static void
weston_wm_send_data(struct weston_wm *wm, xcb_atom_t target, const char *mime_type)
{
struct weston_input_device *device = (struct weston_input_device *)
wm->server->compositor->input_device;
struct wl_input_device *device = wm->server->compositor->input_device;
int p[2];
if (pipe2(p, O_CLOEXEC | O_NONBLOCK) == -1) {
@ -1188,7 +1186,7 @@ wxs_wm_get_resources(struct weston_wm *wm)
static struct weston_wm *
weston_wm_create(struct weston_xserver *wxs)
{
struct weston_input_device *device;
struct wl_input_device *device;
struct weston_wm *wm;
struct wl_event_loop *loop;
xcb_screen_iterator_t s;
@ -1272,7 +1270,7 @@ weston_wm_create(struct weston_xserver *wxs)
xcb_flush(wm->conn);
device = (struct weston_input_device *) wxs->compositor->input_device;
device = wxs->compositor->input_device;
wm->selection_listener.func = weston_wm_set_selection;
wl_list_insert(&device->selection_listener_list,
&wm->selection_listener.link);