ryan/cwm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Teach client_current() to use a screen to find the current client instead of

Browse Source 
iterating over all (fallback if no screen provided for now). Initially convert
trivial uses of client_current().
This commit is contained in:
okan
2019-03-07 14:28:17 +00:00
parent 01be5b4e4a
commit 7c45b87622
4 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
client.c
View File

@@ -218,7 +218,7 @@ client_setactive(struct client_ctx *cc)
if (cc->flags & CLIENT_WM_TAKE_FOCUS)
client_msg(cc, cwmh[WM_TAKE_FOCUS], Last_Event_Time);
if ((oldcc = client_current()) != NULL) {
if ((oldcc = client_current(sc)) != NULL) {
oldcc->flags &= ~CLIENT_ACTIVE;
client_draw_border(oldcc);
}
@@ -235,16 +235,23 @@ client_setactive(struct client_ctx *cc)
}
struct client_ctx *
client_current(void)
client_current(struct screen_ctx *sc)
{
struct screen_ctx *sc;
struct screen_ctx *_sc;
struct client_ctx *cc;
TAILQ_FOREACH(sc, &Screenq, entry) {
if (sc) {
TAILQ_FOREACH(cc, &sc->clientq, entry) {
if (cc->flags & CLIENT_ACTIVE)
return(cc);
}
} else {
TAILQ_FOREACH(_sc, &Screenq, entry) {
TAILQ_FOREACH(cc, &_sc->clientq, entry) {
if (cc->flags & CLIENT_ACTIVE)
return(cc);
}
}
}
return(NULL);
}
@@ -679,7 +686,7 @@ client_cycle(struct screen_ctx *sc, int flags)
return;
prevcc = TAILQ_FIRST(&sc->clientq);
oldcc = client_current();
oldcc = client_current(sc);
if (oldcc == NULL)
oldcc = (flags & CWM_CYCLE_REVERSE) ?
TAILQ_LAST(&sc->clientq, client_q) :