Merge pull request #1513 from Airblader/defect-1473
Move workspace to assigned output when renaming it
This commit is contained in:
Michael Stapelberg
commit
a5939f3edc
|
|
@ -14,3 +14,10 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
Con *output_get_content(Con *output);
|
Con *output_get_content(Con *output);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns an 'output' corresponding to one of left/right/down/up or a specific
|
||||||
|
* output name.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
Output *get_output_from_string(Output *current_output, const char *output_str);
|
||||||
|
|
|
||||||
|
|
@ -179,3 +179,10 @@ Con *workspace_attach_to(Con *ws);
|
||||||
* The container inherits the layout from the workspace.
|
* The container inherits the layout from the workspace.
|
||||||
*/
|
*/
|
||||||
Con *workspace_encapsulate(Con *ws);
|
Con *workspace_encapsulate(Con *ws);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Move the given workspace to the specified output.
|
||||||
|
* This returns true if and only if moving the workspace was successful.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
bool workspace_move_to_output(Con *ws, char *output);
|
||||||
|
|
|
||||||
137
src/commands.c
137
src/commands.c
|
|
@ -65,28 +65,6 @@ static bool definitelyGreaterThan(float a, float b, float epsilon) {
|
||||||
return (a - b) > ((fabs(a) < fabs(b) ? fabs(b) : fabs(a)) * epsilon);
|
return (a - b) > ((fabs(a) < fabs(b) ? fabs(b) : fabs(a)) * epsilon);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* Returns an 'output' corresponding to one of left/right/down/up or a specific
|
|
||||||
* output name.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
static Output *get_output_from_string(Output *current_output, const char *output_str) {
|
|
||||||
Output *output;
|
|
||||||
|
|
||||||
if (strcasecmp(output_str, "left") == 0)
|
|
||||||
output = get_output_next_wrap(D_LEFT, current_output);
|
|
||||||
else if (strcasecmp(output_str, "right") == 0)
|
|
||||||
output = get_output_next_wrap(D_RIGHT, current_output);
|
|
||||||
else if (strcasecmp(output_str, "up") == 0)
|
|
||||||
output = get_output_next_wrap(D_UP, current_output);
|
|
||||||
else if (strcasecmp(output_str, "down") == 0)
|
|
||||||
output = get_output_next_wrap(D_DOWN, current_output);
|
|
||||||
else
|
|
||||||
output = get_output_by_name(output_str);
|
|
||||||
|
|
||||||
return output;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Returns the output containing the given container.
|
* Returns the output containing the given container.
|
||||||
*/
|
*/
|
||||||
|
|
@ -1265,101 +1243,12 @@ void cmd_move_workspace_to_output(I3_CMD, char *name) {
|
||||||
|
|
||||||
owindow *current;
|
owindow *current;
|
||||||
TAILQ_FOREACH(current, &owindows, owindows) {
|
TAILQ_FOREACH(current, &owindows, owindows) {
|
||||||
Output *current_output = get_output_of_con(current->con);
|
|
||||||
if (!current_output) {
|
|
||||||
ELOG("Cannot get current output. This is a bug in i3.\n");
|
|
||||||
ysuccess(false);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
Output *output = get_output_from_string(current_output, name);
|
|
||||||
if (!output) {
|
|
||||||
ELOG("Could not get output from string \"%s\"\n", name);
|
|
||||||
ysuccess(false);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
Con *content = output_get_content(output->con);
|
|
||||||
LOG("got output %p with content %p\n", output, content);
|
|
||||||
|
|
||||||
Con *previously_visible_ws = TAILQ_FIRST(&(content->nodes_head));
|
|
||||||
LOG("Previously visible workspace = %p / %s\n", previously_visible_ws, previously_visible_ws->name);
|
|
||||||
|
|
||||||
Con *ws = con_get_workspace(current->con);
|
Con *ws = con_get_workspace(current->con);
|
||||||
LOG("should move workspace %p / %s\n", ws, ws->name);
|
bool success = workspace_move_to_output(ws, name);
|
||||||
bool workspace_was_visible = workspace_is_visible(ws);
|
if (!success) {
|
||||||
|
ELOG("Failed to move workspace to output.\n");
|
||||||
if (con_num_children(ws->parent) == 1) {
|
ysuccess(false);
|
||||||
LOG("Creating a new workspace to replace \"%s\" (last on its output).\n", ws->name);
|
return;
|
||||||
|
|
||||||
/* check if we can find a workspace assigned to this output */
|
|
||||||
bool used_assignment = false;
|
|
||||||
struct Workspace_Assignment *assignment;
|
|
||||||
TAILQ_FOREACH(assignment, &ws_assignments, ws_assignments) {
|
|
||||||
if (strcmp(assignment->output, current_output->name) != 0)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
/* check if this workspace is already attached to the tree */
|
|
||||||
Con *workspace = NULL, *out;
|
|
||||||
TAILQ_FOREACH(out, &(croot->nodes_head), nodes)
|
|
||||||
GREP_FIRST(workspace, output_get_content(out),
|
|
||||||
!strcasecmp(child->name, assignment->name));
|
|
||||||
if (workspace != NULL)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
/* so create the workspace referenced to by this assignment */
|
|
||||||
LOG("Creating workspace from assignment %s.\n", assignment->name);
|
|
||||||
workspace_get(assignment->name, NULL);
|
|
||||||
used_assignment = true;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* if we couldn't create the workspace using an assignment, create
|
|
||||||
* it on the output */
|
|
||||||
if (!used_assignment)
|
|
||||||
create_workspace_on_output(current_output, ws->parent);
|
|
||||||
|
|
||||||
/* notify the IPC listeners */
|
|
||||||
ipc_send_workspace_event("init", ws, NULL);
|
|
||||||
}
|
|
||||||
DLOG("Detaching\n");
|
|
||||||
|
|
||||||
/* detach from the old output and attach to the new output */
|
|
||||||
Con *old_content = ws->parent;
|
|
||||||
con_detach(ws);
|
|
||||||
if (workspace_was_visible) {
|
|
||||||
/* The workspace which we just detached was visible, so focus
|
|
||||||
* the next one in the focus-stack. */
|
|
||||||
Con *focus_ws = TAILQ_FIRST(&(old_content->focus_head));
|
|
||||||
LOG("workspace was visible, focusing %p / %s now\n", focus_ws, focus_ws->name);
|
|
||||||
workspace_show(focus_ws);
|
|
||||||
}
|
|
||||||
con_attach(ws, content, false);
|
|
||||||
|
|
||||||
/* fix the coordinates of the floating containers */
|
|
||||||
Con *floating_con;
|
|
||||||
TAILQ_FOREACH(floating_con, &(ws->floating_head), floating_windows)
|
|
||||||
floating_fix_coordinates(floating_con, &(old_content->rect), &(content->rect));
|
|
||||||
|
|
||||||
ipc_send_workspace_event("move", ws, NULL);
|
|
||||||
if (workspace_was_visible) {
|
|
||||||
/* Focus the moved workspace on the destination output. */
|
|
||||||
workspace_show(ws);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* NB: We cannot simply work with previously_visible_ws since it might
|
|
||||||
* have been cleaned up by workspace_show() already, depending on the
|
|
||||||
* focus order/number of other workspaces on the output.
|
|
||||||
* Instead, we loop through the available workspaces and only work with
|
|
||||||
* previously_visible_ws if we still find it. */
|
|
||||||
TAILQ_FOREACH(ws, &(content->nodes_head), nodes) {
|
|
||||||
if (ws != previously_visible_ws)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
/* Call the on_remove_child callback of the workspace which previously
|
|
||||||
* was visible on the destination output. Since it is no longer
|
|
||||||
* visible, it might need to get cleaned up. */
|
|
||||||
CALL(previously_visible_ws, on_remove_child);
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -2034,6 +1923,22 @@ void cmd_rename_workspace(I3_CMD, char *old_name, char *new_name) {
|
||||||
Con *parent = workspace->parent;
|
Con *parent = workspace->parent;
|
||||||
con_detach(workspace);
|
con_detach(workspace);
|
||||||
con_attach(workspace, parent, false);
|
con_attach(workspace, parent, false);
|
||||||
|
|
||||||
|
/* Move the workspace to the correct output if it has an assignment */
|
||||||
|
struct Workspace_Assignment *assignment = NULL;
|
||||||
|
TAILQ_FOREACH(assignment, &ws_assignments, ws_assignments) {
|
||||||
|
if (assignment->output == NULL)
|
||||||
|
continue;
|
||||||
|
if (strcmp(assignment->name, workspace->name) != 0
|
||||||
|
&& (!name_is_digits(assignment->name) || ws_name_to_number(assignment->name) != workspace->num)) {
|
||||||
|
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
workspace_move_to_output(workspace, assignment->output);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
/* Restore the previous focus since con_attach messes with the focus. */
|
/* Restore the previous focus since con_attach messes with the focus. */
|
||||||
con_focus(previously_focused);
|
con_focus(previously_focused);
|
||||||
|
|
||||||
|
|
|
||||||
22
src/output.c
22
src/output.c
|
|
@ -24,3 +24,25 @@ Con *output_get_content(Con *output) {
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Returns an 'output' corresponding to one of left/right/down/up or a specific
|
||||||
|
* output name.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
Output *get_output_from_string(Output *current_output, const char *output_str) {
|
||||||
|
Output *output;
|
||||||
|
|
||||||
|
if (strcasecmp(output_str, "left") == 0)
|
||||||
|
output = get_output_next_wrap(D_LEFT, current_output);
|
||||||
|
else if (strcasecmp(output_str, "right") == 0)
|
||||||
|
output = get_output_next_wrap(D_RIGHT, current_output);
|
||||||
|
else if (strcasecmp(output_str, "up") == 0)
|
||||||
|
output = get_output_next_wrap(D_UP, current_output);
|
||||||
|
else if (strcasecmp(output_str, "down") == 0)
|
||||||
|
output = get_output_next_wrap(D_DOWN, current_output);
|
||||||
|
else
|
||||||
|
output = get_output_by_name(output_str);
|
||||||
|
|
||||||
|
return output;
|
||||||
|
}
|
||||||
|
|
|
||||||
108
src/workspace.c
108
src/workspace.c
|
|
@ -879,3 +879,111 @@ Con *workspace_encapsulate(Con *ws) {
|
||||||
|
|
||||||
return new;
|
return new;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Move the given workspace to the specified output.
|
||||||
|
* This returns true if and only if moving the workspace was successful.
|
||||||
|
*/
|
||||||
|
bool workspace_move_to_output(Con *ws, char *name) {
|
||||||
|
LOG("Trying to move workspace %p / %s to output \"%s\".\n", ws, ws->name, name);
|
||||||
|
|
||||||
|
Con *current_output_con = con_get_output(ws);
|
||||||
|
if (!current_output_con) {
|
||||||
|
ELOG("Could not get the output container for workspace %p / %s.\n", ws, ws->name);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
Output *current_output = get_output_by_name(current_output_con->name);
|
||||||
|
if (!current_output) {
|
||||||
|
ELOG("Cannot get current output. This is a bug in i3.\n");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
Output *output = get_output_from_string(current_output, name);
|
||||||
|
if (!output) {
|
||||||
|
ELOG("Could not get output from string \"%s\"\n", name);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
Con *content = output_get_content(output->con);
|
||||||
|
LOG("got output %p with content %p\n", output, content);
|
||||||
|
|
||||||
|
Con *previously_visible_ws = TAILQ_FIRST(&(content->nodes_head));
|
||||||
|
LOG("Previously visible workspace = %p / %s\n", previously_visible_ws, previously_visible_ws->name);
|
||||||
|
|
||||||
|
bool workspace_was_visible = workspace_is_visible(ws);
|
||||||
|
if (con_num_children(ws->parent) == 1) {
|
||||||
|
LOG("Creating a new workspace to replace \"%s\" (last on its output).\n", ws->name);
|
||||||
|
|
||||||
|
/* check if we can find a workspace assigned to this output */
|
||||||
|
bool used_assignment = false;
|
||||||
|
struct Workspace_Assignment *assignment;
|
||||||
|
TAILQ_FOREACH(assignment, &ws_assignments, ws_assignments) {
|
||||||
|
if (assignment->output == NULL || strcmp(assignment->output, current_output->name) != 0)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
/* check if this workspace is already attached to the tree */
|
||||||
|
Con *workspace = NULL, *out;
|
||||||
|
TAILQ_FOREACH(out, &(croot->nodes_head), nodes)
|
||||||
|
GREP_FIRST(workspace, output_get_content(out),
|
||||||
|
!strcasecmp(child->name, assignment->name));
|
||||||
|
if (workspace != NULL)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
/* so create the workspace referenced to by this assignment */
|
||||||
|
LOG("Creating workspace from assignment %s.\n", assignment->name);
|
||||||
|
workspace_get(assignment->name, NULL);
|
||||||
|
used_assignment = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* if we couldn't create the workspace using an assignment, create
|
||||||
|
* it on the output */
|
||||||
|
if (!used_assignment)
|
||||||
|
create_workspace_on_output(current_output, ws->parent);
|
||||||
|
|
||||||
|
/* notify the IPC listeners */
|
||||||
|
ipc_send_workspace_event("init", ws, NULL);
|
||||||
|
}
|
||||||
|
DLOG("Detaching\n");
|
||||||
|
|
||||||
|
/* detach from the old output and attach to the new output */
|
||||||
|
Con *old_content = ws->parent;
|
||||||
|
con_detach(ws);
|
||||||
|
if (workspace_was_visible) {
|
||||||
|
/* The workspace which we just detached was visible, so focus
|
||||||
|
* the next one in the focus-stack. */
|
||||||
|
Con *focus_ws = TAILQ_FIRST(&(old_content->focus_head));
|
||||||
|
LOG("workspace was visible, focusing %p / %s now\n", focus_ws, focus_ws->name);
|
||||||
|
workspace_show(focus_ws);
|
||||||
|
}
|
||||||
|
con_attach(ws, content, false);
|
||||||
|
|
||||||
|
/* fix the coordinates of the floating containers */
|
||||||
|
Con *floating_con;
|
||||||
|
TAILQ_FOREACH(floating_con, &(ws->floating_head), floating_windows)
|
||||||
|
floating_fix_coordinates(floating_con, &(old_content->rect), &(content->rect));
|
||||||
|
|
||||||
|
ipc_send_workspace_event("move", ws, NULL);
|
||||||
|
if (workspace_was_visible) {
|
||||||
|
/* Focus the moved workspace on the destination output. */
|
||||||
|
workspace_show(ws);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* NB: We cannot simply work with previously_visible_ws since it might
|
||||||
|
* have been cleaned up by workspace_show() already, depending on the
|
||||||
|
* focus order/number of other workspaces on the output.
|
||||||
|
* Instead, we loop through the available workspaces and only work with
|
||||||
|
* previously_visible_ws if we still find it. */
|
||||||
|
TAILQ_FOREACH(ws, &(content->nodes_head), nodes) {
|
||||||
|
if (ws != previously_visible_ws)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
/* Call the on_remove_child callback of the workspace which previously
|
||||||
|
* was visible on the destination output. Since it is no longer
|
||||||
|
* visible, it might need to get cleaned up. */
|
||||||
|
CALL(previously_visible_ws, on_remove_child);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,90 @@
|
||||||
|
#!perl
|
||||||
|
# vim:ts=4:sw=4:expandtab
|
||||||
|
#
|
||||||
|
# Please read the following documents before working on tests:
|
||||||
|
# • http://build.i3wm.org/docs/testsuite.html
|
||||||
|
# (or docs/testsuite)
|
||||||
|
#
|
||||||
|
# • http://build.i3wm.org/docs/lib-i3test.html
|
||||||
|
# (alternatively: perldoc ./testcases/lib/i3test.pm)
|
||||||
|
#
|
||||||
|
# • http://build.i3wm.org/docs/ipc.html
|
||||||
|
# (or docs/ipc)
|
||||||
|
#
|
||||||
|
# • http://onyxneon.com/books/modern_perl/modern_perl_a4.pdf
|
||||||
|
# (unless you are already familiar with Perl)
|
||||||
|
#
|
||||||
|
#
|
||||||
|
# Tests that workspaces are moved to the assigned output if they
|
||||||
|
# are renamed to an assigned name.
|
||||||
|
# Ticket: #1473
|
||||||
|
|
||||||
|
use i3test i3_autostart => 0;
|
||||||
|
|
||||||
|
my $config = <<EOT;
|
||||||
|
# i3 config file (v4)
|
||||||
|
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
|
||||||
|
fake-outputs 1024x768+0+0,1024x768+1024+0
|
||||||
|
|
||||||
|
workspace 1 output fake-0
|
||||||
|
workspace 2 output fake-1
|
||||||
|
workspace 3:foo output fake-1
|
||||||
|
workspace baz output fake-1
|
||||||
|
EOT
|
||||||
|
|
||||||
|
my $pid = launch_with_config($config);
|
||||||
|
my $i3 = i3(get_socket_path());
|
||||||
|
$i3->connect->recv;
|
||||||
|
|
||||||
|
# Returns the name of the output on which this workspace resides
|
||||||
|
sub get_output_for_workspace {
|
||||||
|
my $ws_name = shift @_;
|
||||||
|
|
||||||
|
foreach (grep { not $_->{name} =~ /^__/ } @{$i3->get_tree->recv->{nodes}}) {
|
||||||
|
my $output = $_->{name};
|
||||||
|
foreach (grep { $_->{name} =~ "content" } @{$_->{nodes}}) {
|
||||||
|
return $output if $_->{nodes}[0]->{name} =~ $ws_name;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
##########################################################################
|
||||||
|
# Renaming the workspace to an unassigned name does not move the workspace
|
||||||
|
# (regression test)
|
||||||
|
##########################################################################
|
||||||
|
|
||||||
|
cmd 'focus output fake-0';
|
||||||
|
cmd 'rename workspace to unassigned';
|
||||||
|
is(get_output_for_workspace('unassigned'), 'fake-0',
|
||||||
|
'Unassigned workspace should stay on its output when being renamed');
|
||||||
|
|
||||||
|
##########################################################################
|
||||||
|
# Renaming a workspace by number only triggers the assignment
|
||||||
|
##########################################################################
|
||||||
|
|
||||||
|
cmd 'focus output fake-0';
|
||||||
|
cmd 'rename workspace to 2';
|
||||||
|
is(get_output_for_workspace('2'), 'fake-1',
|
||||||
|
'Renaming the workspace to a number should move it to the assigned output');
|
||||||
|
|
||||||
|
##########################################################################
|
||||||
|
# Renaming a workspace by number and name triggers the assignment
|
||||||
|
##########################################################################
|
||||||
|
|
||||||
|
cmd 'focus output fake-0';
|
||||||
|
cmd 'rename workspace to "2:foo"';
|
||||||
|
is(get_output_for_workspace('2:foo'), 'fake-1',
|
||||||
|
'Renaming the workspace to a number and name should move it to the assigned output');
|
||||||
|
|
||||||
|
##########################################################################
|
||||||
|
# Renaming a workspace by name only triggers the assignment
|
||||||
|
##########################################################################
|
||||||
|
|
||||||
|
cmd 'focus output fake-0';
|
||||||
|
cmd 'rename workspace to baz';
|
||||||
|
is(get_output_for_workspace('baz'), 'fake-1',
|
||||||
|
'Renaming the workspace to a number and name should move it to the assigned output');
|
||||||
|
|
||||||
|
|
||||||
|
exit_gracefully($pid);
|
||||||
|
done_testing;
|
||||||
Loading…
Reference in New Issue