diff options
| author | Jason Francis <cycl0ps@tuta.io> | 2019-07-27 19:31:37 -0400 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2019-08-01 19:00:48 +0300 |
| commit | 724b5e1b8d742a8429f4431ae1a55d7d26cb92ae (patch) | |
| tree | 14212da859f218f409c6cd164a9a355212438cff | |
| parent | ce3e413e83ac61880b54d032c7c6408b807ed690 (diff) | |
screencopy: send failed after output disconnect
This prevents screencopy applications from hanging because a failed
event never got sent when the output was disconnected or disabled after
the call to buffer().
| -rw-r--r-- | include/wlr/types/wlr_screencopy_v1.h | 2 | ||||
| -rw-r--r-- | types/wlr_screencopy_v1.c | 28 |
2 files changed, 30 insertions, 0 deletions
diff --git a/include/wlr/types/wlr_screencopy_v1.h b/include/wlr/types/wlr_screencopy_v1.h index a01e4dab..ab81f81a 100644 --- a/include/wlr/types/wlr_screencopy_v1.h +++ b/include/wlr/types/wlr_screencopy_v1.h @@ -43,6 +43,8 @@ struct wlr_screencopy_frame_v1 { struct wlr_output *output; struct wl_listener output_precommit; + struct wl_listener output_destroy; + struct wl_listener output_enable; void *data; }; diff --git a/types/wlr_screencopy_v1.c b/types/wlr_screencopy_v1.c index a6544d76..a535c10d 100644 --- a/types/wlr_screencopy_v1.c +++ b/types/wlr_screencopy_v1.c @@ -31,6 +31,8 @@ static void frame_destroy(struct wlr_screencopy_frame_v1 *frame) { } wl_list_remove(&frame->link); wl_list_remove(&frame->output_precommit.link); + wl_list_remove(&frame->output_destroy.link); + wl_list_remove(&frame->output_enable.link); wl_list_remove(&frame->buffer_destroy.link); // Make the frame resource inert wl_resource_set_user_data(frame->resource, NULL); @@ -88,6 +90,24 @@ static void frame_handle_output_precommit(struct wl_listener *listener, frame_destroy(frame); } +static void frame_handle_output_enable(struct wl_listener *listener, + void *data) { + struct wlr_screencopy_frame_v1 *frame = + wl_container_of(listener, frame, output_enable); + if (!frame->output->enabled) { + zwlr_screencopy_frame_v1_send_failed(frame->resource); + frame_destroy(frame); + } +} + +static void frame_handle_output_destroy(struct wl_listener *listener, + void *data) { + struct wlr_screencopy_frame_v1 *frame = + wl_container_of(listener, frame, output_destroy); + zwlr_screencopy_frame_v1_send_failed(frame->resource); + frame_destroy(frame); +} + static void frame_handle_buffer_destroy(struct wl_listener *listener, void *data) { struct wlr_screencopy_frame_v1 *frame = @@ -145,6 +165,12 @@ static void frame_handle_copy(struct wl_client *client, wl_signal_add(&output->events.precommit, &frame->output_precommit); frame->output_precommit.notify = frame_handle_output_precommit; + wl_signal_add(&output->events.destroy, &frame->output_enable); + frame->output_enable.notify = frame_handle_output_enable; + + wl_signal_add(&output->events.destroy, &frame->output_destroy); + frame->output_destroy.notify = frame_handle_output_destroy; + wl_resource_add_destroy_listener(buffer_resource, &frame->buffer_destroy); frame->buffer_destroy.notify = frame_handle_buffer_destroy; @@ -211,6 +237,8 @@ static void capture_output(struct wl_client *client, wl_list_insert(&manager->frames, &frame->link); wl_list_init(&frame->output_precommit.link); + wl_list_init(&frame->output_enable.link); + wl_list_init(&frame->output_destroy.link); wl_list_init(&frame->buffer_destroy.link); if (output == NULL || !output->enabled) { |