Properly clear the urgency hint when set by i3.

fixes #1825
This commit is contained in:
Michael Stapelberg 2015-08-02 20:50:14 +02:00
parent 03799dd851
commit 21d4b2319f
4 changed files with 79 additions and 10 deletions

View File

@ -211,7 +211,7 @@ void con_focus(Con *con) {
* checks before resetting the urgency.
*/
if (con->urgent && con_is_leaf(con)) {
con->urgent = false;
con_set_urgency(con, false);
con_update_parents_urgency(con);
workspace_update_urgent_flag(con_get_workspace(con));
ipc_send_window_event("urgent", con);
@ -1722,13 +1722,13 @@ void con_update_parents_urgency(Con *con) {
*
*/
void con_set_urgency(Con *con, bool urgent) {
if (focused == con) {
if (urgent && focused == con) {
DLOG("Ignoring urgency flag for current client\n");
con->window->urgent.tv_sec = 0;
con->window->urgent.tv_usec = 0;
return;
}
const bool old_urgent = con->urgent;
if (con->urgency_timer == NULL) {
con->urgent = urgent;
} else
@ -1752,7 +1752,7 @@ void con_set_urgency(Con *con, bool urgent) {
if ((ws = con_get_workspace(con)) != NULL)
workspace_update_urgent_flag(ws);
if (con->urgent == urgent) {
if (con->urgent != old_urgent) {
LOG("Urgency flag changed to %d\n", con->urgent);
ipc_send_window_event("urgent", con);
}

View File

@ -202,7 +202,7 @@ bool tree_close(Con *con, kill_window_t kill_window, bool dont_kill_parent, bool
/* remove the urgency hint of the workspace (if set) */
if (con->urgent) {
con->urgent = false;
con_set_urgency(con, false);
con_update_parents_urgency(con);
workspace_update_urgent_flag(con_get_workspace(con));
}

View File

@ -322,17 +322,17 @@ static void workspace_reassign_sticky(Con *con) {
static void workspace_defer_update_urgent_hint_cb(EV_P_ ev_timer *w, int revents) {
Con *con = w->data;
ev_timer_stop(main_loop, con->urgency_timer);
FREE(con->urgency_timer);
if (con->urgent) {
DLOG("Resetting urgency flag of con %p by timer\n", con);
con->urgent = false;
con_set_urgency(con, false);
con_update_parents_urgency(con);
workspace_update_urgent_flag(con_get_workspace(con));
ipc_send_window_event("urgent", con);
tree_render();
}
ev_timer_stop(main_loop, con->urgency_timer);
FREE(con->urgency_timer);
}
static void _workspace_show(Con *workspace) {

View File

@ -0,0 +1,69 @@
#!perl
# vim:ts=4:sw=4:expandtab
#
# Please read the following documents before working on tests:
# • http://build.i3wm.org/docs/testsuite.html
# (or docs/testsuite)
#
# • http://build.i3wm.org/docs/lib-i3test.html
# (alternatively: perldoc ./testcases/lib/i3test.pm)
#
# • http://build.i3wm.org/docs/ipc.html
# (or docs/ipc)
#
# • http://onyxneon.com/books/modern_perl/modern_perl_a4.pdf
# (unless you are already familiar with Perl)
#
# Ensures the urgency hint is cleared properly in the case where i3 set it (due
# to focus_on_window_activation=urgent), hence the application not clearing it.
# Ticket: #1825
# Bug still in: 4.10.3-253-g03799dd
use i3test i3_autostart => 0;
sub send_net_active_window {
my ($id) = @_;
my $msg = pack "CCSLLLLLLL",
X11::XCB::CLIENT_MESSAGE, # response_type
32, # format
0, # sequence
$id, # destination window
$x->atom(name => '_NET_ACTIVE_WINDOW')->id,
0, # source
0, 0, 0, 0;
$x->send_event(0, $x->get_root_window(), X11::XCB::EVENT_MASK_SUBSTRUCTURE_REDIRECT, $msg);
}
my $config = <<'EOT';
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
focus_on_window_activation urgent
EOT
my $pid = launch_with_config($config);
my $i3 = i3(get_socket_path(0));
my $ws = fresh_workspace;
my $first = open_window;
my $second = open_window;
send_net_active_window($first->id);
sync_with_i3;
is($x->input_focus, $second->id, 'second window still focused');
cmd '[urgent=latest] focus';
sync_with_i3;
is($x->input_focus, $first->id, 'first window focused');
cmd 'focus right';
sync_with_i3;
is($x->input_focus, $second->id, 'second window focused again');
cmd '[urgent=latest] focus';
sync_with_i3;
is($x->input_focus, $second->id, 'second window still focused');
exit_gracefully($pid);
done_testing;