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

wayland-seat: Fix pointer issues

Browse Source 
Moving the mouse over weston-terminal, we can see several issues:

 * it often updates late, or not at all
 * the attachment of the pointer sprite is wrong

These are because we willy-nilly call seat_update_sprite all over the
place, and often in wrong areas. Set up a set_pointer_surface helper
method that will do the right thing for us in all cases, and call it
on transitions.
This commit is contained in:
Jasper St. Pierre 2014-02-01 17:18:21 -05:00
parent 92e36e7076
commit fdeb72224c
1 changed files with 21 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,16 +48,19 @@ unbind_resource (struct wl_resource *resource)
}
static void
pointer_unmap_sprite (MetaWaylandSeat *seat)
set_cursor_surface (MetaWaylandSeat *seat,
MetaWaylandSurface *surface)
{
if (seat->cursor_tracker)
meta_cursor_tracker_set_window_cursor (seat->cursor_tracker, NULL, 0, 0);
if (seat->sprite == surface)
return;
if (seat->sprite)
{
wl_list_remove (&seat->sprite_destroy_listener.link);
seat->sprite = NULL;
}
seat->sprite = surface;
if (seat->sprite)
wl_resource_add_destroy_listener (seat->sprite->resource, &seat->sprite_destroy_listener);
}
void
@ -68,7 +71,7 @@ meta_wayland_seat_update_sprite (MetaWaylandSeat *seat)
if (seat->cursor_tracker == NULL)
return;
if (seat->sprite->buffer_ref.buffer)
if (seat->sprite && seat->sprite->buffer_ref.buffer)
buffer = seat->sprite->buffer_ref.buffer->resource;
else
buffer = NULL;
@ -89,9 +92,7 @@ pointer_set_cursor (struct wl_client *client,
MetaWaylandSeat *seat = wl_resource_get_user_data (resource);
MetaWaylandSurface *surface;
surface = (surface_resource ?
wl_resource_get_user_data (surface_resource) :
NULL);
surface = (surface_resource ? wl_resource_get_user_data (surface_resource) : NULL);
if (seat->pointer.focus == NULL)
return;
@ -102,27 +103,11 @@ pointer_set_cursor (struct wl_client *client,
seat->hotspot_x = x;
seat->hotspot_y = y;
if (seat->sprite != surface)
{
pointer_unmap_sprite (seat);
if (!surface)
return;
wl_resource_add_destroy_listener (surface->resource,
&seat->sprite_destroy_listener);
seat->sprite = surface;
if (seat->sprite->buffer_ref.buffer)
set_cursor_surface (seat, surface);
meta_wayland_seat_update_sprite (seat);
}
}
static const struct wl_pointer_interface
pointer_interface =
{
static const struct wl_pointer_interface pointer_interface = {
pointer_set_cursor
};
@ -211,10 +196,10 @@ bind_seat (struct wl_client *client,
static void
pointer_handle_sprite_destroy (struct wl_listener *listener, void *data)
{
MetaWaylandSeat *seat =
wl_container_of (listener, seat, sprite_destroy_listener);
MetaWaylandSeat *seat = wl_container_of (listener, seat, sprite_destroy_listener);
pointer_unmap_sprite (seat);
set_cursor_surface (seat, NULL);
meta_wayland_seat_update_sprite (seat);
}
MetaWaylandSeat *
@ -457,7 +442,7 @@ meta_wayland_seat_repick (MetaWaylandSeat *seat,
void
meta_wayland_seat_free (MetaWaylandSeat *seat)
{
pointer_unmap_sprite (seat);
set_cursor_surface (seat, NULL);
meta_wayland_pointer_release (&seat->pointer);
meta_wayland_keyboard_release (&seat->keyboard);