mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-19 14:39:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2526 from ianyfan/commands

Browse source 
Fix moving container to inactive workspace on different output
This commit is contained in:
Brian Ashworth 2018-08-28 12:41:18 -04:00 committed by GitHub
parent 6143a64cda 876b5147cf
commit 602ccca1a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
sway/commands/move.c
View file

@ -529,8 +529,10 @@ static struct cmd_results *cmd_move_container(struct sway_container *current,
argv++; argv++;
} }
struct sway_seat *seat = config->handler_context.seat;
struct sway_container *old_parent = current->parent; struct sway_container *old_parent = current->parent;
struct sway_container *old_ws = container_parent(current, C_WORKSPACE); struct sway_container *old_ws = container_parent(current, C_WORKSPACE);
struct sway_container *old_output = container_parent(current, C_OUTPUT);
struct sway_container *destination = NULL; struct sway_container *destination = NULL;
// determine destination // determine destination
@ -586,9 +588,7 @@ static struct cmd_results *cmd_move_container(struct sway_container *current,
// We have to create the workspace, but if the container is // We have to create the workspace, but if the container is
// sticky and the workspace is going to be created on the same // sticky and the workspace is going to be created on the same
// output, we'll bail out first. // output, we'll bail out first.
if (container_is_floating(current) && current->is_sticky) { if (current->is_sticky) {
struct sway_container *old_output =
container_parent(current, C_OUTPUT);
struct sway_container *new_output = struct sway_container *new_output =
workspace_get_initial_output(ws_name); workspace_get_initial_output(ws_name);
if (old_output == new_output) { if (old_output == new_output) {
@ -601,17 +601,15 @@ static struct cmd_results *cmd_move_container(struct sway_container *current,
ws = workspace_create(NULL, ws_name); ws = workspace_create(NULL, ws_name);
} }
free(ws_name); free(ws_name);
destination = seat_get_focus_inactive(config->handler_context.seat, ws); destination = seat_get_focus_inactive(seat, ws);
} else if (strcasecmp(argv[1], "output") == 0) { } else if (strcasecmp(argv[1], "output") == 0) {
struct sway_container *source = container_parent(current, C_OUTPUT);
struct sway_container *dest_output = output_in_direction(argv[2], struct sway_container *dest_output = output_in_direction(argv[2],
source->sway_output->wlr_output, current->x, current->y); old_output->sway_output->wlr_output, current->x, current->y);
if (!dest_output) { if (!dest_output) {
return cmd_results_new(CMD_FAILURE, "move workspace", return cmd_results_new(CMD_FAILURE, "move workspace",
"Can't find output with name/direction '%s'", argv[2]); "Can't find output with name/direction '%s'", argv[2]);
} }
destination = seat_get_focus_inactive( destination = seat_get_focus_inactive(seat, dest_output);
config->handler_context.seat, dest_output);
if (!destination) { if (!destination) {
// We've never been to this output before // We've never been to this output before
destination = dest_output->children->items[0]; destination = dest_output->children->items[0];
@ -627,21 +625,28 @@ static struct cmd_results *cmd_move_container(struct sway_container *current,
return cmd_results_new(CMD_INVALID, "move", expected_syntax); return cmd_results_new(CMD_INVALID, "move", expected_syntax);
} }
if (container_is_floating(current) && current->is_sticky) { struct sway_container *new_output = destination->type == C_OUTPUT ?
struct sway_container *old_output = container_parent(current, C_OUTPUT); destination : container_parent(destination, C_OUTPUT);
struct sway_container *new_output = destination->type == C_OUTPUT ? if (current->is_sticky && old_output == new_output) {
destination : container_parent(destination, C_OUTPUT); return cmd_results_new(CMD_FAILURE, "move", "Can't move sticky "
if (old_output == new_output) { "container to another workspace on the same output");
return cmd_results_new(CMD_FAILURE, "move", "Can't move sticky "
"container to another workspace on the same output");
}
} }
struct sway_container *new_output_last_ws = old_output == new_output ?
NULL : seat_get_active_child(seat, new_output);
struct sway_container *new_workspace = destination->type == C_WORKSPACE ?
destination : container_parent(destination, C_WORKSPACE);
// move container, arrange windows and return focus // move container, arrange windows and return focus
container_move_to(current, destination); container_move_to(current, destination);
struct sway_container *focus = if (new_output_last_ws && new_output_last_ws != new_workspace) {
seat_get_focus_inactive(config->handler_context.seat, old_parent); // change focus on destination output back to its last active workspace
seat_set_focus_warp(config->handler_context.seat, focus, true, false); struct sway_container *new_output_last_focus =
seat_get_focus_inactive(seat, new_output_last_ws);
seat_set_focus_warp(seat, new_output_last_focus, false, false);
}
struct sway_container *focus = seat_get_focus_inactive(seat, old_parent);
seat_set_focus_warp(seat, focus, true, false);
container_reap_empty(old_parent); container_reap_empty(old_parent);
container_reap_empty(destination->parent); container_reap_empty(destination->parent);