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

Merge pull request #3815 from xzfc/3694-baf-rename 

When renaming a workspace, update the previous_workspace_name too
next
Orestis 2019-10-09 12:38:48 +03:00 committed by GitHub
parent ea216f88d8 7e4eb51d23
commit 5e1094e994
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 54 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/commands.c
View File

@ -2013,6 +2013,13 @@ void cmd_rename_workspace(I3_CMD, const char *old_name, const char *new_name) {
con_focus(previously_focused);
}
/* Let back-and-forth work after renaming the previous workspace.
* See #3694. */
if (previous_workspace_name && !strcmp(previous_workspace_name, old_name_copy)) {
FREE(previous_workspace_name);
previous_workspace_name = sstrdup(new_name);
}
cmd_output->needs_tree_render = true;
ysuccess(true);

47
testcases/t/176-workspace-baf.t
View File

@ -171,6 +171,53 @@ cmd 'restart';
cmd 'workspace back_and_forth';
is(focused_ws, '5: foo', 'workspace 5 focused after restart');
################################################################################
# Check BAF switching to renamed workspace.
# Issue: #3694
################################################################################
kill_all_windows;
cmd 'workspace --no-auto-back-and-forth 1';
open_window;
cmd 'workspace --no-auto-back-and-forth 2';
cmd 'rename workspace 1 to 3';
cmd 'workspace back_and_forth';
is(focused_ws, '3', 'workspace 3 focused after rename');
################################################################################
# Check BAF switching to renamed and then closed workspace.
# Issue: #3694
################################################################################
kill_all_windows;
cmd 'workspace --no-auto-back-and-forth 1';
$first_win = open_window;
cmd 'workspace --no-auto-back-and-forth 2';
cmd 'rename workspace 1 to 3';
cmd '[id="' . $first_win->id . '"] kill';
cmd 'workspace back_and_forth';
is(focused_ws, '3', 'workspace 3 focused after renaming and destroying');
################################################################################
# See if renaming current workspace doesn't affect BAF switching to another
# renamed workspace.
# Issue: #3694
################################################################################
kill_all_windows;
cmd 'workspace --no-auto-back-and-forth 1';
$first_win = open_window;
cmd 'workspace --no-auto-back-and-forth 2';
cmd 'rename workspace 1 to 3';
cmd 'rename workspace 2 to 4';
cmd 'workspace back_and_forth';
is(focused_ws, '3', 'workspace 3 focused after renaming');
exit_gracefully($pid);
done_testing;