aboutsummaryrefslogtreecommitdiffstats
path: root/include/sway/tree/view.h
diff options
context:
space:
mode:
authorLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-06-03 16:35:06 +1000
committerLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-06-09 10:08:43 +1000
commit59c94887018bdfa578c4371c4275061ca6e71b3e (patch)
tree62bdaa6ac4777d1fcb292013bddd2043dad7765a /include/sway/tree/view.h
parentMerge pull request #2115 from RedSoxFan/restore-workspaces (diff)
downloadsway-59c94887018bdfa578c4371c4275061ca6e71b3e.tar.gz
sway-59c94887018bdfa578c4371c4275061ca6e71b3e.tar.zst
sway-59c94887018bdfa578c4371c4275061ca6e71b3e.zip
WIP: Atomic layout updates ground work
Diffstat (limited to 'include/sway/tree/view.h')
-rw-r--r--include/sway/tree/view.h19
1 files changed, 9 insertions, 10 deletions
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index 3df38e2d..f47db567 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -29,8 +29,8 @@ struct sway_view_impl {
29 const char *(*get_string_prop)(struct sway_view *view, 29 const char *(*get_string_prop)(struct sway_view *view,
30 enum sway_view_prop prop); 30 enum sway_view_prop prop);
31 uint32_t (*get_int_prop)(struct sway_view *view, enum sway_view_prop prop); 31 uint32_t (*get_int_prop)(struct sway_view *view, enum sway_view_prop prop);
32 void (*configure)(struct sway_view *view, double lx, double ly, int width, 32 uint32_t (*configure)(struct sway_view *view, double lx, double ly,
33 int height); 33 int width, int height);
34 void (*set_activated)(struct sway_view *view, bool activated); 34 void (*set_activated)(struct sway_view *view, bool activated);
35 void (*set_fullscreen)(struct sway_view *view, bool fullscreen); 35 void (*set_fullscreen)(struct sway_view *view, bool fullscreen);
36 bool (*wants_floating)(struct sway_view *view); 36 bool (*wants_floating)(struct sway_view *view);
@@ -70,6 +70,12 @@ struct sway_view {
70 70
71 list_t *executed_criteria; // struct criteria * 71 list_t *executed_criteria; // struct criteria *
72 list_t *marks; // char * 72 list_t *marks; // char *
73 list_t *instructions; // struct sway_transaction_instruction *
74
75 // If saved_texture is set, the main surface of the view will render this
76 // texture instead of its own. This is used while waiting for transactions
77 // to complete.
78 struct wlr_texture *saved_texture;
73 79
74 struct wlr_texture *marks_focused; 80 struct wlr_texture *marks_focused;
75 struct wlr_texture *marks_focused_inactive; 81 struct wlr_texture *marks_focused_inactive;
@@ -103,8 +109,6 @@ struct sway_xdg_shell_v6_view {
103 struct wl_listener map; 109 struct wl_listener map;
104 struct wl_listener unmap; 110 struct wl_listener unmap;
105 struct wl_listener destroy; 111 struct wl_listener destroy;
106
107 int pending_width, pending_height;
108}; 112};
109 113
110struct sway_xdg_shell_view { 114struct sway_xdg_shell_view {
@@ -119,8 +123,6 @@ struct sway_xdg_shell_view {
119 struct wl_listener map; 123 struct wl_listener map;
120 struct wl_listener unmap; 124 struct wl_listener unmap;
121 struct wl_listener destroy; 125 struct wl_listener destroy;
122
123 int pending_width, pending_height;
124}; 126};
125 127
126struct sway_xwayland_view { 128struct sway_xwayland_view {
@@ -138,9 +140,6 @@ struct sway_xwayland_view {
138 struct wl_listener map; 140 struct wl_listener map;
139 struct wl_listener unmap; 141 struct wl_listener unmap;
140 struct wl_listener destroy; 142 struct wl_listener destroy;
141
142 int pending_lx, pending_ly;
143 int pending_width, pending_height;
144}; 143};
145 144
146struct sway_xwayland_unmanaged { 145struct sway_xwayland_unmanaged {
@@ -212,7 +211,7 @@ uint32_t view_get_window_type(struct sway_view *view);
212 211
213const char *view_get_shell(struct sway_view *view); 212const char *view_get_shell(struct sway_view *view);
214 213
215void view_configure(struct sway_view *view, double ox, double oy, int width, 214uint32_t view_configure(struct sway_view *view, double lx, double ly, int width,
216 int height); 215 int height);
217 216
218/** 217/**