nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

When renaming a workspace, look for assignments and move the renamed workspace to the appropriate output.

This commit is contained in:
Ingo Bürk 2015-03-04 09:06:44 +01:00
parent bb6823f5c7
commit bcc1314a2d
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/commands.c
View File

@ -2034,6 +2034,24 @@ 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;
}
/* Focus this workspace for now, we will restore the previous focus anyway. */
con_focus(workspace);
cmd_move_workspace_to_output(current_match, cmd_output, 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);