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

Merge pull request #3200 from orestisf1993/_con_move_to_con 

_con_move_to_con: don't change focus when moving to active workspace
This commit is contained in:
Ingo Bürk 2018-03-29 12:06:29 +02:00 committed by GitHub
parent 145a93d5b4 6d983b5ee0
commit 77bfa595df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 50 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/con.c
View File

@ -1209,14 +1209,21 @@ static bool _con_move_to_con(Con *con, Con *target, bool behind_focused, bool fi
/* We need to save the focused workspace on the output in case the /* We need to save the focused workspace on the output in case the
* new workspace is hidden and it's necessary to immediately switch * new workspace is hidden and it's necessary to immediately switch
* back to the originally-focused workspace. */ * back to the originally-focused workspace. */
Con *old_focus = TAILQ_FIRST(&(output_get_content(dest_output)->focus_head)); Con *old_focus_ws = TAILQ_FIRST(&(output_get_content(dest_output)->focus_head));
Con *old_focus = focused;
con_activate(con_descend_focused(con)); con_activate(con_descend_focused(con));
/* Restore focus if the output's focused workspace has changed. */ /* Restore focus if the output's focused workspace has changed. */
if (con_get_workspace(focused) != old_focus) if (con_get_workspace(focused) != old_focus_ws) {
con_focus(old_focus); con_focus(old_focus);
} }
/* Restore focus to the currently focused container. */
if (old_focus_ws == current_ws && old_focus->type != CT_WORKSPACE) {
con_activate(old_focus);
}
}
/* 7: when moving to another workspace, we leave the focus on the current /* 7: when moving to another workspace, we leave the focus on the current
* workspace. (see also #809) */ * workspace. (see also #809) */
if (!ignore_focus) { if (!ignore_focus) {

6
src/output.c
View File

@ -101,6 +101,12 @@ void output_push_sticky_windows(Con *to_focus) {
if (con_is_sticky(current)) { if (con_is_sticky(current)) {
bool ignore_focus = (to_focus == NULL) || (current != to_focus->parent); bool ignore_focus = (to_focus == NULL) || (current != to_focus->parent);
con_move_to_workspace(current, visible_ws, true, false, ignore_focus); con_move_to_workspace(current, visible_ws, true, false, ignore_focus);
if (!ignore_focus) {
Con *current_ws = con_get_workspace(focused);
con_activate(con_descend_focused(current));
/* Pushing sticky windows shouldn't change the focused workspace. */
con_activate(con_descend_focused(current_ws));
}
} }
} }
} }

35
testcases/t/294-focus-order.t
View File

@ -141,4 +141,39 @@ cmd '[con_mark=a] move to workspace ' . get_unused_workspace;
is(@{get_ws_content($ws)}, 2, 'Sanity check: marked window moved'); is(@{get_ws_content($ws)}, 2, 'Sanity check: marked window moved');
confirm_focus('Move unfocused window from split container'); confirm_focus('Move unfocused window from split container');
######################################################################
# Moving containers to another workspace puts them on the top of the
# focus stack but behind the focused container.
######################################################################
for my $new_workspace (0 .. 1) {
fresh_workspace;
$windows[2] = open_window;
$windows[1] = open_window;
fresh_workspace if $new_workspace;
$windows[3] = open_window;
$windows[0] = open_window;
cmd 'mark target';
cmd '[id=' . $windows[2]->id . '] move to mark target';
cmd '[id=' . $windows[1]->id . '] move to mark target';
confirm_focus('\'move to mark\' focus order' . ($new_workspace ? ' when moving containers from other workspace' : ''));
}
######################################################################
# Same but with workspace commands.
######################################################################
fresh_workspace;
$windows[2] = open_window;
$windows[1] = open_window;
$ws = fresh_workspace;
$windows[3] = open_window;
$windows[0] = open_window;
cmd 'mark target';
cmd '[id=' . $windows[2]->id . '] move to workspace ' . $ws;
cmd '[id=' . $windows[1]->id . '] move to workspace ' . $ws;
confirm_focus('\'move to workspace\' focus order when moving containers from other workspace');
done_testing; done_testing;