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

Handle _NET_ACTIVE_WINDOW for scratchpad windows. (#2458) 

We call scratchpad_show() on _NET_ACTIVE_WINDOW requests if the request
came from a pager. This is consistent with the i3 »focus« command because
we assume the user requested to see the window, so we do the only
sensible thing.

fixes #2455
This commit is contained in:
Ingo Bürk 2016-09-27 03:32:05 +02:00 committed by Michael Stapelberg
parent b638ce2e4c
commit f4f9b7102d
2 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/handlers.c
View File

@ -713,14 +713,13 @@ static void handle_client_message(xcb_client_message_event_t *event) {
} }
Con *ws = con_get_workspace(con); Con *ws = con_get_workspace(con);
if (ws == NULL) { if (ws == NULL) {
DLOG("Window is not being managed, ignoring _NET_ACTIVE_WINDOW\n"); DLOG("Window is not being managed, ignoring _NET_ACTIVE_WINDOW\n");
return; return;
} }
if (con_is_internal(ws)) { if (con_is_internal(ws) && ws != workspace_get("__i3_scratch", NULL)) {
DLOG("Workspace is internal, ignoring _NET_ACTIVE_WINDOW\n"); DLOG("Workspace is internal but not scratchpad, ignoring _NET_ACTIVE_WINDOW\n");
return; return;
} }
@ -729,10 +728,19 @@ static void handle_client_message(xcb_client_message_event_t *event) {
/* Always focus the con if it is from a pager, because this is most /* Always focus the con if it is from a pager, because this is most
* likely from some user action */ * likely from some user action */
DLOG("This request came from a pager. Focusing con = %p\n", con); DLOG("This request came from a pager. Focusing con = %p\n", con);
workspace_show(ws);
con_focus(con); if (con_is_internal(ws)) {
scratchpad_show(con);
} else {
workspace_show(ws);
con_focus(con);
}
} else { } else {
/* Request is from an application. */ /* Request is from an application. */
if (con_is_internal(ws)) {
DLOG("Ignoring request to make con = %p active because it's on an internal workspace.\n", con);
return;
}
if (config.focus_on_window_activation == FOWA_FOCUS || (config.focus_on_window_activation == FOWA_SMART && workspace_is_visible(ws))) { if (config.focus_on_window_activation == FOWA_FOCUS || (config.focus_on_window_activation == FOWA_SMART && workspace_is_visible(ws))) {
DLOG("Focusing con = %p\n", con); DLOG("Focusing con = %p\n", con);

18
testcases/t/195-net-active-window.t
View File

@ -39,6 +39,7 @@ sub send_net_active_window {
0; 0;
$x->send_event(0, $x->get_root_window(), X11::XCB::EVENT_MASK_SUBSTRUCTURE_REDIRECT, $msg); $x->send_event(0, $x->get_root_window(), X11::XCB::EVENT_MASK_SUBSTRUCTURE_REDIRECT, $msg);
sync_with_i3;
} }
sub get_net_active_window { sub get_net_active_window {
@ -131,6 +132,23 @@ send_net_active_window($scratch->id);
is($x->input_focus, $win3->id, 'window 3 still focused'); is($x->input_focus, $win3->id, 'window 3 still focused');
################################################################################
# A scratchpad window should be shown if _NET_ACTIVE_WINDOW from a pager
# is received.
################################################################################
my $scratch = open_window;
is($x->input_focus, $scratch->id, 'to-scratchpad window has focus');
cmd 'move scratchpad';
is($x->input_focus, $win3->id, 'focus reverted to window 3');
send_net_active_window($scratch->id, 'pager');
is($x->input_focus, $scratch->id, 'scratchpad window is shown');
################################################################################ ################################################################################
# Verify that the _NET_ACTIVE_WINDOW property is updated on the root window # Verify that the _NET_ACTIVE_WINDOW property is updated on the root window
# correctly. # correctly.