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

data-device: Put the DataDevice implementation in its own struct

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-07-10 10:31:08 -04:00
parent 6fea46e0cf
commit 7c68aaea4c
5 changed files with 71 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -224,7 +224,7 @@ drag_grab_focus (MetaWaylandPointerGrab *grab,
client = wl_resource_get_client (surface->resource); client = wl_resource_get_client (surface->resource);
data_device_resource = wl_resource_find_for_client (&seat->data_device_resource_list, client); data_device_resource = wl_resource_find_for_client (&seat->data_device.resource_list, client);
if (!data_device_resource) if (!data_device_resource)
return; return;
@ -332,7 +332,8 @@ data_device_start_drag (struct wl_client *client,
struct wl_resource *origin_resource, struct wl_resource *origin_resource,
struct wl_resource *icon_resource, guint32 serial) struct wl_resource *icon_resource, guint32 serial)
{ {
MetaWaylandSeat *seat = wl_resource_get_user_data (resource); MetaWaylandDataDevice *data_device = wl_resource_get_user_data (resource);
MetaWaylandSeat *seat = wl_container_of (data_device, seat, data_device);
MetaWaylandDragGrab *drag_grab; MetaWaylandDragGrab *drag_grab;
if ((seat->pointer.button_count == 0 || if ((seat->pointer.button_count == 0 ||
@ -377,68 +378,67 @@ data_device_start_drag (struct wl_client *client,
static void static void
destroy_selection_data_source (struct wl_listener *listener, void *data) destroy_selection_data_source (struct wl_listener *listener, void *data)
{ {
MetaWaylandSeat *seat = MetaWaylandDataDevice *data_device = wl_container_of (listener, data_device, selection_data_source_listener);
wl_container_of (listener, seat, selection_data_source_listener); MetaWaylandSeat *seat = wl_container_of (data_device, seat, data_device);
struct wl_resource *data_device; struct wl_resource *data_device_resource;
struct wl_client *focus_client = NULL; struct wl_client *focus_client = NULL;
seat->selection_data_source = NULL; data_device->selection_data_source = NULL;
focus_client = meta_wayland_keyboard_get_focus_client (&seat->keyboard); focus_client = meta_wayland_keyboard_get_focus_client (&seat->keyboard);
if (focus_client) if (focus_client)
{ {
data_device = wl_resource_find_for_client (&seat->data_device_resource_list, focus_client); data_device_resource = wl_resource_find_for_client (&data_device->resource_list, focus_client);
if (data_device) if (data_device_resource)
wl_data_device_send_selection (data_device, NULL); wl_data_device_send_selection (data_device_resource, NULL);
} }
} }
static void static void
meta_wayland_seat_set_selection (MetaWaylandSeat *seat, meta_wayland_data_device_set_selection (MetaWaylandDataDevice *data_device,
MetaWaylandDataSource *source, MetaWaylandDataSource *source,
guint32 serial) guint32 serial)
{ {
struct wl_resource *data_device, *offer; MetaWaylandSeat *seat = wl_container_of (data_device, seat, data_device);
struct wl_resource *data_device_resource, *offer;
struct wl_client *focus_client; struct wl_client *focus_client;
if (seat->selection_data_source && if (data_device->selection_data_source &&
seat->selection_serial - serial < UINT32_MAX / 2) data_device->selection_serial - serial < UINT32_MAX / 2)
return; return;
if (seat->selection_data_source) if (data_device->selection_data_source)
{ {
wl_data_source_send_cancelled (seat->selection_data_source->resource); wl_data_source_send_cancelled (data_device->selection_data_source->resource);
wl_list_remove (&seat->selection_data_source_listener.link); wl_list_remove (&data_device->selection_data_source_listener.link);
seat->selection_data_source = NULL; data_device->selection_data_source = NULL;
} }
seat->selection_data_source = source; data_device->selection_data_source = source;
seat->selection_serial = serial; data_device->selection_serial = serial;
focus_client = meta_wayland_keyboard_get_focus_client (&seat->keyboard); focus_client = meta_wayland_keyboard_get_focus_client (&seat->keyboard);
if (focus_client) if (focus_client)
{ {
data_device = wl_resource_find_for_client (&seat->data_device_resource_list, focus_client); data_device_resource = wl_resource_find_for_client (&data_device->resource_list, focus_client);
if (data_device) if (data_device_resource)
{ {
if (seat->selection_data_source) if (data_device->selection_data_source)
{ {
offer = meta_wayland_data_source_send_offer (seat->selection_data_source, data_device); offer = meta_wayland_data_source_send_offer (data_device->selection_data_source, data_device_resource);
wl_data_device_send_selection (data_device, offer); wl_data_device_send_selection (data_device_resource, offer);
} }
else else
{ {
wl_data_device_send_selection (data_device, NULL); wl_data_device_send_selection (data_device_resource, NULL);
} }
} }
} }
if (source) if (source)
{ {
seat->selection_data_source_listener.notify = data_device->selection_data_source_listener.notify = destroy_selection_data_source;
destroy_selection_data_source; wl_resource_add_destroy_listener (source->resource, &data_device->selection_data_source_listener);
wl_resource_add_destroy_listener (source->resource,
&seat->selection_data_source_listener);
} }
} }
@ -448,13 +448,16 @@ data_device_set_selection (struct wl_client *client,
struct wl_resource *source_resource, struct wl_resource *source_resource,
guint32 serial) guint32 serial)
{ {
MetaWaylandDataDevice *data_device = wl_resource_get_user_data (resource);
MetaWaylandDataSource *source;
if (!source_resource) if (!source_resource)
return; return;
source = wl_resource_get_user_data (source_resource);
/* FIXME: Store serial and check against incoming serial here. */ /* FIXME: Store serial and check against incoming serial here. */
meta_wayland_seat_set_selection (wl_resource_get_user_data (resource), meta_wayland_data_device_set_selection (data_device, source, serial);
wl_resource_get_user_data (source_resource),
serial);
} }
static const struct wl_data_device_interface data_device_interface = { static const struct wl_data_device_interface data_device_interface = {
@ -500,8 +503,8 @@ get_data_device (struct wl_client *client,
cr = wl_resource_create (client, &wl_data_device_interface, cr = wl_resource_create (client, &wl_data_device_interface,
MIN (META_WL_DATA_DEVICE_VERSION, wl_resource_get_version (manager_resource)), id); MIN (META_WL_DATA_DEVICE_VERSION, wl_resource_get_version (manager_resource)), id);
wl_resource_set_implementation (cr, &data_device_interface, seat, unbind_resource); wl_resource_set_implementation (cr, &data_device_interface, &seat->data_device, unbind_resource);
wl_list_insert (&seat->data_device_resource_list, wl_resource_get_link (cr)); wl_list_insert (&seat->data_device.resource_list, wl_resource_get_link (cr));
} }
static const struct wl_data_device_manager_interface manager_interface = { static const struct wl_data_device_manager_interface manager_interface = {
@ -531,24 +534,31 @@ meta_wayland_data_device_manager_init (MetaWaylandCompositor *compositor)
} }
void void
meta_wayland_data_device_set_keyboard_focus (MetaWaylandSeat *seat) meta_wayland_data_device_init (MetaWaylandDataDevice *data_device)
{ {
wl_list_init (&data_device->resource_list);
}
void
meta_wayland_data_device_set_keyboard_focus (MetaWaylandDataDevice *data_device)
{
MetaWaylandSeat *seat = wl_container_of (data_device, seat, data_device);
struct wl_client *focus_client; struct wl_client *focus_client;
struct wl_resource *data_device, *offer; struct wl_resource *data_device_resource, *offer;
MetaWaylandDataSource *source; MetaWaylandDataSource *source;
focus_client = meta_wayland_keyboard_get_focus_client (&seat->keyboard); focus_client = meta_wayland_keyboard_get_focus_client (&seat->keyboard);
if (!focus_client) if (!focus_client)
return; return;
data_device = wl_resource_find_for_client (&seat->data_device_resource_list, focus_client); data_device_resource = wl_resource_find_for_client (&data_device->resource_list, focus_client);
if (!data_device) if (!data_device_resource)
return; return;
source = seat->selection_data_source; source = data_device->selection_data_source;
if (source) if (source)
{ {
offer = meta_wayland_data_source_send_offer (source, data_device); offer = meta_wayland_data_source_send_offer (source, data_device_resource);
wl_data_device_send_selection (data_device, offer); wl_data_device_send_selection (data_device_resource, offer);
} }
} }

14
src/wayland/meta-wayland-data-device.h
View File

@ -25,10 +25,20 @@
#include <wayland-server.h> #include <wayland-server.h>
#include "meta-wayland-private.h" #include "meta-wayland-types.h"
struct _MetaWaylandDataDevice
{
uint32_t selection_serial;
MetaWaylandDataSource *selection_data_source;
struct wl_listener selection_data_source_listener;
struct wl_list resource_list;
};
void meta_wayland_data_device_manager_init (MetaWaylandCompositor *compositor); void meta_wayland_data_device_manager_init (MetaWaylandCompositor *compositor);
void meta_wayland_data_device_set_keyboard_focus (MetaWaylandSeat *seat); void meta_wayland_data_device_init (MetaWaylandDataDevice *data_device);
void meta_wayland_data_device_set_keyboard_focus (MetaWaylandDataDevice *data_device);
#endif /* META_WAYLAND_DATA_DEVICE_H */ #endif /* META_WAYLAND_DATA_DEVICE_H */

5
src/wayland/meta-wayland-seat.c
View File

@ -100,13 +100,12 @@ meta_wayland_seat_new (struct wl_display *display)
{ {
MetaWaylandSeat *seat = g_new0 (MetaWaylandSeat, 1); MetaWaylandSeat *seat = g_new0 (MetaWaylandSeat, 1);
seat->selection_data_source = NULL;
wl_list_init (&seat->base_resource_list); wl_list_init (&seat->base_resource_list);
wl_list_init (&seat->data_device_resource_list);
meta_wayland_pointer_init (&seat->pointer, display); meta_wayland_pointer_init (&seat->pointer, display);
meta_wayland_keyboard_init (&seat->keyboard, display); meta_wayland_keyboard_init (&seat->keyboard, display);
meta_wayland_touch_init (&seat->touch, display); meta_wayland_touch_init (&seat->touch, display);
meta_wayland_data_device_init (&seat->data_device);
wl_global_create (display, &wl_seat_interface, META_WL_SEAT_VERSION, seat, bind_seat); wl_global_create (display, &wl_seat_interface, META_WL_SEAT_VERSION, seat, bind_seat);
@ -197,7 +196,7 @@ meta_wayland_seat_set_input_focus (MetaWaylandSeat *seat,
MetaWaylandSurface *surface) MetaWaylandSurface *surface)
{ {
meta_wayland_keyboard_set_focus (&seat->keyboard, surface); meta_wayland_keyboard_set_focus (&seat->keyboard, surface);
meta_wayland_data_device_set_keyboard_focus (seat); meta_wayland_data_device_set_keyboard_focus (&seat->data_device);
} }
void void

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

@ -29,19 +29,16 @@
#include "meta-wayland-pointer.h" #include "meta-wayland-pointer.h"
#include "meta-wayland-keyboard.h" #include "meta-wayland-keyboard.h"
#include "meta-wayland-touch.h" #include "meta-wayland-touch.h"
#include "meta-wayland-data-device.h"
struct _MetaWaylandSeat struct _MetaWaylandSeat
{ {
struct wl_list base_resource_list; struct wl_list base_resource_list;
uint32_t selection_serial;
MetaWaylandDataSource *selection_data_source;
struct wl_listener selection_data_source_listener;
struct wl_list data_device_resource_list;
MetaWaylandPointer pointer; MetaWaylandPointer pointer;
MetaWaylandKeyboard keyboard; MetaWaylandKeyboard keyboard;
MetaWaylandTouch touch; MetaWaylandTouch touch;
MetaWaylandDataDevice data_device;
}; };
void meta_wayland_seat_init (MetaWaylandCompositor *compositor); void meta_wayland_seat_init (MetaWaylandCompositor *compositor);

3
src/wayland/meta-wayland-types.h
View File

@ -27,8 +27,9 @@ typedef struct _MetaWaylandPointer MetaWaylandPointer;
typedef struct _MetaWaylandPointerGrab MetaWaylandPointerGrab; typedef struct _MetaWaylandPointerGrab MetaWaylandPointerGrab;
typedef struct _MetaWaylandPointerGrabInterface MetaWaylandPointerGrabInterface; typedef struct _MetaWaylandPointerGrabInterface MetaWaylandPointerGrabInterface;
typedef struct _MetaWaylandKeyboard MetaWaylandKeyboard; typedef struct _MetaWaylandKeyboard MetaWaylandKeyboard;
typedef struct _MetaWaylandDataSource MetaWaylandDataSource;
typedef struct _MetaWaylandTouch MetaWaylandTouch; typedef struct _MetaWaylandTouch MetaWaylandTouch;
typedef struct _MetaWaylandDataSource MetaWaylandDataSource;
typedef struct _MetaWaylandDataDevice MetaWaylandDataDevice;
typedef struct _MetaWaylandBuffer MetaWaylandBuffer; typedef struct _MetaWaylandBuffer MetaWaylandBuffer;
typedef struct _MetaWaylandBufferReference MetaWaylandBufferReference; typedef struct _MetaWaylandBufferReference MetaWaylandBufferReference;