aboutsummaryrefslogtreecommitdiffstats
path: root/sway/commands/layout.c
diff options
context:
space:
mode:
authorLibravatar wil <william.barsse@gmail.com>2017-01-08 14:49:47 +0100
committerLibravatar wil <william.barsse@gmail.com>2017-01-08 14:49:47 +0100
commit063c79874a0d55ffa69f48947381607978e128d7 (patch)
tree716f7f1330fe77cc706af85e7a5c9d4dfe6dcd16 /sway/commands/layout.c
parent[fix] Keep Clang happy (diff)
downloadsway-063c79874a0d55ffa69f48947381607978e128d7.tar.gz
sway-063c79874a0d55ffa69f48947381607978e128d7.tar.zst
sway-063c79874a0d55ffa69f48947381607978e128d7.zip
Indent cleanups
Diffstat (limited to 'sway/commands/layout.c')
-rw-r--r--sway/commands/layout.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/sway/commands/layout.c b/sway/commands/layout.c
index 0cdac1b4..c13a2ef7 100644
--- a/sway/commands/layout.c
+++ b/sway/commands/layout.c
@@ -49,8 +49,8 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
49 } else if (strcasecmp(argv[0], "splitv") == 0) { 49 } else if (strcasecmp(argv[0], "splitv") == 0) {
50 swayc_change_layout(parent, 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 && (parent->workspace_layout == L_NONE || 52 if (parent->layout == L_HORIZ && (parent->workspace_layout == L_NONE
53 parent->workspace_layout == L_HORIZ)) { 53 || parent->workspace_layout == L_HORIZ)) {
54 swayc_change_layout(parent, L_VERT); 54 swayc_change_layout(parent, L_VERT);
55 } else { 55 } else {
56 swayc_change_layout(parent, L_HORIZ); 56 swayc_change_layout(parent, L_HORIZ);
@@ -66,23 +66,23 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
66 } else if (strcasecmp(argv[0], "incnmaster") == 0) { 66 } else if (strcasecmp(argv[0], "incnmaster") == 0) {
67 const char *name = "layout incnmaster"; 67 const char *name = "layout incnmaster";
68 if ((error = checkarg(argc, name, 68 if ((error = checkarg(argc, name,
69 EXPECTED_EQUAL_TO, 2))) { 69 EXPECTED_EQUAL_TO, 2))) {
70 return error; 70 return error;
71 } 71 }
72 char *end; 72 char *end;
73 int inc = (int) strtol(argv[1], &end, 10); 73 int inc = (int) strtol(argv[1], &end, 10);
74 if (*end) { 74 if (*end) {
75 return cmd_results_new(CMD_INVALID, name, "Invalid %s command " 75 return cmd_results_new(CMD_INVALID, name, "Invalid %s command "
76 "(argument must be an integer)", name); 76 "(argument must be an integer)", name);
77 77
78 } 78 }
79 swayc_t *container = get_focused_view(swayc_active_workspace()); 79 swayc_t *container = get_focused_view(swayc_active_workspace());
80 if (container && inc && 80 if (container && inc &&
81 is_auto_layout(container->parent->layout) && 81 is_auto_layout(container->parent->layout) &&
82 ((int)container->parent->nb_master + inc >= 0)) { 82 ((int)container->parent->nb_master + inc >= 0)) {
83 for (int i = container->parent->nb_master; 83 for (int i = container->parent->nb_master;
84 i >= 0 && i < container->parent->children->length && 84 i >= 0 && i < container->parent->children->length
85 i != (int) container->parent->nb_master + inc;) { 85 && i != (int) container->parent->nb_master + inc;) {
86 ((swayc_t *) container->parent->children->items[i])->height = -1; 86 ((swayc_t *) container->parent->children->items[i])->height = -1;
87 ((swayc_t *) container->parent->children->items[i])->width = -1; 87 ((swayc_t *) container->parent->children->items[i])->width = -1;
88 i += inc > 0 ? 1 : -1; 88 i += inc > 0 ? 1 : -1;
@@ -92,19 +92,19 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
92 } else if ((strcasecmp(argv[0], "incncol") == 0) && argc ==2) { 92 } else if ((strcasecmp(argv[0], "incncol") == 0) && argc ==2) {
93 const char *name = "layout incncol"; 93 const char *name = "layout incncol";
94 if ((error = checkarg(argc, name, 94 if ((error = checkarg(argc, name,
95 EXPECTED_EQUAL_TO, 2))) { 95 EXPECTED_EQUAL_TO, 2))) {
96 return error; 96 return error;
97 } 97 }
98 char *end; 98 char *end;
99 int inc = (int) strtol(argv[1], &end, 10); 99 int inc = (int) strtol(argv[1], &end, 10);
100 if (*end) { 100 if (*end) {
101 return cmd_results_new(CMD_INVALID, name, "Invalid %s command " 101 return cmd_results_new(CMD_INVALID, name, "Invalid %s command "
102 "(argument must be an integer)", name); 102 "(argument must be an integer)", name);
103 103
104 } 104 }
105 swayc_t *container = get_focused_view(swayc_active_workspace()); 105 swayc_t *container = get_focused_view(swayc_active_workspace());
106 if (container && inc && is_auto_layout(container->parent->layout) && 106 if (container && inc && is_auto_layout(container->parent->layout) &&
107 ((int)container->parent->nb_slave_groups + inc >= 1)) { 107 ((int)container->parent->nb_slave_groups + inc >= 1)) {
108 container->parent->nb_slave_groups += inc; 108 container->parent->nb_slave_groups += inc;
109 } 109 }
110 } else if (strcasecmp(argv[0], "auto") == 0) { 110 } else if (strcasecmp(argv[0], "auto") == 0) {
@@ -128,7 +128,7 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
128 } 128 }
129 } else { 129 } else {
130 return cmd_results_new(CMD_FAILURE, "layout auto", 130 return cmd_results_new(CMD_FAILURE, "layout auto",
131 "Must be one of <prev|next>."); 131 "Must be one of <prev|next>.");
132 } 132 }
133 swayc_change_layout(parent, layout); 133 swayc_change_layout(parent, layout);
134 } 134 }