diff options
author | D.B <thejan.2009@gmail.com> | 2016-10-10 20:44:09 +0200 |
---|---|---|
committer | D.B <thejan.2009@gmail.com> | 2016-10-11 09:16:59 +0200 |
commit | 571321a1d84a1eb2867fbdc39f7f828aa2c64a01 (patch) | |
tree | ad61090d261ccec47efc36b19f2b7266a01c1bdc | |
parent | wrap workspace's child into a container if needed (diff) | |
download | sway-571321a1d84a1eb2867fbdc39f7f828aa2c64a01.tar.gz sway-571321a1d84a1eb2867fbdc39f7f828aa2c64a01.tar.zst sway-571321a1d84a1eb2867fbdc39f7f828aa2c64a01.zip |
add workspace_layout, ensure ws is always L_HORIZ
Add swayc_change_layout function, which changes either layout or
workspace_layout, depending on the container type. Workspace being
always L_HORIZ makes this much more i3-compatible.
-rw-r--r-- | include/sway/container.h | 7 | ||||
-rw-r--r-- | sway/commands/layout.c | 16 | ||||
-rw-r--r-- | sway/commands/move.c | 4 | ||||
-rw-r--r-- | sway/commands/split.c | 4 | ||||
-rw-r--r-- | sway/container.c | 15 | ||||
-rw-r--r-- | sway/handlers.c | 2 | ||||
-rw-r--r-- | sway/layout.c | 3 |
7 files changed, 35 insertions, 16 deletions
diff --git a/include/sway/container.h b/include/sway/container.h index 5e251885..90825a49 100644 --- a/include/sway/container.h +++ b/include/sway/container.h | |||
@@ -68,6 +68,7 @@ struct sway_container { | |||
68 | enum swayc_types type; | 68 | enum swayc_types type; |
69 | enum swayc_layouts layout; | 69 | enum swayc_layouts layout; |
70 | enum swayc_layouts prev_layout; | 70 | enum swayc_layouts prev_layout; |
71 | enum swayc_layouts workspace_layout; | ||
71 | 72 | ||
72 | /** | 73 | /** |
73 | * Width and height of this container, without borders or gaps. | 74 | * Width and height of this container, without borders or gaps. |
@@ -321,4 +322,10 @@ void update_visibility(swayc_t *container); | |||
321 | */ | 322 | */ |
322 | void close_views(swayc_t *container); | 323 | void close_views(swayc_t *container); |
323 | 324 | ||
325 | /** | ||
326 | * Assign layout to a container. Needed due to workspace container specifics. | ||
327 | * Workspace always needs L_HORIZ layout. | ||
328 | */ | ||
329 | swayc_t *swayc_change_layout(swayc_t *container, enum swayc_layouts layout); | ||
330 | |||
324 | #endif | 331 | #endif |
diff --git a/sway/commands/layout.c b/sway/commands/layout.c index e0af30aa..a716f9be 100644 --- a/sway/commands/layout.c +++ b/sway/commands/layout.c | |||
@@ -22,10 +22,10 @@ struct cmd_results *cmd_layout(int argc, char **argv) { | |||
22 | enum swayc_layouts old_layout = parent->layout; | 22 | enum swayc_layouts old_layout = parent->layout; |
23 | 23 | ||
24 | if (strcasecmp(argv[0], "default") == 0) { | 24 | if (strcasecmp(argv[0], "default") == 0) { |
25 | parent->layout = parent->prev_layout; | 25 | swayc_change_layout(parent, parent->prev_layout); |
26 | if (parent->layout == L_NONE) { | 26 | if (parent->layout == L_NONE) { |
27 | swayc_t *output = swayc_parent_by_type(parent, C_OUTPUT); | 27 | swayc_t *output = swayc_parent_by_type(parent, C_OUTPUT); |
28 | parent->layout = default_layout(output); | 28 | swayc_change_layout(parent, default_layout(output)); |
29 | } | 29 | } |
30 | } else { | 30 | } else { |
31 | if (parent->layout != L_TABBED && parent->layout != L_STACKED) { | 31 | if (parent->layout != L_TABBED && parent->layout != L_STACKED) { |
@@ -37,22 +37,22 @@ struct cmd_results *cmd_layout(int argc, char **argv) { | |||
37 | parent = new_container(parent, L_TABBED); | 37 | parent = new_container(parent, L_TABBED); |
38 | } | 38 | } |
39 | 39 | ||
40 | parent->layout = L_TABBED; | 40 | swayc_change_layout(parent, L_TABBED); |
41 | } else if (strcasecmp(argv[0], "stacking") == 0) { | 41 | } else if (strcasecmp(argv[0], "stacking") == 0) { |
42 | if (parent->type != C_CONTAINER && !swayc_is_empty_workspace(parent)) { | 42 | if (parent->type != C_CONTAINER && !swayc_is_empty_workspace(parent)) { |
43 | parent = new_container(parent, L_STACKED); | 43 | parent = new_container(parent, L_STACKED); |
44 | } | 44 | } |
45 | 45 | ||
46 | parent->layout = L_STACKED; | 46 | swayc_change_layout(parent, L_STACKED); |
47 | } else if (strcasecmp(argv[0], "splith") == 0) { | 47 | } else if (strcasecmp(argv[0], "splith") == 0) { |
48 | parent->layout = L_HORIZ; | 48 | swayc_change_layout(parent, L_HORIZ); |
49 | } else if (strcasecmp(argv[0], "splitv") == 0) { | 49 | } else if (strcasecmp(argv[0], "splitv") == 0) { |
50 | parent->layout = L_VERT; | 50 | swayc_change_layout(parent, L_VERT); |
51 | } else if (strcasecmp(argv[0], "toggle") == 0 && argc == 2 && strcasecmp(argv[1], "split") == 0) { | 51 | } else if (strcasecmp(argv[0], "toggle") == 0 && argc == 2 && strcasecmp(argv[1], "split") == 0) { |
52 | if (parent->layout == L_VERT) { | 52 | if (parent->layout == L_VERT) { |
53 | parent->layout = L_HORIZ; | 53 | swayc_change_layout(parent, L_HORIZ); |
54 | } else { | 54 | } else { |
55 | parent->layout = L_VERT; | 55 | swayc_change_layout(parent, L_VERT); |
56 | } | 56 | } |
57 | } | 57 | } |
58 | } | 58 | } |
diff --git a/sway/commands/move.c b/sway/commands/move.c index 48e9d562..4819d9ef 100644 --- a/sway/commands/move.c +++ b/sway/commands/move.c | |||
@@ -37,7 +37,7 @@ struct cmd_results *cmd_move(int argc, char **argv) { | |||
37 | if (!view->children || view->children->length == 0) { | 37 | if (!view->children || view->children->length == 0) { |
38 | return cmd_results_new(CMD_FAILURE, "move", "Cannot move an empty workspace"); | 38 | return cmd_results_new(CMD_FAILURE, "move", "Cannot move an empty workspace"); |
39 | } | 39 | } |
40 | view = new_container(view, view->layout); | 40 | view = new_container(view, view->workspace_layout); |
41 | } if (view->type != C_CONTAINER && view->type != C_VIEW) { | 41 | } if (view->type != C_CONTAINER && view->type != C_VIEW) { |
42 | return cmd_results_new(CMD_FAILURE, "move", "Can only move containers and views."); | 42 | return cmd_results_new(CMD_FAILURE, "move", "Can only move containers and views."); |
43 | } | 43 | } |
@@ -65,7 +65,7 @@ struct cmd_results *cmd_move(int argc, char **argv) { | |||
65 | if (!view->children || view->children->length == 0) { | 65 | if (!view->children || view->children->length == 0) { |
66 | return cmd_results_new(CMD_FAILURE, "move", "Cannot move an empty workspace"); | 66 | return cmd_results_new(CMD_FAILURE, "move", "Cannot move an empty workspace"); |
67 | } | 67 | } |
68 | view = new_container(view, view->layout); | 68 | view = new_container(view, view->workspace_layout); |
69 | } else if (view->type != C_CONTAINER && view->type != C_VIEW) { | 69 | } else if (view->type != C_CONTAINER && view->type != C_VIEW) { |
70 | return cmd_results_new(CMD_FAILURE, "move", "Can only move containers and views."); | 70 | return cmd_results_new(CMD_FAILURE, "move", "Can only move containers and views."); |
71 | } else if (!(output = output_by_name(argv[3], &abs_pos))) { | 71 | } else if (!(output = output_by_name(argv[3], &abs_pos))) { |
diff --git a/sway/commands/split.c b/sway/commands/split.c index 9ff1d638..f3e58fbf 100644 --- a/sway/commands/split.c +++ b/sway/commands/split.c | |||
@@ -25,11 +25,11 @@ static struct cmd_results *_do_split(int argc, char **argv, int layout) { | |||
25 | /* Case that focus is on an workspace with 0/1 children.change its layout */ | 25 | /* Case that focus is on an workspace with 0/1 children.change its layout */ |
26 | if (focused->type == C_WORKSPACE && focused->children->length <= 1) { | 26 | if (focused->type == C_WORKSPACE && focused->children->length <= 1) { |
27 | sway_log(L_DEBUG, "changing workspace layout"); | 27 | sway_log(L_DEBUG, "changing workspace layout"); |
28 | focused->layout = layout; | 28 | swayc_change_layout(focused, layout); |
29 | } else if (focused->type != C_WORKSPACE && focused->parent->children->length == 1) { | 29 | } else if (focused->type != C_WORKSPACE && focused->parent->children->length == 1) { |
30 | /* Case of no siblings. change parent layout */ | 30 | /* Case of no siblings. change parent layout */ |
31 | sway_log(L_DEBUG, "changing container layout"); | 31 | sway_log(L_DEBUG, "changing container layout"); |
32 | focused->parent->layout = layout; | 32 | swayc_change_layout(focused->parent, layout); |
33 | } else { | 33 | } else { |
34 | /* regular case where new split container is build around focused container | 34 | /* regular case where new split container is build around focused container |
35 | * or in case of workspace, container inherits its children */ | 35 | * or in case of workspace, container inherits its children */ |
diff --git a/sway/container.c b/sway/container.c index 9d5e2690..c3461acb 100644 --- a/sway/container.c +++ b/sway/container.c | |||
@@ -27,6 +27,7 @@ static swayc_t *new_swayc(enum swayc_types type) { | |||
27 | c->handle = -1; | 27 | c->handle = -1; |
28 | c->gaps = -1; | 28 | c->gaps = -1; |
29 | c->layout = L_NONE; | 29 | c->layout = L_NONE; |
30 | c->workspace_layout = L_NONE; | ||
30 | c->type = type; | 31 | c->type = type; |
31 | if (type != C_VIEW) { | 32 | if (type != C_VIEW) { |
32 | c->children = create_list(); | 33 | c->children = create_list(); |
@@ -209,7 +210,8 @@ swayc_t *new_workspace(swayc_t *output, const char *name) { | |||
209 | swayc_t *workspace = new_swayc(C_WORKSPACE); | 210 | swayc_t *workspace = new_swayc(C_WORKSPACE); |
210 | 211 | ||
211 | workspace->prev_layout = L_NONE; | 212 | workspace->prev_layout = L_NONE; |
212 | workspace->layout = default_layout(output); | 213 | workspace->layout = L_HORIZ; |
214 | workspace->workspace_layout = default_layout(output); | ||
213 | 215 | ||
214 | workspace->x = output->x; | 216 | workspace->x = output->x; |
215 | workspace->y = output->y; | 217 | workspace->y = output->y; |
@@ -262,7 +264,7 @@ swayc_t *new_container(swayc_t *child, enum swayc_layouts layout) { | |||
262 | // add container to workspace chidren | 264 | // add container to workspace chidren |
263 | add_child(workspace, cont); | 265 | add_child(workspace, cont); |
264 | // give them proper layouts | 266 | // give them proper layouts |
265 | cont->layout = workspace->layout; | 267 | cont->layout = workspace->workspace_layout; |
266 | cont->prev_layout = workspace->prev_layout; | 268 | cont->prev_layout = workspace->prev_layout; |
267 | /* TODO: might break shit in move_container!!! workspace->layout = layout; */ | 269 | /* TODO: might break shit in move_container!!! workspace->layout = layout; */ |
268 | set_focused_container_for(workspace, get_focused_view(workspace)); | 270 | set_focused_container_for(workspace, get_focused_view(workspace)); |
@@ -929,3 +931,12 @@ swayc_t *swayc_tabbed_stacked_parent(swayc_t *con) { | |||
929 | } | 931 | } |
930 | return NULL; | 932 | return NULL; |
931 | } | 933 | } |
934 | |||
935 | swayc_t *swayc_change_layout(swayc_t *container, enum swayc_layouts layout) { | ||
936 | if (container->type == C_WORKSPACE) { | ||
937 | container->workspace_layout = layout; | ||
938 | } else { | ||
939 | container->layout = layout; | ||
940 | } | ||
941 | return container; | ||
942 | } | ||
diff --git a/sway/handlers.c b/sway/handlers.c index 48117287..75f2d5a6 100644 --- a/sway/handlers.c +++ b/sway/handlers.c | |||
@@ -344,7 +344,7 @@ static bool handle_view_created(wlc_handle handle) { | |||
344 | } else { | 344 | } else { |
345 | if (focused->type == C_WORKSPACE && | 345 | if (focused->type == C_WORKSPACE && |
346 | /* focused->children->length == 0 && */ | 346 | /* focused->children->length == 0 && */ |
347 | (focused->layout == L_TABBED || focused->layout == L_STACKED)) { | 347 | (focused->workspace_layout == L_TABBED || focused->workspace_layout == L_STACKED)) { |
348 | // will wrap the view in a container later on | 348 | // will wrap the view in a container later on |
349 | encapsulate_view = true; | 349 | encapsulate_view = true; |
350 | } | 350 | } |
diff --git a/sway/layout.c b/sway/layout.c index 4f2ea09a..a57306e0 100644 --- a/sway/layout.c +++ b/sway/layout.c | |||
@@ -302,7 +302,8 @@ void move_container(swayc_t *container, enum movement_direction dir) { | |||
302 | } | 302 | } |
303 | // Change parent layout if we need to | 303 | // Change parent layout if we need to |
304 | if (parent->children->length == 1 && parent->layout != layout) { | 304 | if (parent->children->length == 1 && parent->layout != layout) { |
305 | parent->layout = layout; | 305 | swayc_change_layout(parent, layout); |
306 | /* parent->layout = layout; */ | ||
306 | continue; | 307 | continue; |
307 | } | 308 | } |
308 | if (parent->type == C_WORKSPACE) { | 309 | if (parent->type == C_WORKSPACE) { |