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

Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2011-08-26 03:18:16 +02:00
parent 6d91a6248e 0b7e6d44b3
commit a57a2b9ccb
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/con.h
View File

@ -68,6 +68,12 @@ bool con_is_floating(Con *con);
*/
Con *con_inside_floating(Con *con);
/**
* Checks if the given container is inside a focused container.
*
*/
Con *con_inside_focused(Con *con);
/**
* Returns the container with the given client window ID or NULL if no such
* container exists.

12
src/con.c
View File

@ -358,6 +358,18 @@ Con *con_inside_floating(Con *con) {
return con_inside_floating(con->parent);
}
/*
* Checks if the given container is inside a focused container.
*
*/
Con *con_inside_focused(Con *con) {
if (con == focused)
return true;
if (!con->parent)
return false;
return con_inside_focused(con->parent);
}
/*
* Returns the container with the given client window ID or NULL if no such
* container exists.

2
src/x.c
View File

@ -290,7 +290,7 @@ void x_draw_decoration(Con *con) {
/* find out which colors to use */
if (con->urgent)
p->color = &config.client.urgent;
else if (con == focused)
else if (con == focused || con_inside_focused(con))
p->color = &config.client.focused;
else if (con == TAILQ_FIRST(&(parent->focus_head)))
p->color = &config.client.focused_inactive;