koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Properly clear the urgency hint when set by i3.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

10
src/con.c
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);
}

2
src/tree.c
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));
}

8
src/workspace.c
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) {