commit 704b2db050cf3dfc6bde57771ae58bb48e0eb96c
parent 97f70987d70315c683fd1e16c731b396679f6b96
Author: wil <william.barsse@gmail.com>
Date: Sun, 1 Jan 2017 22:02:19 +0100
Merge branch 'master' of https://github.com/willakat/sway
Diffstat:
3 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/include/sway/layout.h b/include/sway/layout.h
@@ -76,4 +76,5 @@ void swayc_log(log_importance_t verbosity, swayc_t *cont, const char* format, ..
enum swayc_layouts default_layout(swayc_t *output);
bool is_auto_layout(enum swayc_layouts layout);
+
#endif
diff --git a/sway/layout.c b/sway/layout.c
@@ -821,10 +821,6 @@ void update_geometry(swayc_t *container) {
}
}
-bool is_auto_layout(enum swayc_layouts layout) {
- return (layout >= L_AUTO_FIRST) && (layout <= L_AUTO_LAST);
-}
-
/**
* Layout application prototypes
*/
@@ -1503,3 +1499,7 @@ enum swayc_layouts default_layout(swayc_t *output) {
return L_VERT;
}
}
+
+bool is_auto_layout(enum swayc_layouts layout) {
+ return (layout >= L_AUTO_FIRST) && (layout <= L_AUTO_LAST);
+}
diff --git a/sway/sway.5.txt b/sway/sway.5.txt
@@ -87,11 +87,20 @@ They are expected to be used with **bindsym** or at runtime through **swaymsg**(
_splitv_, _toggle split_, _stacking_, _tabbed_, _auto_left_, _auto_right_,
_auto_top, _auto_bottom_.
+**layout** auto <next|prev>::
+ Cycles between available auto layouts.
+
**layout** <incnmaster|incncol> <n>::
Modify the number of master elements, respectively slave columns, in the
focused container. <n> can be a positive or negative integer. These commands
only have an effect if the focused container uses one of the "auto" layouts.
+**layout** toggle split::
+ Cycles between available split layouts.
+
+**layout** promote::
+ Swap the focused element with the first in the one of the auto layouts.
+
**move** <left|right|up|down|next|prev|first>::
Moves the focused container _left_, _right_, _up_, or _down_. Moving to _prev_
or _next_ swaps the container with its sibling in the same container. Move
