diff options
author | wil <william.barsse@gmail.com> | 2017-01-01 22:02:19 +0100 |
---|---|---|
committer | wil <william.barsse@gmail.com> | 2017-01-01 22:02:19 +0100 |
commit | 704b2db050cf3dfc6bde57771ae58bb48e0eb96c (patch) | |
tree | 7c7061ce00db9847961f486cc8b776bedb854cbb | |
parent | [fix] cleanups suggested by Sway community (diff) | |
parent | Document new layout command syntax (diff) | |
download | sway-704b2db050cf3dfc6bde57771ae58bb48e0eb96c.tar.gz sway-704b2db050cf3dfc6bde57771ae58bb48e0eb96c.tar.zst sway-704b2db050cf3dfc6bde57771ae58bb48e0eb96c.zip |
Merge branch 'master' of https://github.com/willakat/sway
-rw-r--r-- | include/sway/layout.h | 1 | ||||
-rw-r--r-- | sway/layout.c | 8 | ||||
-rw-r--r-- | sway/sway.5.txt | 9 |
3 files changed, 14 insertions, 4 deletions
diff --git a/include/sway/layout.h b/include/sway/layout.h index 8cc513d8..d7fe748d 100644 --- 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, .. | |||
76 | enum swayc_layouts default_layout(swayc_t *output); | 76 | enum swayc_layouts default_layout(swayc_t *output); |
77 | 77 | ||
78 | bool is_auto_layout(enum swayc_layouts layout); | 78 | bool is_auto_layout(enum swayc_layouts layout); |
79 | |||
79 | #endif | 80 | #endif |
diff --git a/sway/layout.c b/sway/layout.c index faab9196..377dad47 100644 --- a/sway/layout.c +++ b/sway/layout.c | |||
@@ -821,10 +821,6 @@ void update_geometry(swayc_t *container) { | |||
821 | } | 821 | } |
822 | } | 822 | } |
823 | 823 | ||
824 | bool is_auto_layout(enum swayc_layouts layout) { | ||
825 | return (layout >= L_AUTO_FIRST) && (layout <= L_AUTO_LAST); | ||
826 | } | ||
827 | |||
828 | /** | 824 | /** |
829 | * Layout application prototypes | 825 | * Layout application prototypes |
830 | */ | 826 | */ |
@@ -1503,3 +1499,7 @@ enum swayc_layouts default_layout(swayc_t *output) { | |||
1503 | return L_VERT; | 1499 | return L_VERT; |
1504 | } | 1500 | } |
1505 | } | 1501 | } |
1502 | |||
1503 | bool is_auto_layout(enum swayc_layouts layout) { | ||
1504 | return (layout >= L_AUTO_FIRST) && (layout <= L_AUTO_LAST); | ||
1505 | } | ||
diff --git a/sway/sway.5.txt b/sway/sway.5.txt index eece4b5b..cbff6cef 100644 --- 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**( | |||
87 | _splitv_, _toggle split_, _stacking_, _tabbed_, _auto_left_, _auto_right_, | 87 | _splitv_, _toggle split_, _stacking_, _tabbed_, _auto_left_, _auto_right_, |
88 | _auto_top, _auto_bottom_. | 88 | _auto_top, _auto_bottom_. |
89 | 89 | ||
90 | **layout** auto <next|prev>:: | ||
91 | Cycles between available auto layouts. | ||
92 | |||
90 | **layout** <incnmaster|incncol> <n>:: | 93 | **layout** <incnmaster|incncol> <n>:: |
91 | Modify the number of master elements, respectively slave columns, in the | 94 | Modify the number of master elements, respectively slave columns, in the |
92 | focused container. <n> can be a positive or negative integer. These commands | 95 | focused container. <n> can be a positive or negative integer. These commands |
93 | only have an effect if the focused container uses one of the "auto" layouts. | 96 | only have an effect if the focused container uses one of the "auto" layouts. |
94 | 97 | ||
98 | **layout** toggle split:: | ||
99 | Cycles between available split layouts. | ||
100 | |||
101 | **layout** promote:: | ||
102 | Swap the focused element with the first in the one of the auto layouts. | ||
103 | |||
95 | **move** <left|right|up|down|next|prev|first>:: | 104 | **move** <left|right|up|down|next|prev|first>:: |
96 | Moves the focused container _left_, _right_, _up_, or _down_. Moving to _prev_ | 105 | Moves the focused container _left_, _right_, _up_, or _down_. Moving to _prev_ |
97 | or _next_ swaps the container with its sibling in the same container. Move | 106 | or _next_ swaps the container with its sibling in the same container. Move |