diff options
author | Simon Ser <contact@emersion.fr> | 2020-02-28 12:42:35 +0100 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2020-03-06 23:57:43 +0100 |
commit | 9d0aa0cb839624265c366281922a58708a9bcb9a (patch) | |
tree | a8c62e92b8cd13b37ba37d1a563843fb6339b085 | |
parent | Drop sway_output.surface_needs_frame (diff) | |
download | sway-9d0aa0cb839624265c366281922a58708a9bcb9a.tar.gz sway-9d0aa0cb839624265c366281922a58708a9bcb9a.tar.zst sway-9d0aa0cb839624265c366281922a58708a9bcb9a.zip |
Use wlr_client_buffer
Update for breaking changes in [1].
[1]: https://github.com/swaywm/wlroots/pull/2043
-rw-r--r-- | include/sway/tree/view.h | 2 | ||||
-rw-r--r-- | sway/desktop/output.c | 2 | ||||
-rw-r--r-- | sway/tree/view.c | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h index 29c87967..4d3532d2 100644 --- a/include/sway/tree/view.h +++ b/include/sway/tree/view.h | |||
@@ -80,7 +80,7 @@ struct sway_view { | |||
80 | bool allow_request_urgent; | 80 | bool allow_request_urgent; |
81 | struct wl_event_source *urgent_timer; | 81 | struct wl_event_source *urgent_timer; |
82 | 82 | ||
83 | struct wlr_buffer *saved_buffer; | 83 | struct wlr_client_buffer *saved_buffer; |
84 | int saved_buffer_width, saved_buffer_height; | 84 | int saved_buffer_width, saved_buffer_height; |
85 | 85 | ||
86 | // The geometry for whatever the client is committing, regardless of | 86 | // The geometry for whatever the client is committing, regardless of |
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index b78e0819..ec3d6424 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c | |||
@@ -501,7 +501,7 @@ static bool scan_out_fullscreen_view(struct sway_output *output, | |||
501 | wlr_presentation_surface_sampled_on_output(server.presentation, surface, | 501 | wlr_presentation_surface_sampled_on_output(server.presentation, surface, |
502 | wlr_output); | 502 | wlr_output); |
503 | 503 | ||
504 | if (!wlr_output_attach_buffer(wlr_output, surface->buffer)) { | 504 | if (!wlr_output_attach_buffer(wlr_output, &surface->buffer->base)) { |
505 | return false; | 505 | return false; |
506 | } | 506 | } |
507 | return wlr_output_commit(wlr_output); | 507 | return wlr_output_commit(wlr_output); |
diff --git a/sway/tree/view.c b/sway/tree/view.c index 04ff4b57..da8822c3 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c | |||
@@ -1154,7 +1154,7 @@ void view_remove_saved_buffer(struct sway_view *view) { | |||
1154 | if (!sway_assert(view->saved_buffer, "Expected a saved buffer")) { | 1154 | if (!sway_assert(view->saved_buffer, "Expected a saved buffer")) { |
1155 | return; | 1155 | return; |
1156 | } | 1156 | } |
1157 | wlr_buffer_unref(view->saved_buffer); | 1157 | wlr_buffer_unref(&view->saved_buffer->base); |
1158 | view->saved_buffer = NULL; | 1158 | view->saved_buffer = NULL; |
1159 | } | 1159 | } |
1160 | 1160 | ||
@@ -1163,7 +1163,8 @@ void view_save_buffer(struct sway_view *view) { | |||
1163 | view_remove_saved_buffer(view); | 1163 | view_remove_saved_buffer(view); |
1164 | } | 1164 | } |
1165 | if (view->surface && wlr_surface_has_buffer(view->surface)) { | 1165 | if (view->surface && wlr_surface_has_buffer(view->surface)) { |
1166 | view->saved_buffer = wlr_buffer_ref(view->surface->buffer); | 1166 | wlr_buffer_ref(&view->surface->buffer->base); |
1167 | view->saved_buffer = view->surface->buffer; | ||
1167 | view->saved_buffer_width = view->surface->current.width; | 1168 | view->saved_buffer_width = view->surface->current.width; |
1168 | view->saved_buffer_height = view->surface->current.height; | 1169 | view->saved_buffer_height = view->surface->current.height; |
1169 | } | 1170 | } |