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

seat: Move pointer interface over to MetaWaylandPointer

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-04-17 17:16:17 -04:00
parent f3d88ca1d1
commit 1abdd7be10
3 changed files with 61 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/wayland/meta-wayland-pointer.c
View File

@ -56,6 +56,12 @@
static void meta_wayland_pointer_end_popup_grab (MetaWaylandPointer *pointer); static void meta_wayland_pointer_end_popup_grab (MetaWaylandPointer *pointer);
static void
unbind_resource (struct wl_resource *resource)
{
wl_list_remove (wl_resource_get_link (resource));
}
static void static void
set_cursor_surface (MetaWaylandPointer *pointer, set_cursor_surface (MetaWaylandPointer *pointer,
MetaWaylandSurface *surface) MetaWaylandSurface *surface)
@ -658,9 +664,56 @@ meta_wayland_pointer_update_cursor_surface (MetaWaylandPointer *pointer)
meta_cursor_reference_unref (cursor); meta_cursor_reference_unref (cursor);
} }
void static void
meta_wayland_pointer_set_cursor_surface (MetaWaylandPointer *pointer, pointer_set_cursor (struct wl_client *client,
MetaWaylandSurface *surface) struct wl_resource *resource,
uint32_t serial,
struct wl_resource *surface_resource,
int32_t x, int32_t y)
{ {
MetaWaylandPointer *pointer = wl_resource_get_user_data (resource);
MetaWaylandSurface *surface;
surface = (surface_resource ? wl_resource_get_user_data (surface_resource) : NULL);
if (pointer->focus_surface == NULL)
return;
if (wl_resource_get_client (pointer->focus_surface->resource) != client)
return;
if (pointer->focus_serial - serial > G_MAXUINT32 / 2)
return;
pointer->hotspot_x = x;
pointer->hotspot_y = y;
set_cursor_surface (pointer, surface); set_cursor_surface (pointer, surface);
meta_wayland_pointer_update_cursor_surface (pointer);
}
static void
pointer_release (struct wl_client *client,
struct wl_resource *resource)
{
wl_resource_destroy (resource);
}
static const struct wl_pointer_interface pointer_interface = {
pointer_set_cursor,
pointer_release,
};
void
meta_wayland_pointer_create_new_resource (MetaWaylandPointer *pointer,
struct wl_client *client,
struct wl_resource *seat_resource,
uint32_t id)
{
struct wl_resource *cr;
cr = wl_resource_create (client, &wl_pointer_interface,
MIN (META_WL_POINTER_VERSION, wl_resource_get_version (seat_resource)), id);
wl_resource_set_implementation (cr, &pointer_interface, pointer, unbind_resource);
wl_list_insert (&pointer->resource_list, wl_resource_get_link (cr));
if (pointer->focus_surface && wl_resource_get_client (pointer->focus_surface->resource) == client)
meta_wayland_pointer_set_focus (pointer, pointer->focus_surface);
} }

6
src/wayland/meta-wayland-pointer.h
View File

@ -108,7 +108,9 @@ void
meta_wayland_pointer_update_cursor_surface (MetaWaylandPointer *pointer); meta_wayland_pointer_update_cursor_surface (MetaWaylandPointer *pointer);
void void
meta_wayland_pointer_set_cursor_surface (MetaWaylandPointer *pointer, meta_wayland_pointer_create_new_resource (MetaWaylandPointer *pointer,
MetaWaylandSurface *surface); struct wl_client *client,
struct wl_resource *seat_resource,
uint32_t id);
#endif /* __META_WAYLAND_POINTER_H__ */ #endif /* __META_WAYLAND_POINTER_H__ */

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

@ -48,43 +48,6 @@ unbind_resource (struct wl_resource *resource)
wl_list_remove (wl_resource_get_link (resource)); wl_list_remove (wl_resource_get_link (resource));
} }
static void
pointer_set_cursor (struct wl_client *client,
struct wl_resource *resource,
uint32_t serial,
struct wl_resource *surface_resource,
int32_t x, int32_t y)
{
MetaWaylandPointer *pointer = wl_resource_get_user_data (resource);
MetaWaylandSurface *surface;
surface = (surface_resource ? wl_resource_get_user_data (surface_resource) : NULL);
if (pointer->focus_surface == NULL)
return;
if (wl_resource_get_client (pointer->focus_surface->resource) != client)
return;
if (pointer->focus_serial - serial > G_MAXUINT32 / 2)
return;
pointer->hotspot_x = x;
pointer->hotspot_y = y;
meta_wayland_pointer_set_cursor_surface (pointer, surface);
meta_wayland_pointer_update_cursor_surface (pointer);
}
static void
pointer_release (struct wl_client *client,
struct wl_resource *resource)
{
wl_resource_destroy (resource);
}
static const struct wl_pointer_interface pointer_interface = {
pointer_set_cursor,
pointer_release,
};
static void static void
seat_get_pointer (struct wl_client *client, seat_get_pointer (struct wl_client *client,
struct wl_resource *resource, struct wl_resource *resource,
@ -92,15 +55,8 @@ seat_get_pointer (struct wl_client *client,
{ {
MetaWaylandSeat *seat = wl_resource_get_user_data (resource); MetaWaylandSeat *seat = wl_resource_get_user_data (resource);
MetaWaylandPointer *pointer = &seat->pointer; MetaWaylandPointer *pointer = &seat->pointer;
struct wl_resource *cr;
cr = wl_resource_create (client, &wl_pointer_interface, meta_wayland_pointer_create_new_resource (pointer, client, resource, id);
MIN (META_WL_POINTER_VERSION, wl_resource_get_version (resource)), id);
wl_resource_set_implementation (cr, &pointer_interface, pointer, unbind_resource);
wl_list_insert (&pointer->resource_list, wl_resource_get_link (cr));
if (pointer->focus_surface && wl_resource_get_client (pointer->focus_surface->resource) == client)
meta_wayland_pointer_set_focus (pointer, pointer->focus_surface);
} }
static void static void