aboutsummaryrefslogtreecommitdiff
path: root/sway/commands
diff options
context:
space:
mode:
authorRyan Dwyer <ryandwyer1@gmail.com>2018-07-26 18:36:46 +1000
committerRyan Dwyer <ryandwyer1@gmail.com>2018-07-28 22:41:04 +1000
commit08cfba2192f5770d975c5fe70789a81aaee4dc7e (patch)
tree7f07e32020649ae5c049e8533f0cf040dc80e166 /sway/commands
parenta2164c666197e983b2059647e31fd93491893c43 (diff)
Allow containers to float
Things worth noting: * When a fullscreen view unmaps, the check to unset fullscreen on the workspace has been moved out of view_unmap and into container_destroy, because containers can be fullscreen too * The calls to `container_reap_empty_recursive(workspace)` have been removed from `container_set_floating`. That function reaps upwards so it wouldn't do anything. I'm probably the one who originally added it... * My fix (b14bd1b0b1536039e4f46fe94515c7c44e7afc61) for the tabbed child crash has a side effect where when you close a floating container, focus is not given to the tiled container again. I've removed my fix and removed the call to `send_cursor_motion` from `seat_set_focus_warp`. We should consider calling it from somewhere earlier in the call stack.
Diffstat (limited to 'sway/commands')
-rw-r--r--sway/commands/floating.c13
-rw-r--r--sway/commands/move.c10
2 files changed, 18 insertions, 5 deletions
diff --git a/sway/commands/floating.c b/sway/commands/floating.c
index 6ab56c3b..b67e736f 100644
--- a/sway/commands/floating.c
+++ b/sway/commands/floating.c
@@ -17,9 +17,16 @@ struct cmd_results *cmd_floating(int argc, char **argv) {
}
struct sway_container *container =
config->handler_context.current_container;
- if (container->type != C_VIEW) {
- // TODO: This doesn't strictly speaking have to be true
- return cmd_results_new(CMD_INVALID, "float", "Only views can float");
+ if (container->type == C_WORKSPACE && container->children->length == 0) {
+ return cmd_results_new(CMD_INVALID, "floating",
+ "Can't float an empty workspace");
+ }
+ if (container->type == C_WORKSPACE) {
+ // Wrap the workspace's children in a container so we can float it
+ struct sway_container *workspace = container;
+ container = container_wrap_children(container);
+ workspace->layout = L_HORIZ;
+ seat_set_focus(config->handler_context.seat, container);
}
bool wants_floating;
diff --git a/sway/commands/move.c b/sway/commands/move.c
index aede3d6c..b127c89f 100644
--- a/sway/commands/move.c
+++ b/sway/commands/move.c
@@ -298,9 +298,15 @@ static struct cmd_results *move_to_position(struct sway_container *container,
}
static struct cmd_results *move_to_scratchpad(struct sway_container *con) {
- if (con->type != C_CONTAINER && con->type != C_VIEW) {
+ if (con->type == C_WORKSPACE && con->children->length == 0) {
return cmd_results_new(CMD_INVALID, "move",
- "Only views and containers can be moved to the scratchpad");
+ "Can't move an empty workspace to the scratchpad");
+ }
+ if (con->type == C_WORKSPACE) {
+ // Wrap the workspace's children in a container
+ struct sway_container *workspace = con;
+ con = container_wrap_children(con);
+ workspace->layout = L_HORIZ;
}
if (con->scratchpad) {
return cmd_results_new(CMD_INVALID, "move",