diff options
| author | bakkeby <[email protected]> | 2021-05-21 10:16:49 +0200 |
|---|---|---|
| committer | bakkeby <[email protected]> | 2021-05-21 10:18:41 +0200 |
| commit | 9072ef28a42051f306f2722004aab4d1061bdb37 (patch) | |
| tree | 04b51dff311e4734d3a7308f49fc55711d787a25 /patch | |
| parent | 9a0fb6c83b4b830f84f3c1294bd89a3023b69c70 (diff) | |
| download | dwm-flexipatch-9072ef28a42051f306f2722004aab4d1061bdb37.tar.gz dwm-flexipatch-9072ef28a42051f306f2722004aab4d1061bdb37.zip | |
Splitting SchemeHid to SchemeHidNorm and SchemeHidSel given that a hidden client may still be the selected client ref. #148
Diffstat (limited to 'patch')
| -rw-r--r-- | patch/bar_awesomebar.c | 8 | ||||
| -rw-r--r-- | patch/bar_flexwintitle.c | 10 | ||||
| -rw-r--r-- | patch/bar_tabgroups.c | 7 | ||||
| -rw-r--r-- | patch/xrdb.c | 8 |
4 files changed, 20 insertions, 13 deletions
diff --git a/patch/bar_awesomebar.c b/patch/bar_awesomebar.c index ec5fa55..ecfa3d2 100644 --- a/patch/bar_awesomebar.c +++ b/patch/bar_awesomebar.c @@ -30,10 +30,12 @@ draw_awesomebar(Bar *bar, BarArg *a) for (i = 0, c = bar->mon->clients; c; c = c->next, i++) { if (!ISVISIBLE(c)) continue; - if (bar->mon->sel == c) - scm = SchemeTitleSel; + if (bar->mon->sel == c && HIDDEN(c)) + scm = SchemeHidSel; else if (HIDDEN(c)) - scm = SchemeHid; + scm = SchemeHidNorm; + else if (bar->mon->sel == c) + scm = SchemeTitleSel; else scm = SchemeTitleNorm; diff --git a/patch/bar_flexwintitle.c b/patch/bar_flexwintitle.c index f7da241..15d6241 100644 --- a/patch/bar_flexwintitle.c +++ b/patch/bar_flexwintitle.c @@ -146,7 +146,7 @@ getschemefor(Monitor *m, int group, int activegroup) #endif // MONOCLE_LAYOUT return SchemeTitleNorm; case GRP_HIDDEN: - return SchemeHid; + return SchemeHidNorm; case GRP_FLOAT: return (activegroup ? SchemeFlexActFloat : SchemeFlexInaFloat); } @@ -172,10 +172,12 @@ flextitledraw(Monitor *m, Client *c, int unused, int x, int w, int tabscheme, Ar return; int i, nclienttags = 0, nviewtags = 0, pad = lrpad / 2; int clientscheme = ( - c == selmon->sel - ? getselschemefor(tabscheme) + c == selmon->sel && HIDDEN(c) + ? SchemeHidSel : HIDDEN(c) - ? SchemeHid + ? SchemeHidNorm + : c == selmon->sel + ? getselschemefor(tabscheme) : c->isurgent ? SchemeUrg : tabscheme diff --git a/patch/bar_tabgroups.c b/patch/bar_tabgroups.c index 28a39fa..af1ae76 100644 --- a/patch/bar_tabgroups.c +++ b/patch/bar_tabgroups.c @@ -43,11 +43,14 @@ bartabdraw(Monitor *m, Client *c, int unused, int x, int w, int groupactive, Arg int i, nclienttags = 0, nviewtags = 0, pad = lrpad / 2; drw_setscheme(drw, scheme[ m->sel == c - ? SchemeSel #ifdef HIDDEN + && HIDDEN(c) + ? SchemeHidSel : HIDDEN(c) - ? SchemeHid + ? SchemeHidNorm + : m->sel == c #endif + ? SchemeSel : groupactive ? SchemeTitleSel : SchemeTitleNorm diff --git a/patch/xrdb.c b/patch/xrdb.c index cc6c73c..d59ecbd 100644 --- a/patch/xrdb.c +++ b/patch/xrdb.c @@ -40,10 +40,10 @@ loadxrdb() XRDB_LOAD_COLOR("dwm.tagsselbgcolor", tagsselbgcolor); XRDB_LOAD_COLOR("dwm.tagsselbordercolor", tagsselbordercolor); XRDB_LOAD_COLOR("dwm.tagsselfloatcolor", tagsselfloatcolor); - XRDB_LOAD_COLOR("dwm.hidfgcolor", hidfgcolor); - XRDB_LOAD_COLOR("dwm.hidbgcolor", hidbgcolor); - XRDB_LOAD_COLOR("dwm.hidbordercolor", hidbordercolor); - XRDB_LOAD_COLOR("dwm.hidfloatcolor", hidfloatcolor); + XRDB_LOAD_COLOR("dwm.hidnormfgcolor", hidnormfgcolor); + XRDB_LOAD_COLOR("dwm.hidnormbgcolor", hidnormbgcolor); + XRDB_LOAD_COLOR("dwm.hidselfgcolor", hidselfgcolor); + XRDB_LOAD_COLOR("dwm.hidselbgcolor", hidselbgcolor); XRDB_LOAD_COLOR("dwm.urgfgcolor", urgfgcolor); XRDB_LOAD_COLOR("dwm.urgbgcolor", urgbgcolor); XRDB_LOAD_COLOR("dwm.urgbordercolor", urgbordercolor); |