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

scratchpad_show focus unfocused scratchpad window 

When there's an unfocused scratchpad window on the current workspace
scratchpad_show will focus that scratchpad window.
This commit is contained in:
Sascha Kruse 2013-01-28 10:11:53 +01:00 committed by Michael Stapelberg
parent 03693bf0cc
commit bbede97966
2 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/scratchpad.c
View File

@ -89,10 +89,27 @@ void scratchpad_show(Con *con) {
} }
/* If this was 'scratchpad show' without criteria, we check if there is a /* If this was 'scratchpad show' without criteria, we check if there is a
* visible scratchpad window on another workspace. In this case we move it * unfocused scratchpad on the current workspace and focus it */
* to the current workspace. */
Con *walk_con; Con *walk_con;
Con *focused_ws = con_get_workspace(focused); Con *focused_ws = con_get_workspace(focused);
TAILQ_FOREACH(walk_con, &(focused_ws->floating_head), floating_windows) {
if ((floating = con_inside_floating(walk_con)) &&
floating->scratchpad_state != SCRATCHPAD_NONE &&
floating != con_inside_floating(focused)) {
DLOG("Found an unfocused scratchpad window on this workspace\n");
DLOG("Focusing it: %p\n", walk_con);
/* use con_descend_tiling_focused to get the last focused
* window inside this scratch container in order to
* keep the focus the same within this container */
con_focus(con_descend_tiling_focused(walk_con));
return;
}
}
/* If this was 'scratchpad show' without criteria, we check if there is a
* visible scratchpad window on another workspace. In this case we move it
* to the current workspace. */
focused_ws = con_get_workspace(focused);
TAILQ_FOREACH(walk_con, &all_cons, all_cons) { TAILQ_FOREACH(walk_con, &all_cons, all_cons) {
Con *walk_ws = con_get_workspace(walk_con); Con *walk_ws = con_get_workspace(walk_con);
if (walk_ws && if (walk_ws &&

22
testcases/t/185-scratchpad.t
View File

@ -400,6 +400,28 @@ $second = fresh_workspace;
verify_scratchpad_move_with_visible_scratch_con($first, $second, 0); verify_scratchpad_move_with_visible_scratch_con($first, $second, 0);
does_i3_live; does_i3_live;
################################################################################
# 13: Test whether scratchpad show moves focus to the scratchpad window
# when another window on the same workspace has focus
################################################################################
clear_scratchpad;
my $ws = fresh_workspace;
open_window;
my $scratch = get_focused($ws);
cmd 'move scratchpad';
cmd 'scratchpad show';
open_window;
my $not_scratch = get_focused($ws);
is(get_focused($ws), $not_scratch, 'not scratch window has focus');
cmd 'scratchpad show';
is(get_focused($ws), $scratch, 'scratchpad is focused');
# TODO: make i3bar display *something* when a window on the scratchpad has the urgency hint # TODO: make i3bar display *something* when a window on the scratchpad has the urgency hint
done_testing; done_testing;