diff options
| author | Ryan Dwyer <RyanDwyer@users.noreply.github.com> | 2018-08-19 16:07:11 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-19 16:07:11 +1000 |
| commit | 7f22fab3895ff090d5e26936f4e964e081090164 (patch) | |
| tree | c5d96041e3270b1d1d50f8a42d91652d615c9938 /include/sway | |
| parent | 37e37627cae0a23d9f763cc56378b528f2ff3885 (diff) | |
| parent | d0a24465d75cc7197ee253e1de9fa961071cd034 (diff) | |
| download | sway-7f22fab3895ff090d5e26936f4e964e081090164.tar.xz | |
Merge branch 'master' into commands
Diffstat (limited to 'include/sway')
| -rw-r--r-- | include/sway/desktop.h | 5 | ||||
| -rw-r--r-- | include/sway/tree/view.h | 10 |
2 files changed, 13 insertions, 2 deletions
diff --git a/include/sway/desktop.h b/include/sway/desktop.h index 348fb187..c969a76b 100644 --- a/include/sway/desktop.h +++ b/include/sway/desktop.h @@ -1,8 +1,13 @@ #include <wlr/types/wlr_surface.h> struct sway_container; +struct sway_view; void desktop_damage_surface(struct wlr_surface *surface, double lx, double ly, bool whole); void desktop_damage_whole_container(struct sway_container *con); + +void desktop_damage_box(struct wlr_box *box); + +void desktop_damage_view(struct sway_view *view); diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h index c2225bcb..2747e7c4 100644 --- a/include/sway/tree/view.h +++ b/include/sway/tree/view.h @@ -88,6 +88,14 @@ struct sway_view { struct wlr_buffer *saved_buffer; int saved_buffer_width, saved_buffer_height; + // The geometry for whatever the client is committing, regardless of + // transaction state. Updated on every commit. + struct wlr_box geometry; + + // The "old" geometry during a transaction. Used to damage the old location + // when a transaction is applied. + struct wlr_box saved_geometry; + bool destroying; list_t *executed_criteria; // struct criteria * @@ -285,8 +293,6 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface); void view_unmap(struct sway_view *view); -void view_update_position(struct sway_view *view, double lx, double ly); - void view_update_size(struct sway_view *view, int width, int height); void view_child_init(struct sway_view_child *child, |