From a9c09932188be010967dd9c78f1a0c5381f3ba63 Mon Sep 17 00:00:00 2001 From: Zandr Martin Date: Wed, 31 Aug 2016 21:07:20 -0500 Subject: document `orientation` command --- sway/sway.5.txt | 3 +++ 1 file changed, 3 insertions(+) (limited to 'sway') 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. **set** :: Sets variable $name to _value_. You can use the new variable in the arguments of future commands. + +**orientation** :: + Sets the default container layout for tiled containers. The following commands cannot be used directly in the configuration file. They are expected to be used with **bindsym** or at runtime through **swaymsg**(1). -- cgit v1.2.3 From 416417a54c5875abcdc257b6ad10ff086c35eefc Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Thu, 1 Sep 2016 08:18:37 -0400 Subject: Reorganize includes --- sway/border.c | 6 +++--- sway/commands.c | 30 +++++++++++++++--------------- sway/config.c | 14 +++++++------- sway/container.c | 20 ++++++++++---------- sway/criteria.c | 6 +++--- sway/debug_log.c | 2 +- sway/extensions.c | 8 ++++---- sway/focus.c | 15 +++++++-------- sway/handlers.c | 35 +++++++++++++++++------------------ sway/input.c | 4 ++-- sway/input_state.c | 5 ++--- sway/ipc-json.c | 4 ++-- sway/ipc-server.c | 12 ++++++------ sway/layout.c | 20 ++++++++++---------- sway/main.c | 18 +++++++++--------- sway/output.c | 2 +- sway/resize.c | 10 +++++----- sway/workspace.c | 20 ++++++++++---------- 18 files changed, 114 insertions(+), 117 deletions(-) (limited to 'sway') 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 @@ -#include "border.h" #include #include #include #include #include #include -#include "container.h" -#include "config.h" +#include "sway/border.h" +#include "sway/container.h" +#include "sway/config.h" #include "client/pango.h" void cairo_set_source_u32(cairo_t *cairo, uint32_t color) { diff --git a/sway/commands.c b/sway/commands.c index 5a5bcd22..347b463b 100644 --- a/sway/commands.c +++ b/sway/commands.c @@ -16,24 +16,24 @@ #include #include #include +#include "sway/layout.h" +#include "sway/focus.h" +#include "sway/workspace.h" +#include "sway/commands.h" +#include "sway/container.h" +#include "sway/output.h" +#include "sway/handlers.h" +#include "sway/resize.h" +#include "sway/input_state.h" +#include "sway/criteria.h" +#include "sway/ipc-server.h" +#include "sway/input.h" +#include "sway/border.h" #include "stringop.h" -#include "layout.h" -#include "focus.h" -#include "log.h" -#include "util.h" -#include "workspace.h" -#include "commands.h" -#include "container.h" -#include "output.h" -#include "handlers.h" #include "sway.h" -#include "resize.h" -#include "input_state.h" -#include "criteria.h" -#include "ipc-server.h" +#include "util.h" #include "list.h" -#include "input.h" -#include "border.h" +#include "log.h" typedef struct cmd_results *sway_cmd(int argc, char **argv); 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 @@ #include #include #include "wayland-desktop-shell-server-protocol.h" +#include "sway/commands.h" +#include "sway/config.h" +#include "sway/layout.h" +#include "sway/input_state.h" +#include "sway/criteria.h" +#include "sway/input.h" +#include "sway/border.h" #include "readline.h" #include "stringop.h" #include "list.h" #include "log.h" -#include "commands.h" -#include "config.h" -#include "layout.h" -#include "input_state.h" -#include "criteria.h" -#include "input.h" -#include "border.h" struct sway_config *config = NULL; 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 @@ #include #include #include -#include "config.h" -#include "stringop.h" -#include "container.h" -#include "workspace.h" -#include "focus.h" -#include "border.h" -#include "layout.h" -#include "input_state.h" +#include "sway/config.h" +#include "sway/container.h" +#include "sway/workspace.h" +#include "sway/focus.h" +#include "sway/border.h" +#include "sway/layout.h" +#include "sway/input_state.h" +#include "sway/ipc-server.h" +#include "sway/output.h" #include "log.h" -#include "ipc-server.h" -#include "output.h" +#include "stringop.h" #define ASSERT_NONNULL(PTR) \ 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 @@ #include #include #include -#include "criteria.h" +#include "sway/criteria.h" +#include "sway/container.h" +#include "sway/config.h" #include "stringop.h" #include "list.h" #include "log.h" -#include "container.h" -#include "config.h" enum criteria_type { // *must* keep in sync with criteria_strings[] 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 @@ #include #include #include -#include "workspace.h" +#include "sway/workspace.h" /* XXX:DEBUG:XXX */ static void container_log(const swayc_t *c, int depth) { diff --git a/sway/extensions.c b/sway/extensions.c index 4611f33e..70ec537d 100644 --- a/sway/extensions.c +++ b/sway/extensions.c @@ -4,11 +4,11 @@ #include #include "wayland-desktop-shell-server-protocol.h" #include "wayland-swaylock-server-protocol.h" -#include "layout.h" +#include "sway/layout.h" +#include "sway/input_state.h" +#include "sway/extensions.h" +#include "sway/ipc-server.h" #include "log.h" -#include "input_state.h" -#include "extensions.h" -#include "ipc-server.h" struct desktop_shell_state desktop_shell; diff --git a/sway/focus.c b/sway/focus.c index 145e5584..9207260d 100644 --- a/sway/focus.c +++ b/sway/focus.c @@ -1,13 +1,12 @@ #include - -#include "focus.h" +#include "sway/focus.h" +#include "sway/workspace.h" +#include "sway/layout.h" +#include "sway/config.h" +#include "sway/input_state.h" +#include "sway/ipc-server.h" +#include "sway/border.h" #include "log.h" -#include "workspace.h" -#include "layout.h" -#include "config.h" -#include "input_state.h" -#include "ipc-server.h" -#include "border.h" bool locked_container_focus = false; bool suspend_workspace_cleanup = 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 @@ #include #include #include - -#include "handlers.h" -#include "border.h" -#include "log.h" -#include "layout.h" -#include "config.h" -#include "commands.h" -#include "stringop.h" -#include "workspace.h" -#include "container.h" -#include "output.h" -#include "focus.h" -#include "input_state.h" -#include "resize.h" -#include "extensions.h" -#include "criteria.h" -#include "ipc-server.h" +#include "sway/handlers.h" +#include "sway/border.h" +#include "sway/layout.h" +#include "sway/config.h" +#include "sway/commands.h" +#include "sway/workspace.h" +#include "sway/container.h" +#include "sway/output.h" +#include "sway/focus.h" +#include "sway/input_state.h" +#include "sway/resize.h" +#include "sway/extensions.h" +#include "sway/criteria.h" +#include "sway/ipc-server.h" +#include "sway/input.h" #include "list.h" -#include "input.h" +#include "stringop.h" +#include "log.h" // Event should be sent to client #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 @@ #include #include #include -#include "config.h" -#include "input.h" +#include "sway/config.h" +#include "sway/input.h" #include "list.h" #include "log.h" 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 @@ #include #include #include +#include "sway/input_state.h" +#include "sway/config.h" #include "log.h" -#include "config.h" - -#include "input_state.h" #define KEY_STATE_MAX_LENGTH 64 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 @@ #include #include #include -#include "container.h" +#include "sway/container.h" +#include "sway/ipc-json.h" #include "util.h" -#include "ipc-json.h" static json_object *ipc_json_create_rect(swayc_t *c) { 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 @@ #include #include #include -#include "ipc-json.h" -#include "ipc-server.h" +#include "sway/ipc-json.h" +#include "sway/ipc-server.h" +#include "sway/config.h" +#include "sway/commands.h" +#include "sway/input.h" +#include "stringop.h" #include "log.h" -#include "config.h" -#include "commands.h" #include "list.h" -#include "stringop.h" #include "util.h" -#include "input.h" static int ipc_socket = -1; static struct wlc_event_source *ipc_event_source = NULL; diff --git a/sway/layout.c b/sway/layout.c index 01c8e4e3..cf6a111e 100644 --- a/sway/layout.c +++ b/sway/layout.c @@ -2,17 +2,17 @@ #include #include #include -#include "extensions.h" -#include "log.h" +#include "sway/extensions.h" +#include "sway/config.h" +#include "sway/container.h" +#include "sway/workspace.h" +#include "sway/focus.h" +#include "sway/output.h" +#include "sway/ipc-server.h" +#include "sway/border.h" +#include "sway/layout.h" #include "list.h" -#include "config.h" -#include "container.h" -#include "workspace.h" -#include "focus.h" -#include "output.h" -#include "ipc-server.h" -#include "border.h" -#include "layout.h" +#include "log.h" swayc_t root_container; list_t *scratchpad; 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 @@ #include #include #include -#include "extensions.h" -#include "layout.h" -#include "stringop.h" -#include "config.h" -#include "log.h" -#include "readline.h" -#include "handlers.h" +#include "sway/extensions.h" +#include "sway/layout.h" +#include "sway/config.h" +#include "sway/handlers.h" +#include "sway/input.h" +#include "sway/ipc-server.h" #include "ipc-client.h" -#include "ipc-server.h" -#include "input.h" +#include "readline.h" +#include "stringop.h" #include "sway.h" +#include "log.h" static bool terminate_request = false; 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 @@ #include #include #include -#include "output.h" +#include "sway/output.h" #include "log.h" #include "list.h" 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 @@ #include #include -#include "layout.h" -#include "focus.h" +#include "sway/layout.h" +#include "sway/focus.h" +#include "sway/input_state.h" +#include "sway/handlers.h" +#include "sway/resize.h" #include "log.h" -#include "input_state.h" -#include "handlers.h" -#include "resize.h" static bool set_size_floating(int new_dimension, bool use_width) { swayc_t *view = get_focused_float(swayc_active_workspace()); 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 @@ #include #include #include -#include "ipc-server.h" -#include "extensions.h" -#include "workspace.h" -#include "layout.h" -#include "list.h" -#include "log.h" -#include "container.h" -#include "handlers.h" -#include "config.h" +#include "sway/ipc-server.h" +#include "sway/extensions.h" +#include "sway/workspace.h" +#include "sway/layout.h" +#include "sway/container.h" +#include "sway/handlers.h" +#include "sway/config.h" +#include "sway/focus.h" #include "stringop.h" -#include "focus.h" #include "util.h" +#include "list.h" +#include "log.h" #include "ipc.h" char *prev_workspace_name = NULL; -- cgit v1.2.3 From 38ca94e0ed2fe33ab71076680e9f70409a2e4115 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Thu, 1 Sep 2016 08:34:52 -0400 Subject: Tweak how swaylock surfaces are handled Fixes #875 --- sway/extensions.c | 14 ++++---------- sway/focus.c | 15 +++++++-------- 2 files changed, 11 insertions(+), 18 deletions(-) (limited to 'sway') diff --git a/sway/extensions.c b/sway/extensions.c index 70ec537d..60cd8d41 100644 --- a/sway/extensions.c +++ b/sway/extensions.c @@ -119,27 +119,21 @@ static void set_lock_surface(struct wl_client *client, struct wl_resource *resou if (!swayc_is_child_of(view, workspace)) { move_container_to(view, workspace); } - // make the view floating so it doesn't rearrange other - // siblings. + // make the view floating so it doesn't rearrange other siblings. if (!view->is_floating) { - // Remove view from its current location destroy_container(remove_child(view)); - // and move it into workspace floating add_floating(workspace, view); } wlc_view_set_state(view->handle, WLC_BIT_FULLSCREEN, true); - workspace->fullscreen = view; - ipc_event_window(view, "fullscreen_mode"); + wlc_view_bring_to_front(view->handle); + wlc_view_focus(view->handle); desktop_shell.is_locked = true; - // reset input state input_init(); - // set focus if the lockscreen is spawned on the currently - // active output + arrange_windows(workspace, -1, -1); swayc_t *focus_output = swayc_active_output(); if (focus_output == output) { set_focused_container(view); } - arrange_windows(workspace, -1, -1); list_add(desktop_shell.lock_surfaces, surface); wl_resource_set_destructor(surface, lock_surface_destructor); } else { diff --git a/sway/focus.c b/sway/focus.c index 9207260d..02e61ac2 100644 --- a/sway/focus.c +++ b/sway/focus.c @@ -3,6 +3,7 @@ #include "sway/workspace.h" #include "sway/layout.h" #include "sway/config.h" +#include "sway/extensions.h" #include "sway/input_state.h" #include "sway/ipc-server.h" #include "sway/border.h" @@ -88,7 +89,6 @@ swayc_t *get_focused_container(swayc_t *parent) { if (!parent) { return swayc_active_workspace(); } - // get focused container while (!parent->is_focused && parent->focused) { parent = parent->focused; } @@ -132,24 +132,24 @@ bool set_focused_container(swayc_t *c) { p->is_focused = false; } - // get new focused view and set focus to it. if (!(wlc_view_get_type(p->handle) & WLC_BIT_POPUP)) { - // unactivate previous focus if (focused->type == C_VIEW) { wlc_view_set_state(focused->handle, WLC_BIT_ACTIVATED, false); } update_container_border(focused); - // activate current focus if (c->type == C_VIEW) { wlc_view_set_state(c->handle, WLC_BIT_ACTIVATED, true); } - // set focus - wlc_view_focus(c->handle); + if (!desktop_shell.is_locked) { + // If the system is locked, we do everything _but_ actually setting + // focus. This includes making our internals think that this view is + // focused. + wlc_view_focus(c->handle); + } if (c->parent->layout != L_TABBED && c->parent->layout != L_STACKED) { update_container_border(c); } - // rearrange if parent container is tabbed/stacked swayc_t *parent = swayc_tabbed_stacked_ancestor(c); if (parent != NULL) { arrange_backgrounds(); @@ -174,7 +174,6 @@ bool set_focused_container_for(swayc_t *a, swayc_t *c) { return false; } swayc_t *find = c; - // Ensure that a is an ancestor of c while (find != a && (find = find->parent)) { if (find == &root_container) { return false; -- cgit v1.2.3 From 6addaca9fafbc20a0fa52f630e1002d6d9240b8f Mon Sep 17 00:00:00 2001 From: Lukas Lihotzki Date: Fri, 2 Sep 2016 00:46:36 +0200 Subject: Correct `hide_edge_borders` command `vertical` and `horizontal` should be swapped. If border_left and border_right were set to 0, the vertical borders instead of the horizontal borders would be hidden. i3 handles this command equally. --- sway/layout.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sway') diff --git a/sway/layout.c b/sway/layout.c index cf6a111e..7f053d9b 100644 --- a/sway/layout.c +++ b/sway/layout.c @@ -575,7 +575,7 @@ void update_geometry(swayc_t *container) { // handle hide_edge_borders if (config->hide_edge_borders != E_NONE && (gap <= 0 || (config->smart_gaps && workspace->children->length == 1))) { - if (config->hide_edge_borders == E_HORIZONTAL || config->hide_edge_borders == E_BOTH) { + if (config->hide_edge_borders == E_VERTICAL || config->hide_edge_borders == E_BOTH) { if (geometry.origin.x == workspace->x) { border_left = 0; } @@ -585,7 +585,7 @@ void update_geometry(swayc_t *container) { } } - if (config->hide_edge_borders == E_VERTICAL || config->hide_edge_borders == E_BOTH) { + if (config->hide_edge_borders == E_HORIZONTAL || config->hide_edge_borders == E_BOTH) { if (geometry.origin.y == workspace->y || should_hide_top_border(container, geometry.origin.y)) { border_top = 0; } -- cgit v1.2.3