diff options
| author | emersion <contact@emersion.fr> | 2017-10-08 23:29:04 +0200 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2017-10-08 23:29:04 +0200 |
| commit | bceaee6eb78f9c1f5693703adc94b863940c3aa4 (patch) | |
| tree | 661f4c22316306f0479556acf9ff7a5dfae0ccaf | |
| parent | cebb202f7d61e86b957512f3f5fb65507a48152d (diff) | |
Stop listening to cursor surface when manually setting cursor data
| -rw-r--r-- | types/wlr_output.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/types/wlr_output.c b/types/wlr_output.c index 09117441..2b78f728 100644 --- a/types/wlr_output.c +++ b/types/wlr_output.c @@ -120,9 +120,9 @@ void wlr_output_transform(struct wlr_output *output, wlr_output_update_matrix(output); } -bool wlr_output_set_cursor(struct wlr_output *output, - const uint8_t *buf, int32_t stride, uint32_t width, uint32_t height, - int32_t hotspot_x, int32_t hotspot_y) { +static bool set_cursor(struct wlr_output *output, const uint8_t *buf, + int32_t stride, uint32_t width, uint32_t height, int32_t hotspot_x, + int32_t hotspot_y) { if (output->impl->set_cursor && output->impl->set_cursor(output, buf, stride, width, height, hotspot_x, hotspot_y)) { @@ -158,6 +158,18 @@ bool wlr_output_set_cursor(struct wlr_output *output, WL_SHM_FORMAT_ARGB8888, stride, width, height, buf); } +bool wlr_output_set_cursor(struct wlr_output *output, + const uint8_t *buf, int32_t stride, uint32_t width, uint32_t height, + int32_t hotspot_x, int32_t hotspot_y) { + if (output->cursor.surface) { + wl_list_remove(&output->cursor.surface_commit.link); + wl_list_remove(&output->cursor.surface_destroy.link); + output->cursor.surface = NULL; + } + + return set_cursor(output, buf, stride, width, height, hotspot_x, hotspot_y); +} + static void handle_cursor_surface_commit(struct wl_listener *listener, void *data) { struct wlr_output *output = wl_container_of(listener, output, |