aboutsummaryrefslogtreecommitdiffstats
path: root/include/sway
diff options
context:
space:
mode:
authorLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-06-06 22:57:34 +1000
committerLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-06-09 10:11:25 +1000
commitbb66e6d578fdc68fb33d0fde921390d74f20bb31 (patch)
tree99d3763eee97acb870c16a762c0ee40af787c295 /include/sway
parentMake main properties be the pending state (diff)
downloadsway-bb66e6d578fdc68fb33d0fde921390d74f20bb31.tar.gz
sway-bb66e6d578fdc68fb33d0fde921390d74f20bb31.tar.zst
sway-bb66e6d578fdc68fb33d0fde921390d74f20bb31.zip
Refactor everything that needs to arrange windows
* The arrange_foo functions are now replaced with arrange_and_commit, or with manually created transactions and arrange_windows x2. * The arrange functions are now only called from the highest level functions rather than from both high level and low level functions. * Due to the previous point, view_set_fullscreen_raw and view_set_fullscreen are both merged into one function again. * Floating and fullscreen are now working with transactions.
Diffstat (limited to 'include/sway')
-rw-r--r--include/sway/desktop/transaction.h7
-rw-r--r--include/sway/tree/arrange.h7
-rw-r--r--include/sway/tree/view.h5
3 files changed, 6 insertions, 13 deletions
diff --git a/include/sway/desktop/transaction.h b/include/sway/desktop/transaction.h
index 575d28c8..5aff28e9 100644
--- a/include/sway/desktop/transaction.h
+++ b/include/sway/desktop/transaction.h
@@ -16,12 +16,7 @@
16 * the updates all at the same time. 16 * the updates all at the same time.
17 */ 17 */
18 18
19struct sway_transaction { 19struct sway_transaction;
20 struct wl_event_source *timer;
21 list_t *instructions; // struct sway_transaction_instruction *
22 list_t *damage; // struct wlr_box *
23 size_t num_waiting;
24};
25 20
26/** 21/**
27 * Create a new transaction. 22 * Create a new transaction.
diff --git a/include/sway/tree/arrange.h b/include/sway/tree/arrange.h
index 23cd66dc..897a9392 100644
--- a/include/sway/tree/arrange.h
+++ b/include/sway/tree/arrange.h
@@ -23,11 +23,4 @@ void arrange_windows(struct sway_container *container,
23 */ 23 */
24void arrange_and_commit(struct sway_container *container); 24void arrange_and_commit(struct sway_container *container);
25 25
26// These functions are temporary and are only here to make everything compile.
27// They are wrappers around arrange_and_commit.
28void arrange_root(void);
29void arrange_output(struct sway_container *container);
30void arrange_workspace(struct sway_container *container);
31void arrange_children_of(struct sway_container *container);
32
33#endif 26#endif
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index f47db567..d0093db5 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -215,6 +215,11 @@ uint32_t view_configure(struct sway_view *view, double lx, double ly, int width,
215 int height); 215 int height);
216 216
217/** 217/**
218 * Center the view in its workspace and build the swayc decorations around it.
219 */
220void view_init_floating(struct sway_view *view);
221
222/**
218 * Configure the view's position and size based on the swayc's position and 223 * Configure the view's position and size based on the swayc's position and
219 * size, taking borders into consideration. 224 * size, taking borders into consideration.
220 */ 225 */