Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2011-11-21 19:56:03 +00:00
commit 70151ea238
1 changed files with 6 additions and 0 deletions

View File

@ -968,6 +968,12 @@ static int handle_focus_in(xcb_focus_in_event_t *event) {
return 1;
}
/* Skip dock clients, they cannot get the i3 focus. */
if (con->parent->type == CT_DOCKAREA) {
DLOG("This is a dock client, not focusing.\n");
return 1;
}
DLOG("focus is different, updating decorations\n");
/* Get the currently focused workspace to check if the focus change also