diff options
author | Zandr Martin <zandrmartin@gmail.com> | 2016-09-02 13:46:19 -0500 |
---|---|---|
committer | Zandr Martin <zandrmartin@gmail.com> | 2016-09-02 13:46:19 -0500 |
commit | 79ffea328c992c5109406771a59a9f016d85970d (patch) | |
tree | 5d965e72127f227ea0a38dc5c6e4fc14e08d9498 /sway | |
parent | refactor commands.c (diff) | |
parent | Merge pull request #878 from lukaslihotzki/master (diff) | |
download | sway-79ffea328c992c5109406771a59a9f016d85970d.tar.gz sway-79ffea328c992c5109406771a59a9f016d85970d.tar.zst sway-79ffea328c992c5109406771a59a9f016d85970d.zip |
Merge branch 'master' of git://github.com/SirCmpwn/sway into commands-refactor
Diffstat (limited to 'sway')
-rw-r--r-- | sway/border.c | 6 | ||||
-rw-r--r-- | sway/commands.c | 30 | ||||
-rw-r--r-- | sway/config.c | 14 | ||||
-rw-r--r-- | sway/container.c | 20 | ||||
-rw-r--r-- | sway/criteria.c | 6 | ||||
-rw-r--r-- | sway/debug_log.c | 2 | ||||
-rw-r--r-- | sway/extensions.c | 22 | ||||
-rw-r--r-- | sway/focus.c | 30 | ||||
-rw-r--r-- | sway/handlers.c | 35 | ||||
-rw-r--r-- | sway/input.c | 4 | ||||
-rw-r--r-- | sway/input_state.c | 5 | ||||
-rw-r--r-- | sway/ipc-json.c | 4 | ||||
-rw-r--r-- | sway/ipc-server.c | 12 | ||||
-rw-r--r-- | sway/layout.c | 24 | ||||
-rw-r--r-- | sway/main.c | 18 | ||||
-rw-r--r-- | sway/output.c | 2 | ||||
-rw-r--r-- | sway/resize.c | 10 | ||||
-rw-r--r-- | sway/sway.5.txt | 3 | ||||
-rw-r--r-- | sway/workspace.c | 20 |
19 files changed, 130 insertions, 137 deletions
diff --git a/sway/border.c b/sway/border.c index 5cb02274..65f69411 100644 --- a/sway/border.c +++ b/sway/border.c | |||
@@ -1,12 +1,12 @@ | |||
1 | #include "border.h" | ||
2 | #include <wlc/wlc-render.h> | 1 | #include <wlc/wlc-render.h> |
3 | #include <cairo/cairo.h> | 2 | #include <cairo/cairo.h> |
4 | #include <pango/pangocairo.h> | 3 | #include <pango/pangocairo.h> |
5 | #include <stdlib.h> | 4 | #include <stdlib.h> |
6 | #include <stdio.h> | 5 | #include <stdio.h> |
7 | #include <arpa/inet.h> | 6 | #include <arpa/inet.h> |
8 | #include "container.h" | 7 | #include "sway/border.h" |
9 | #include "config.h" | 8 | #include "sway/container.h" |
9 | #include "sway/config.h" | ||
10 | #include "client/pango.h" | 10 | #include "client/pango.h" |
11 | 11 | ||
12 | void cairo_set_source_u32(cairo_t *cairo, uint32_t color) { | 12 | void cairo_set_source_u32(cairo_t *cairo, uint32_t color) { |
diff --git a/sway/commands.c b/sway/commands.c index 7b0780ec..54c104b2 100644 --- a/sway/commands.c +++ b/sway/commands.c | |||
@@ -16,24 +16,24 @@ | |||
16 | #include <limits.h> | 16 | #include <limits.h> |
17 | #include <float.h> | 17 | #include <float.h> |
18 | #include <libinput.h> | 18 | #include <libinput.h> |
19 | #include "sway/layout.h" | ||
20 | #include "sway/focus.h" | ||
21 | #include "sway/workspace.h" | ||
22 | #include "sway/commands.h" | ||
23 | #include "sway/container.h" | ||
24 | #include "sway/output.h" | ||
25 | #include "sway/handlers.h" | ||
26 | #include "sway/resize.h" | ||
27 | #include "sway/input_state.h" | ||
28 | #include "sway/criteria.h" | ||
29 | #include "sway/ipc-server.h" | ||
30 | #include "sway/input.h" | ||
31 | #include "sway/border.h" | ||
19 | #include "stringop.h" | 32 | #include "stringop.h" |
20 | #include "layout.h" | ||
21 | #include "focus.h" | ||
22 | #include "log.h" | ||
23 | #include "util.h" | ||
24 | #include "workspace.h" | ||
25 | #include "commands.h" | ||
26 | #include "container.h" | ||
27 | #include "output.h" | ||
28 | #include "handlers.h" | ||
29 | #include "sway.h" | 33 | #include "sway.h" |
30 | #include "resize.h" | 34 | #include "util.h" |
31 | #include "input_state.h" | ||
32 | #include "criteria.h" | ||
33 | #include "ipc-server.h" | ||
34 | #include "list.h" | 35 | #include "list.h" |
35 | #include "input.h" | 36 | #include "log.h" |
36 | #include "border.h" | ||
37 | 37 | ||
38 | struct cmd_handler { | 38 | struct cmd_handler { |
39 | char *command; | 39 | char *command; |
diff --git a/sway/config.c b/sway/config.c index bed233bd..a187fe3e 100644 --- a/sway/config.c +++ b/sway/config.c | |||
@@ -12,17 +12,17 @@ | |||
12 | #include <limits.h> | 12 | #include <limits.h> |
13 | #include <float.h> | 13 | #include <float.h> |
14 | #include "wayland-desktop-shell-server-protocol.h" | 14 | #include "wayland-desktop-shell-server-protocol.h" |
15 | #include "sway/commands.h" | ||
16 | #include "sway/config.h" | ||
17 | #include "sway/layout.h" | ||
18 | #include "sway/input_state.h" | ||
19 | #include "sway/criteria.h" | ||
20 | #include "sway/input.h" | ||
21 | #include "sway/border.h" | ||
15 | #include "readline.h" | 22 | #include "readline.h" |
16 | #include "stringop.h" | 23 | #include "stringop.h" |
17 | #include "list.h" | 24 | #include "list.h" |
18 | #include "log.h" | 25 | #include "log.h" |
19 | #include "commands.h" | ||
20 | #include "config.h" | ||
21 | #include "layout.h" | ||
22 | #include "input_state.h" | ||
23 | #include "criteria.h" | ||
24 | #include "input.h" | ||
25 | #include "border.h" | ||
26 | 26 | ||
27 | struct sway_config *config = NULL; | 27 | struct sway_config *config = NULL; |
28 | 28 | ||
diff --git a/sway/container.c b/sway/container.c index c922bac3..5614293c 100644 --- a/sway/container.c +++ b/sway/container.c | |||
@@ -3,17 +3,17 @@ | |||
3 | #include <stdbool.h> | 3 | #include <stdbool.h> |
4 | #include <strings.h> | 4 | #include <strings.h> |
5 | #include <string.h> | 5 | #include <string.h> |
6 | #include "config.h" | 6 | #include "sway/config.h" |
7 | #include "stringop.h" | 7 | #include "sway/container.h" |
8 | #include "container.h" | 8 | #include "sway/workspace.h" |
9 | #include "workspace.h" | 9 | #include "sway/focus.h" |
10 | #include "focus.h" | 10 | #include "sway/border.h" |
11 | #include "border.h" | 11 | #include "sway/layout.h" |
12 | #include "layout.h" | 12 | #include "sway/input_state.h" |
13 | #include "input_state.h" | 13 | #include "sway/ipc-server.h" |
14 | #include "sway/output.h" | ||
14 | #include "log.h" | 15 | #include "log.h" |
15 | #include "ipc-server.h" | 16 | #include "stringop.h" |
16 | #include "output.h" | ||
17 | 17 | ||
18 | #define ASSERT_NONNULL(PTR) \ | 18 | #define ASSERT_NONNULL(PTR) \ |
19 | sway_assert (PTR, #PTR "must be non-null") | 19 | sway_assert (PTR, #PTR "must be non-null") |
diff --git a/sway/criteria.c b/sway/criteria.c index 53435d29..739a183e 100644 --- a/sway/criteria.c +++ b/sway/criteria.c | |||
@@ -2,12 +2,12 @@ | |||
2 | #include <stdio.h> | 2 | #include <stdio.h> |
3 | #include <stdbool.h> | 3 | #include <stdbool.h> |
4 | #include <regex.h> | 4 | #include <regex.h> |
5 | #include "criteria.h" | 5 | #include "sway/criteria.h" |
6 | #include "sway/container.h" | ||
7 | #include "sway/config.h" | ||
6 | #include "stringop.h" | 8 | #include "stringop.h" |
7 | #include "list.h" | 9 | #include "list.h" |
8 | #include "log.h" | 10 | #include "log.h" |
9 | #include "container.h" | ||
10 | #include "config.h" | ||
11 | 11 | ||
12 | enum criteria_type { // *must* keep in sync with criteria_strings[] | 12 | enum criteria_type { // *must* keep in sync with criteria_strings[] |
13 | CRIT_CLASS, | 13 | CRIT_CLASS, |
diff --git a/sway/debug_log.c b/sway/debug_log.c index 7c988464..8d891a44 100644 --- a/sway/debug_log.c +++ b/sway/debug_log.c | |||
@@ -10,7 +10,7 @@ | |||
10 | #include <errno.h> | 10 | #include <errno.h> |
11 | #include <string.h> | 11 | #include <string.h> |
12 | #include <stringop.h> | 12 | #include <stringop.h> |
13 | #include "workspace.h" | 13 | #include "sway/workspace.h" |
14 | 14 | ||
15 | /* XXX:DEBUG:XXX */ | 15 | /* XXX:DEBUG:XXX */ |
16 | static void container_log(const swayc_t *c, int depth) { | 16 | static void container_log(const swayc_t *c, int depth) { |
diff --git a/sway/extensions.c b/sway/extensions.c index 4611f33e..60cd8d41 100644 --- a/sway/extensions.c +++ b/sway/extensions.c | |||
@@ -4,11 +4,11 @@ | |||
4 | #include <wlc/wlc-render.h> | 4 | #include <wlc/wlc-render.h> |
5 | #include "wayland-desktop-shell-server-protocol.h" | 5 | #include "wayland-desktop-shell-server-protocol.h" |
6 | #include "wayland-swaylock-server-protocol.h" | 6 | #include "wayland-swaylock-server-protocol.h" |
7 | #include "layout.h" | 7 | #include "sway/layout.h" |
8 | #include "sway/input_state.h" | ||
9 | #include "sway/extensions.h" | ||
10 | #include "sway/ipc-server.h" | ||
8 | #include "log.h" | 11 | #include "log.h" |
9 | #include "input_state.h" | ||
10 | #include "extensions.h" | ||
11 | #include "ipc-server.h" | ||
12 | 12 | ||
13 | struct desktop_shell_state desktop_shell; | 13 | struct desktop_shell_state desktop_shell; |
14 | 14 | ||
@@ -119,27 +119,21 @@ static void set_lock_surface(struct wl_client *client, struct wl_resource *resou | |||
119 | if (!swayc_is_child_of(view, workspace)) { | 119 | if (!swayc_is_child_of(view, workspace)) { |
120 | move_container_to(view, workspace); | 120 | move_container_to(view, workspace); |
121 | } | 121 | } |
122 | // make the view floating so it doesn't rearrange other | 122 | // make the view floating so it doesn't rearrange other siblings. |
123 | // siblings. | ||
124 | if (!view->is_floating) { | 123 | if (!view->is_floating) { |
125 | // Remove view from its current location | ||
126 | destroy_container(remove_child(view)); | 124 | destroy_container(remove_child(view)); |
127 | // and move it into workspace floating | ||
128 | add_floating(workspace, view); | 125 | add_floating(workspace, view); |
129 | } | 126 | } |
130 | wlc_view_set_state(view->handle, WLC_BIT_FULLSCREEN, true); | 127 | wlc_view_set_state(view->handle, WLC_BIT_FULLSCREEN, true); |
131 | workspace->fullscreen = view; | 128 | wlc_view_bring_to_front(view->handle); |
132 | ipc_event_window(view, "fullscreen_mode"); | 129 | wlc_view_focus(view->handle); |
133 | desktop_shell.is_locked = true; | 130 | desktop_shell.is_locked = true; |
134 | // reset input state | ||
135 | input_init(); | 131 | input_init(); |
136 | // set focus if the lockscreen is spawned on the currently | 132 | arrange_windows(workspace, -1, -1); |
137 | // active output | ||
138 | swayc_t *focus_output = swayc_active_output(); | 133 | swayc_t *focus_output = swayc_active_output(); |
139 | if (focus_output == output) { | 134 | if (focus_output == output) { |
140 | set_focused_container(view); | 135 | set_focused_container(view); |
141 | } | 136 | } |
142 | arrange_windows(workspace, -1, -1); | ||
143 | list_add(desktop_shell.lock_surfaces, surface); | 137 | list_add(desktop_shell.lock_surfaces, surface); |
144 | wl_resource_set_destructor(surface, lock_surface_destructor); | 138 | wl_resource_set_destructor(surface, lock_surface_destructor); |
145 | } else { | 139 | } else { |
diff --git a/sway/focus.c b/sway/focus.c index 145e5584..02e61ac2 100644 --- a/sway/focus.c +++ b/sway/focus.c | |||
@@ -1,13 +1,13 @@ | |||
1 | #include <wlc/wlc.h> | 1 | #include <wlc/wlc.h> |
2 | 2 | #include "sway/focus.h" | |
3 | #include "focus.h" | 3 | #include "sway/workspace.h" |
4 | #include "sway/layout.h" | ||
5 | #include "sway/config.h" | ||
6 | #include "sway/extensions.h" | ||
7 | #include "sway/input_state.h" | ||
8 | #include "sway/ipc-server.h" | ||
9 | #include "sway/border.h" | ||
4 | #include "log.h" | 10 | #include "log.h" |
5 | #include "workspace.h" | ||
6 | #include "layout.h" | ||
7 | #include "config.h" | ||
8 | #include "input_state.h" | ||
9 | #include "ipc-server.h" | ||
10 | #include "border.h" | ||
11 | 11 | ||
12 | bool locked_container_focus = false; | 12 | bool locked_container_focus = false; |
13 | bool suspend_workspace_cleanup = false; | 13 | bool suspend_workspace_cleanup = false; |
@@ -89,7 +89,6 @@ swayc_t *get_focused_container(swayc_t *parent) { | |||
89 | if (!parent) { | 89 | if (!parent) { |
90 | return swayc_active_workspace(); | 90 | return swayc_active_workspace(); |
91 | } | 91 | } |
92 | // get focused container | ||
93 | while (!parent->is_focused && parent->focused) { | 92 | while (!parent->is_focused && parent->focused) { |
94 | parent = parent->focused; | 93 | parent = parent->focused; |
95 | } | 94 | } |
@@ -133,24 +132,24 @@ bool set_focused_container(swayc_t *c) { | |||
133 | p->is_focused = false; | 132 | p->is_focused = false; |
134 | } | 133 | } |
135 | 134 | ||
136 | // get new focused view and set focus to it. | ||
137 | if (!(wlc_view_get_type(p->handle) & WLC_BIT_POPUP)) { | 135 | if (!(wlc_view_get_type(p->handle) & WLC_BIT_POPUP)) { |
138 | // unactivate previous focus | ||
139 | if (focused->type == C_VIEW) { | 136 | if (focused->type == C_VIEW) { |
140 | wlc_view_set_state(focused->handle, WLC_BIT_ACTIVATED, false); | 137 | wlc_view_set_state(focused->handle, WLC_BIT_ACTIVATED, false); |
141 | } | 138 | } |
142 | update_container_border(focused); | 139 | update_container_border(focused); |
143 | // activate current focus | ||
144 | if (c->type == C_VIEW) { | 140 | if (c->type == C_VIEW) { |
145 | wlc_view_set_state(c->handle, WLC_BIT_ACTIVATED, true); | 141 | wlc_view_set_state(c->handle, WLC_BIT_ACTIVATED, true); |
146 | } | 142 | } |
147 | // set focus | 143 | if (!desktop_shell.is_locked) { |
148 | wlc_view_focus(c->handle); | 144 | // If the system is locked, we do everything _but_ actually setting |
145 | // focus. This includes making our internals think that this view is | ||
146 | // focused. | ||
147 | wlc_view_focus(c->handle); | ||
148 | } | ||
149 | if (c->parent->layout != L_TABBED && c->parent->layout != L_STACKED) { | 149 | if (c->parent->layout != L_TABBED && c->parent->layout != L_STACKED) { |
150 | update_container_border(c); | 150 | update_container_border(c); |
151 | } | 151 | } |
152 | 152 | ||
153 | // rearrange if parent container is tabbed/stacked | ||
154 | swayc_t *parent = swayc_tabbed_stacked_ancestor(c); | 153 | swayc_t *parent = swayc_tabbed_stacked_ancestor(c); |
155 | if (parent != NULL) { | 154 | if (parent != NULL) { |
156 | arrange_backgrounds(); | 155 | arrange_backgrounds(); |
@@ -175,7 +174,6 @@ bool set_focused_container_for(swayc_t *a, swayc_t *c) { | |||
175 | return false; | 174 | return false; |
176 | } | 175 | } |
177 | swayc_t *find = c; | 176 | swayc_t *find = c; |
178 | // Ensure that a is an ancestor of c | ||
179 | while (find != a && (find = find->parent)) { | 177 | while (find != a && (find = find->parent)) { |
180 | if (find == &root_container) { | 178 | if (find == &root_container) { |
181 | return false; | 179 | return false; |
diff --git a/sway/handlers.c b/sway/handlers.c index 846d0005..47af7bd5 100644 --- a/sway/handlers.c +++ b/sway/handlers.c | |||
@@ -7,25 +7,24 @@ | |||
7 | #include <wlc/wlc-render.h> | 7 | #include <wlc/wlc-render.h> |
8 | #include <wlc/wlc-wayland.h> | 8 | #include <wlc/wlc-wayland.h> |
9 | #include <ctype.h> | 9 | #include <ctype.h> |
10 | 10 | #include "sway/handlers.h" | |
11 | #include "handlers.h" | 11 | #include "sway/border.h" |
12 | #include "border.h" | 12 | #include "sway/layout.h" |
13 | #include "log.h" | 13 | #include "sway/config.h" |
14 | #include "layout.h" | 14 | #include "sway/commands.h" |
15 | #include "config.h" | 15 | #include "sway/workspace.h" |
16 | #include "commands.h" | 16 | #include "sway/container.h" |
17 | #include "stringop.h" | 17 | #include "sway/output.h" |
18 | #include "workspace.h" | 18 | #include "sway/focus.h" |
19 | #include "container.h" | 19 | #include "sway/input_state.h" |
20 | #include "output.h" | 20 | #include "sway/resize.h" |
21 | #include "focus.h" | 21 | #include "sway/extensions.h" |
22 | #include "input_state.h" | 22 | #include "sway/criteria.h" |
23 | #include "resize.h" | 23 | #include "sway/ipc-server.h" |
24 | #include "extensions.h" | 24 | #include "sway/input.h" |
25 | #include "criteria.h" | ||
26 | #include "ipc-server.h" | ||
27 | #include "list.h" | 25 | #include "list.h" |
28 | #include "input.h" | 26 | #include "stringop.h" |
27 | #include "log.h" | ||
29 | 28 | ||
30 | // Event should be sent to client | 29 | // Event should be sent to client |
31 | #define EVENT_PASSTHROUGH false | 30 | #define EVENT_PASSTHROUGH false |
diff --git a/sway/input.c b/sway/input.c index 1f3e99e7..ae24cb49 100644 --- a/sway/input.c +++ b/sway/input.c | |||
@@ -4,8 +4,8 @@ | |||
4 | #include <stdio.h> | 4 | #include <stdio.h> |
5 | #include <string.h> | 5 | #include <string.h> |
6 | #include <libinput.h> | 6 | #include <libinput.h> |
7 | #include "config.h" | 7 | #include "sway/config.h" |
8 | #include "input.h" | 8 | #include "sway/input.h" |
9 | #include "list.h" | 9 | #include "list.h" |
10 | #include "log.h" | 10 | #include "log.h" |
11 | 11 | ||
diff --git a/sway/input_state.c b/sway/input_state.c index 7e31d3d9..68df17de 100644 --- a/sway/input_state.c +++ b/sway/input_state.c | |||
@@ -1,10 +1,9 @@ | |||
1 | #include <string.h> | 1 | #include <string.h> |
2 | #include <stdbool.h> | 2 | #include <stdbool.h> |
3 | #include <ctype.h> | 3 | #include <ctype.h> |
4 | #include "sway/input_state.h" | ||
5 | #include "sway/config.h" | ||
4 | #include "log.h" | 6 | #include "log.h" |
5 | #include "config.h" | ||
6 | |||
7 | #include "input_state.h" | ||
8 | 7 | ||
9 | #define KEY_STATE_MAX_LENGTH 64 | 8 | #define KEY_STATE_MAX_LENGTH 64 |
10 | 9 | ||
diff --git a/sway/ipc-json.c b/sway/ipc-json.c index 1debca7b..3f03b9f1 100644 --- a/sway/ipc-json.c +++ b/sway/ipc-json.c | |||
@@ -2,9 +2,9 @@ | |||
2 | #include <ctype.h> | 2 | #include <ctype.h> |
3 | #include <string.h> | 3 | #include <string.h> |
4 | #include <stdint.h> | 4 | #include <stdint.h> |
5 | #include "container.h" | 5 | #include "sway/container.h" |
6 | #include "sway/ipc-json.h" | ||
6 | #include "util.h" | 7 | #include "util.h" |
7 | #include "ipc-json.h" | ||
8 | 8 | ||
9 | static json_object *ipc_json_create_rect(swayc_t *c) { | 9 | static json_object *ipc_json_create_rect(swayc_t *c) { |
10 | json_object *rect = json_object_new_object(); | 10 | json_object *rect = json_object_new_object(); |
diff --git a/sway/ipc-server.c b/sway/ipc-server.c index 7039e348..70007f57 100644 --- a/sway/ipc-server.c +++ b/sway/ipc-server.c | |||
@@ -13,15 +13,15 @@ | |||
13 | #include <json-c/json.h> | 13 | #include <json-c/json.h> |
14 | #include <list.h> | 14 | #include <list.h> |
15 | #include <libinput.h> | 15 | #include <libinput.h> |
16 | #include "ipc-json.h" | 16 | #include "sway/ipc-json.h" |
17 | #include "ipc-server.h" | 17 | #include "sway/ipc-server.h" |
18 | #include "sway/config.h" | ||
19 | #include "sway/commands.h" | ||
20 | #include "sway/input.h" | ||
21 | #include "stringop.h" | ||
18 | #include "log.h" | 22 | #include "log.h" |
19 | #include "config.h" | ||
20 | #include "commands.h" | ||
21 | #include "list.h" | 23 | #include "list.h" |
22 | #include "stringop.h" | ||
23 | #include "util.h" | 24 | #include "util.h" |
24 | #include "input.h" | ||
25 | 25 | ||
26 | static int ipc_socket = -1; | 26 | static int ipc_socket = -1; |
27 | static struct wlc_event_source *ipc_event_source = NULL; | 27 | static struct wlc_event_source *ipc_event_source = NULL; |
diff --git a/sway/layout.c b/sway/layout.c index 01c8e4e3..7f053d9b 100644 --- a/sway/layout.c +++ b/sway/layout.c | |||
@@ -2,17 +2,17 @@ | |||
2 | #include <stdbool.h> | 2 | #include <stdbool.h> |
3 | #include <math.h> | 3 | #include <math.h> |
4 | #include <wlc/wlc.h> | 4 | #include <wlc/wlc.h> |
5 | #include "extensions.h" | 5 | #include "sway/extensions.h" |
6 | #include "log.h" | 6 | #include "sway/config.h" |
7 | #include "sway/container.h" | ||
8 | #include "sway/workspace.h" | ||
9 | #include "sway/focus.h" | ||
10 | #include "sway/output.h" | ||
11 | #include "sway/ipc-server.h" | ||
12 | #include "sway/border.h" | ||
13 | #include "sway/layout.h" | ||
7 | #include "list.h" | 14 | #include "list.h" |
8 | #include "config.h" | 15 | #include "log.h" |
9 | #include "container.h" | ||
10 | #include "workspace.h" | ||
11 | #include "focus.h" | ||
12 | #include "output.h" | ||
13 | #include "ipc-server.h" | ||
14 | #include "border.h" | ||
15 | #include "layout.h" | ||
16 | 16 | ||
17 | swayc_t root_container; | 17 | swayc_t root_container; |
18 | list_t *scratchpad; | 18 | list_t *scratchpad; |
@@ -575,7 +575,7 @@ void update_geometry(swayc_t *container) { | |||
575 | 575 | ||
576 | // handle hide_edge_borders | 576 | // handle hide_edge_borders |
577 | if (config->hide_edge_borders != E_NONE && (gap <= 0 || (config->smart_gaps && workspace->children->length == 1))) { | 577 | if (config->hide_edge_borders != E_NONE && (gap <= 0 || (config->smart_gaps && workspace->children->length == 1))) { |
578 | if (config->hide_edge_borders == E_HORIZONTAL || config->hide_edge_borders == E_BOTH) { | 578 | if (config->hide_edge_borders == E_VERTICAL || config->hide_edge_borders == E_BOTH) { |
579 | if (geometry.origin.x == workspace->x) { | 579 | if (geometry.origin.x == workspace->x) { |
580 | border_left = 0; | 580 | border_left = 0; |
581 | } | 581 | } |
@@ -585,7 +585,7 @@ void update_geometry(swayc_t *container) { | |||
585 | } | 585 | } |
586 | } | 586 | } |
587 | 587 | ||
588 | if (config->hide_edge_borders == E_VERTICAL || config->hide_edge_borders == E_BOTH) { | 588 | if (config->hide_edge_borders == E_HORIZONTAL || config->hide_edge_borders == E_BOTH) { |
589 | if (geometry.origin.y == workspace->y || should_hide_top_border(container, geometry.origin.y)) { | 589 | if (geometry.origin.y == workspace->y || should_hide_top_border(container, geometry.origin.y)) { |
590 | border_top = 0; | 590 | border_top = 0; |
591 | } | 591 | } |
diff --git a/sway/main.c b/sway/main.c index 51b12d20..972b260b 100644 --- a/sway/main.c +++ b/sway/main.c | |||
@@ -8,17 +8,17 @@ | |||
8 | #include <signal.h> | 8 | #include <signal.h> |
9 | #include <unistd.h> | 9 | #include <unistd.h> |
10 | #include <getopt.h> | 10 | #include <getopt.h> |
11 | #include "extensions.h" | 11 | #include "sway/extensions.h" |
12 | #include "layout.h" | 12 | #include "sway/layout.h" |
13 | #include "stringop.h" | 13 | #include "sway/config.h" |
14 | #include "config.h" | 14 | #include "sway/handlers.h" |
15 | #include "log.h" | 15 | #include "sway/input.h" |
16 | #include "readline.h" | 16 | #include "sway/ipc-server.h" |
17 | #include "handlers.h" | ||
18 | #include "ipc-client.h" | 17 | #include "ipc-client.h" |
19 | #include "ipc-server.h" | 18 | #include "readline.h" |
20 | #include "input.h" | 19 | #include "stringop.h" |
21 | #include "sway.h" | 20 | #include "sway.h" |
21 | #include "log.h" | ||
22 | 22 | ||
23 | static bool terminate_request = false; | 23 | static bool terminate_request = false; |
24 | static int exit_value = 0; | 24 | static int exit_value = 0; |
diff --git a/sway/output.c b/sway/output.c index 97b8a4a6..b337b143 100644 --- a/sway/output.c +++ b/sway/output.c | |||
@@ -1,7 +1,7 @@ | |||
1 | #include <strings.h> | 1 | #include <strings.h> |
2 | #include <ctype.h> | 2 | #include <ctype.h> |
3 | #include <stdlib.h> | 3 | #include <stdlib.h> |
4 | #include "output.h" | 4 | #include "sway/output.h" |
5 | #include "log.h" | 5 | #include "log.h" |
6 | #include "list.h" | 6 | #include "list.h" |
7 | 7 | ||
diff --git a/sway/resize.c b/sway/resize.c index 18bb86bb..b32d2431 100644 --- a/sway/resize.c +++ b/sway/resize.c | |||
@@ -1,11 +1,11 @@ | |||
1 | #include <wlc/wlc.h> | 1 | #include <wlc/wlc.h> |
2 | #include <math.h> | 2 | #include <math.h> |
3 | #include "layout.h" | 3 | #include "sway/layout.h" |
4 | #include "focus.h" | 4 | #include "sway/focus.h" |
5 | #include "sway/input_state.h" | ||
6 | #include "sway/handlers.h" | ||
7 | #include "sway/resize.h" | ||
5 | #include "log.h" | 8 | #include "log.h" |
6 | #include "input_state.h" | ||
7 | #include "handlers.h" | ||
8 | #include "resize.h" | ||
9 | 9 | ||
10 | static bool set_size_floating(int new_dimension, bool use_width) { | 10 | static bool set_size_floating(int new_dimension, bool use_width) { |
11 | swayc_t *view = get_focused_float(swayc_active_workspace()); | 11 | swayc_t *view = get_focused_float(swayc_active_workspace()); |
diff --git a/sway/sway.5.txt b/sway/sway.5.txt index 7de02a82..84e5e7c5 100644 --- a/sway/sway.5.txt +++ b/sway/sway.5.txt | |||
@@ -39,6 +39,9 @@ The following commands may only be used in the configuration file. | |||
39 | **set** <name> <value>:: | 39 | **set** <name> <value>:: |
40 | Sets variable $name to _value_. You can use the new variable in the arguments | 40 | Sets variable $name to _value_. You can use the new variable in the arguments |
41 | of future commands. | 41 | of future commands. |
42 | |||
43 | **orientation** <horizontal|vertical|auto>:: | ||
44 | Sets the default container layout for tiled containers. | ||
42 | 45 | ||
43 | The following commands cannot be used directly in the configuration file. | 46 | The following commands cannot be used directly in the configuration file. |
44 | They are expected to be used with **bindsym** or at runtime through **swaymsg**(1). | 47 | They are expected to be used with **bindsym** or at runtime through **swaymsg**(1). |
diff --git a/sway/workspace.c b/sway/workspace.c index 9c3e69a9..7b24d7d9 100644 --- a/sway/workspace.c +++ b/sway/workspace.c | |||
@@ -6,18 +6,18 @@ | |||
6 | #include <string.h> | 6 | #include <string.h> |
7 | #include <strings.h> | 7 | #include <strings.h> |
8 | #include <sys/types.h> | 8 | #include <sys/types.h> |
9 | #include "ipc-server.h" | 9 | #include "sway/ipc-server.h" |
10 | #include "extensions.h" | 10 | #include "sway/extensions.h" |
11 | #include "workspace.h" | 11 | #include "sway/workspace.h" |
12 | #include "layout.h" | 12 | #include "sway/layout.h" |
13 | #include "list.h" | 13 | #include "sway/container.h" |
14 | #include "log.h" | 14 | #include "sway/handlers.h" |
15 | #include "container.h" | 15 | #include "sway/config.h" |
16 | #include "handlers.h" | 16 | #include "sway/focus.h" |
17 | #include "config.h" | ||
18 | #include "stringop.h" | 17 | #include "stringop.h" |
19 | #include "focus.h" | ||
20 | #include "util.h" | 18 | #include "util.h" |
19 | #include "list.h" | ||
20 | #include "log.h" | ||
21 | #include "ipc.h" | 21 | #include "ipc.h" |
22 | 22 | ||
23 | char *prev_workspace_name = NULL; | 23 | char *prev_workspace_name = NULL; |