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

wayland-seat: Rename sprite to cursor_surface

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-02-01 17:55:03 -05:00
parent fdeb72224c
commit 13651949ed
3 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,28 +51,29 @@ static void
set_cursor_surface (MetaWaylandSeat *seat, set_cursor_surface (MetaWaylandSeat *seat,
MetaWaylandSurface *surface) MetaWaylandSurface *surface)
{ {
if (seat->sprite == surface) if (seat->cursor_surface == surface)
return; return;
if (seat->sprite) if (seat->cursor_surface)
wl_list_remove (&seat->sprite_destroy_listener.link); wl_list_remove (&seat->cursor_surface_destroy_listener.link);
seat->sprite = surface; seat->cursor_surface = surface;
if (seat->sprite) if (seat->cursor_surface)
wl_resource_add_destroy_listener (seat->sprite->resource, &seat->sprite_destroy_listener); wl_resource_add_destroy_listener (seat->cursor_surface->resource,
&seat->cursor_surface_destroy_listener);
} }
void void
meta_wayland_seat_update_sprite (MetaWaylandSeat *seat) meta_wayland_seat_update_cursor_surface (MetaWaylandSeat *seat)
{ {
struct wl_resource *buffer; struct wl_resource *buffer;
if (seat->cursor_tracker == NULL) if (seat->cursor_tracker == NULL)
return; return;
if (seat->sprite && seat->sprite->buffer_ref.buffer) if (seat->cursor_surface && seat->cursor_surface->buffer_ref.buffer)
buffer = seat->sprite->buffer_ref.buffer->resource; buffer = seat->cursor_surface->buffer_ref.buffer->resource;
else else
buffer = NULL; buffer = NULL;
@ -104,7 +105,7 @@ pointer_set_cursor (struct wl_client *client,
seat->hotspot_x = x; seat->hotspot_x = x;
seat->hotspot_y = y; seat->hotspot_y = y;
set_cursor_surface (seat, surface); set_cursor_surface (seat, surface);
meta_wayland_seat_update_sprite (seat); meta_wayland_seat_update_cursor_surface (seat);
} }
static const struct wl_pointer_interface pointer_interface = { static const struct wl_pointer_interface pointer_interface = {
@ -194,12 +195,12 @@ bind_seat (struct wl_client *client,
} }
static void static void
pointer_handle_sprite_destroy (struct wl_listener *listener, void *data) pointer_handle_cursor_surface_destroy (struct wl_listener *listener, void *data)
{ {
MetaWaylandSeat *seat = wl_container_of (listener, seat, sprite_destroy_listener); MetaWaylandSeat *seat = wl_container_of (listener, seat, cursor_surface_destroy_listener);
set_cursor_surface (seat, NULL); set_cursor_surface (seat, NULL);
meta_wayland_seat_update_sprite (seat); meta_wayland_seat_update_cursor_surface (seat);
} }
MetaWaylandSeat * MetaWaylandSeat *
@ -220,8 +221,8 @@ meta_wayland_seat_new (struct wl_display *display,
seat->current_stage = 0; seat->current_stage = 0;
seat->sprite = NULL; seat->cursor_surface = NULL;
seat->sprite_destroy_listener.notify = pointer_handle_sprite_destroy; seat->cursor_surface_destroy_listener.notify = pointer_handle_cursor_surface_destroy;
seat->hotspot_x = 16; seat->hotspot_x = 16;
seat->hotspot_y = 16; seat->hotspot_y = 16;

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

@ -66,9 +66,9 @@ struct _MetaWaylandSeat
struct wl_display *display; struct wl_display *display;
MetaCursorTracker *cursor_tracker; MetaCursorTracker *cursor_tracker;
MetaWaylandSurface *sprite; MetaWaylandSurface *cursor_surface;
int hotspot_x, hotspot_y; int hotspot_x, hotspot_y;
struct wl_listener sprite_destroy_listener; struct wl_listener cursor_surface_destroy_listener;
ClutterActor *current_stage; ClutterActor *current_stage;
}; };
@ -90,7 +90,7 @@ meta_wayland_seat_repick (MetaWaylandSeat *seat,
const ClutterEvent *for_event); const ClutterEvent *for_event);
void void
meta_wayland_seat_update_sprite (MetaWaylandSeat *seat); meta_wayland_seat_update_cursor_surface (MetaWaylandSeat *seat);
void void
meta_wayland_seat_free (MetaWaylandSeat *seat); meta_wayland_seat_free (MetaWaylandSeat *seat);

4
src/wayland/meta-wayland-surface.c
View File

@ -254,7 +254,7 @@ cursor_surface_commit (MetaWaylandSurface *surface,
gboolean buffer_changed) gboolean buffer_changed)
{ {
if (buffer_changed) if (buffer_changed)
meta_wayland_seat_update_sprite (surface->compositor->seat); meta_wayland_seat_update_cursor_surface (surface->compositor->seat);
} }
static void static void
@ -455,7 +455,7 @@ commit_double_buffered_state (MetaWaylandSurface *surface,
buffer_changed = TRUE; buffer_changed = TRUE;
} }
if (surface == compositor->seat->sprite) if (surface == compositor->seat->cursor_surface)
cursor_surface_commit (surface, pending, buffer_changed); cursor_surface_commit (surface, pending, buffer_changed);
else if (surface->window) else if (surface->window)
toplevel_surface_commit (surface, pending, buffer_changed); toplevel_surface_commit (surface, pending, buffer_changed);