diff options
author | Ryan Dwyer <RyanDwyer@users.noreply.github.com> | 2018-08-02 23:05:49 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-02 23:05:49 +1000 |
commit | 706c0fbe2376e15f8140be60f3c8b0713128ebba (patch) | |
tree | ffefcdd261970549f8b83adae8d93b6c3b9ebbbb /include | |
parent | swaynag: don't drop \n for first line (diff) | |
parent | Merge pull request #2404 from RyanDwyer/move-containers-when-workspace-focused (diff) | |
download | sway-706c0fbe2376e15f8140be60f3c8b0713128ebba.tar.gz sway-706c0fbe2376e15f8140be60f3c8b0713128ebba.tar.zst sway-706c0fbe2376e15f8140be60f3c8b0713128ebba.zip |
Merge branch 'master' into nagbar
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/desktop/transaction.h | 13 | ||||
-rw-r--r-- | include/sway/tree/view.h | 7 |
2 files changed, 7 insertions, 13 deletions
diff --git a/include/sway/desktop/transaction.h b/include/sway/desktop/transaction.h index cee4afed..56361d94 100644 --- a/include/sway/desktop/transaction.h +++ b/include/sway/desktop/transaction.h | |||
@@ -42,17 +42,4 @@ void transaction_notify_view_ready(struct sway_view *view, uint32_t serial); | |||
42 | void transaction_notify_view_ready_by_size(struct sway_view *view, | 42 | void transaction_notify_view_ready_by_size(struct sway_view *view, |
43 | int width, int height); | 43 | int width, int height); |
44 | 44 | ||
45 | /** | ||
46 | * Get the saved texture that should be rendered for a view. | ||
47 | * | ||
48 | * The addresses pointed at by the width and height pointers will be populated | ||
49 | * with the surface's dimensions, which may be different to the texture's | ||
50 | * dimensions if output scaling is used. | ||
51 | * | ||
52 | * This function should only be called if it is known that the view has | ||
53 | * instructions. | ||
54 | */ | ||
55 | struct wlr_texture *transaction_get_saved_texture(struct sway_view *view, | ||
56 | int *width, int *height); | ||
57 | |||
58 | #endif | 45 | #endif |
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h index 620c41e0..37fd02bc 100644 --- a/include/sway/tree/view.h +++ b/include/sway/tree/view.h | |||
@@ -85,6 +85,9 @@ struct sway_view { | |||
85 | bool allow_request_urgent; | 85 | bool allow_request_urgent; |
86 | struct wl_event_source *urgent_timer; | 86 | struct wl_event_source *urgent_timer; |
87 | 87 | ||
88 | struct wlr_buffer *saved_buffer; | ||
89 | int saved_buffer_width, saved_buffer_height; | ||
90 | |||
88 | bool destroying; | 91 | bool destroying; |
89 | 92 | ||
90 | list_t *executed_criteria; // struct criteria * | 93 | list_t *executed_criteria; // struct criteria * |
@@ -339,4 +342,8 @@ void view_set_urgent(struct sway_view *view, bool enable); | |||
339 | 342 | ||
340 | bool view_is_urgent(struct sway_view *view); | 343 | bool view_is_urgent(struct sway_view *view); |
341 | 344 | ||
345 | void view_remove_saved_buffer(struct sway_view *view); | ||
346 | |||
347 | void view_save_buffer(struct sway_view *view); | ||
348 | |||
342 | #endif | 349 | #endif |