aboutsummaryrefslogtreecommitdiffstats
path: root/include/sway/tree
diff options
context:
space:
mode:
authorLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-06-18 20:42:12 +1000
committerLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-06-18 20:42:12 +1000
commit1c89f32533534f6e78c81c95578f40df45bb9016 (patch)
tree98ba154e1cbd5148e9b7178037c26a3dadcec839 /include/sway/tree
parentMerge remote-tracking branch 'upstream/master' into atomic (diff)
downloadsway-1c89f32533534f6e78c81c95578f40df45bb9016.tar.gz
sway-1c89f32533534f6e78c81c95578f40df45bb9016.tar.zst
sway-1c89f32533534f6e78c81c95578f40df45bb9016.zip
Preserve buffers during transactions
* Also fix parts of the rendering where it was rendering the pending state instead of current.
Diffstat (limited to 'include/sway/tree')
-rw-r--r--include/sway/tree/view.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index d0093db5..fc4c8df9 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -72,10 +72,11 @@ struct sway_view {
72 list_t *marks; // char * 72 list_t *marks; // char *
73 list_t *instructions; // struct sway_transaction_instruction * 73 list_t *instructions; // struct sway_transaction_instruction *
74 74
75 // If saved_texture is set, the main surface of the view will render this 75 // If saved_buffer is set, the main surface of the view will render this
76 // texture instead of its own. This is used while waiting for transactions 76 // buffer/texture instead of its own. This is used while waiting for
77 // to complete. 77 // transactions to complete.
78 struct wlr_texture *saved_texture; 78 struct wlr_buffer *saved_buffer;
79 int saved_surface_width, saved_surface_height;
79 80
80 struct wlr_texture *marks_focused; 81 struct wlr_texture *marks_focused;
81 struct wlr_texture *marks_focused_inactive; 82 struct wlr_texture *marks_focused_inactive;