diff options
author | D.B <thejan.2009@gmail.com> | 2016-10-10 20:44:09 +0200 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2016-12-04 08:31:34 -0500 |
commit | 6fb4b6737a793672129bb621d48652cc5e42059e (patch) | |
tree | 58ef0b90988625bc0601bfc8b73d6927036ea08c /sway | |
parent | Merge pull request #981 from SirCmpwn/security (diff) | |
download | sway-6fb4b6737a793672129bb621d48652cc5e42059e.tar.gz sway-6fb4b6737a793672129bb621d48652cc5e42059e.tar.zst sway-6fb4b6737a793672129bb621d48652cc5e42059e.zip |
add workspace_layout to container
Add swayc_change_layout function, which changes either layout or
workspace_layout, depending on the container type.
Diffstat (limited to 'sway')
-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 | 11 | ||||
-rw-r--r-- | sway/layout.c | 1 |
6 files changed, 26 insertions, 25 deletions
diff --git a/sway/commands/layout.c b/sway/commands/layout.c index 05ab0a18..bef06cb2 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_HORIZ) { | 52 | if (parent->layout == L_HORIZ) { |
53 | parent->layout = L_VERT; | 53 | swayc_change_layout(parent, L_VERT); |
54 | } else { | 54 | } else { |
55 | parent->layout = L_HORIZ; | 55 | swayc_change_layout(parent, L_HORIZ); |
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 4f22eb0d..c588f3db 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)); |
@@ -944,3 +946,12 @@ swayc_t *swayc_tabbed_stacked_parent(swayc_t *con) { | |||
944 | } | 946 | } |
945 | return NULL; | 947 | return NULL; |
946 | } | 948 | } |
949 | |||
950 | swayc_t *swayc_change_layout(swayc_t *container, enum swayc_layouts layout) { | ||
951 | if (container->type == C_WORKSPACE) { | ||
952 | container->workspace_layout = layout; | ||
953 | } else { | ||
954 | container->layout = layout; | ||
955 | } | ||
956 | return container; | ||
957 | } | ||
diff --git a/sway/handlers.c b/sway/handlers.c index ee52ba38..86a976d8 100644 --- a/sway/handlers.c +++ b/sway/handlers.c | |||
@@ -399,17 +399,6 @@ static bool handle_view_created(wlc_handle handle) { | |||
399 | if (workspace && workspace->fullscreen) { | 399 | if (workspace && workspace->fullscreen) { |
400 | set_focused_container(workspace->fullscreen); | 400 | set_focused_container(workspace->fullscreen); |
401 | } | 401 | } |
402 | |||
403 | // if parent container is a workspace, newview its only child and | ||
404 | // layout is tabbed/stacked, add a container around newview | ||
405 | swayc_t *parent_container = newview->parent; | ||
406 | if (parent_container && parent_container->type == C_WORKSPACE && | ||
407 | parent_container->children && parent_container->children->length == 1 && | ||
408 | (parent_container->layout == L_TABBED || parent_container->layout == L_STACKED)) { | ||
409 | swayc_t *container = new_container(newview, parent_container->layout); | ||
410 | set_focused_container(newview); | ||
411 | arrange_windows(container, -1, -1); | ||
412 | } | ||
413 | } else { | 402 | } else { |
414 | swayc_t *output = swayc_parent_by_type(focused, C_OUTPUT); | 403 | swayc_t *output = swayc_parent_by_type(focused, C_OUTPUT); |
415 | wlc_handle *h = malloc(sizeof(wlc_handle)); | 404 | wlc_handle *h = malloc(sizeof(wlc_handle)); |
diff --git a/sway/layout.c b/sway/layout.c index 4f2ea09a..b37b82da 100644 --- a/sway/layout.c +++ b/sway/layout.c | |||
@@ -302,6 +302,7 @@ 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 | /* swayc_change_layout(parent, layout); */ | ||
305 | parent->layout = layout; | 306 | parent->layout = layout; |
306 | continue; | 307 | continue; |
307 | } | 308 | } |