mainnika
/
weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "clients/window: atomically update pointer cursor"

Browse Source 
This reverts commit 992ee045f1.

Recreating the surface for every cursor change causes flickering
cursors on some compositors, and is not the best way to achieve
atomic cursor updates

Signed-off-by: Derek Foreman <derek.foreman@collabora.com>
(cherry picked from commit ebbe30df3c)
dev
Derek Foreman 2 years ago committed by Marius Vlad
parent 2f6a824f04
commit c32e3c6bc0
1 changed files with 5 additions and 14 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 17
      clients/window.c

17
clients/window.c
Unescape View File

@ -3788,8 +3788,6 @@ input_set_pointer_image_index(struct input *input, int index)
struct wl_buffer *buffer; struct wl_buffer *buffer;
struct wl_cursor *cursor; struct wl_cursor *cursor;
struct wl_cursor_image *image; struct wl_cursor_image *image;
struct wl_surface *prev_surface;
struct display *d = input->display;
if (!input->pointer) if (!input->pointer)
return; return;
@ -3808,11 +3806,6 @@ input_set_pointer_image_index(struct input *input, int index)
if (!buffer) if (!buffer)
return; return;
/* Don't re-use the previous surface, otherwise the new buffer and the
* new hotspot aren't applied atomically. */
prev_surface = input->pointer_surface;
input->pointer_surface = wl_compositor_create_surface(d->compositor);
wl_surface_attach(input->pointer_surface, buffer, 0, 0); wl_surface_attach(input->pointer_surface, buffer, 0, 0);
wl_surface_damage(input->pointer_surface, 0, 0, wl_surface_damage(input->pointer_surface, 0, 0,
image->width, image->height); image->width, image->height);
@ -3820,9 +3813,6 @@ input_set_pointer_image_index(struct input *input, int index)
wl_pointer_set_cursor(input->pointer, input->pointer_enter_serial, wl_pointer_set_cursor(input->pointer, input->pointer_enter_serial,
input->pointer_surface, input->pointer_surface,
image->hotspot_x, image->hotspot_y); image->hotspot_x, image->hotspot_y);
if (prev_surface)
wl_surface_destroy(prev_surface);
} }
static const struct wl_callback_listener pointer_surface_listener; static const struct wl_callback_listener pointer_surface_listener;
@ -3927,11 +3917,11 @@ pointer_surface_frame_callback(void *data, struct wl_callback *callback,
time - input->cursor_anim_start, time - input->cursor_anim_start,
&duration); &duration);
input_set_pointer_image_index(input, i);
if (cursor->image_count > 1) if (cursor->image_count > 1)
schedule_pointer_image_update(input, cursor, duration, schedule_pointer_image_update(input, cursor, duration,
force_frame); force_frame);
input_set_pointer_image_index(input, i);
} }
static void static void
@ -5932,6 +5922,8 @@ display_add_input(struct display *d, uint32_t id, int display_seat_version)
input); input);
} }
input->pointer_surface = wl_compositor_create_surface(d->compositor);
toytimer_init(&input->cursor_timer, CLOCK_MONOTONIC, d, toytimer_init(&input->cursor_timer, CLOCK_MONOTONIC, d,
cursor_timer_func); cursor_timer_func);
@ -5999,7 +5991,6 @@ input_destroy(struct input *input)
fini_xkb(input); fini_xkb(input);
if (input->pointer_surface)
wl_surface_destroy(input->pointer_surface); wl_surface_destroy(input->pointer_surface);
wl_list_remove(&input->link); wl_list_remove(&input->link);

Write Preview
Loading…
Cancel
Save