speedie/speedwm-personal
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

add powerline tags back

Browse source
This commit is contained in:
speedie 2022-12-03 23:12:58 +01:00
parent a5d71591b1
commit 71eedeb85b
5 changed files with 129 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bar/items.c
View file

@ -1,5 +1,7 @@
#include "../toggle.h" /* Include what we've included */
#include "tags.c" /* Include tags */
#include "tags-basic.c" /* Include basic tags */
#include "layoutindicator.c" /* Include layout indicator */
#include "statusbar.c" /* Include status bar with status2d and clickstatus */
#include "statusbar-basic.c" /* Include basic status bar */

1
bar/items.h
View file

@ -1,4 +1,5 @@
#include "../toggle.h"
#include "tags-basic.h"
#include "tags.h"
#include "layoutindicator.h"
#include "statusbar.h"

55
bar/tags-basic.c Normal file
View file

@ -0,0 +1,55 @@
int
width_tags_basic(Bar *bar, BarWidthArg *a)
{
int w, i;
for (w = 0, i = 0; i < LENGTH(tags); i++) {
w += TEXTW(tags[i]);
}
return w;
}
int
draw_tags_basic(Bar *bar, BarDrawArg *a)
{
int invert;
int w, x = a->x;
int boxs = drw->font->h / 9;
int boxw = drw->font->h / 6 + 2;
unsigned int i, occ = 0, urg = 0;
Client *c;
Monitor *m = bar->mon;
for (c = m->clients; c; c = c->next) {
occ |= c->tags;
if (c->isurgent)
urg |= c->tags;
}
for (i = 0; i < LENGTH(tags); i++) {
invert = urg & 1 << i;
w = TEXTW(tags[i]);
drw_setscheme(drw, (m->tagset[m->seltags] & 1 << i ? tagscheme[i] : scheme[SchemeBar]));
drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], invert, False);
if (occ & 1 << i)
drw_rect(drw, x + boxs, boxs, boxw, boxw,
m == selmon && selmon->sel && selmon->sel->tags & 1 << i, invert);
x += w;
}
return x;
}
int
click_tags_basic(Bar *bar, Arg *arg, BarClickArg *a)
{
int i = 0, x = lrpad / 2;
do {
x += TEXTW(tags[i]);
} while (a->rel_x >= x && ++i < LENGTH(tags));
if (i < LENGTH(tags)) {
arg->ui = 1 << i;
}
return ClkTagBar;
}

3
bar/tags-basic.h Normal file
View file

@ -0,0 +1,3 @@
static int width_tags_basic(Bar *bar, BarWidthArg *a);
static int draw_tags_basic(Bar *bar, BarDrawArg *a);
static int click_tags_basic(Bar *bar, Arg *arg, BarClickArg *a);

86
bar/tags.c
View file

@ -2,51 +2,101 @@ int
width_tags(Bar *bar, BarWidthArg *a)
{
int w, i;
unsigned int occ = 0;
int plw = drw->font->h / 2 + 1;
Client *c;
if (selmon->hideemptytags) {
for (c = bar->mon->clients; c; c = c->next)
occ |= c->tags == 255 ? 0 : c->tags;
}
for (w = 0, i = 0; i < LENGTH(tags); i++) {
w += TEXTW(tags[i]);
if (!(occ & 1 << i || bar->mon->tagset[bar->mon->seltags] & 1 << i) && selmon->hideemptytags)
continue;
w += TEXTW(tags[i]) + plw;
}
return w;
return w + lrpad;
}
int
draw_tags(Bar *bar, BarDrawArg *a)
{
int x, w;
int invert;
int w, x = a->x;
int boxs = drw->font->h / 9;
int boxw = drw->font->h / 6 + 2;
int plw = drw->font->h / 2 + 1;
unsigned int i, occ = 0, urg = 0;
Client *c;
Monitor *m = bar->mon;
Clr *prevscheme, *nxtscheme;
int boxs = drw->font->h / 9;
int boxw = drw->font->h / 6 + 2;
for (c = bar->mon->clients; c; c = c->next) {
if (selmon->hideemptytags)
occ |= c->tags == 255 ? 0 : c->tags;
else
occ |= c->tags;
for (c = m->clients; c; c = c->next) {
occ |= c->tags;
if (c->isurgent)
urg |= c->tags;
}
x = a->x;
prevscheme = scheme[SchemeBar];
for (i = 0; i < LENGTH(tags); i++) {
/* do not draw vacant tags */
if (!(occ & 1 << i || bar->mon->tagset[bar->mon->seltags] & 1 << i) && selmon->hideemptytags)
continue;
invert = urg & 1 << i;
w = TEXTW(tags[i]);
drw_setscheme(drw, (m->tagset[m->seltags] & 1 << i ? tagscheme[i] : scheme[SchemeBar]));
drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], invert, False);
if (occ & 1 << i)
drw_rect(drw, x + boxs, boxs, boxw, boxw,
m == selmon && selmon->sel && selmon->sel->tags & 1 << i, invert);
x += w;
}
return x;
if (urg & 1 << i && allowurgent)
drw_settrans(drw, prevscheme, (nxtscheme = scheme[bar->mon->tagset[bar->mon->seltags] & 1 << i ? SchemeTagsSel : SchemeTagsUrg]));
else
drw_settrans(drw, prevscheme, (nxtscheme = scheme[bar->mon->tagset[bar->mon->seltags] & 1 << i ? SchemeTagsSel : SchemeTagsNorm]));
if (selmon->tagplshape)
drw_arrow(drw, x, 0, plw, bh, 1, 1);
else
drw_arrow(drw, x, 0, plw, bh, 1, 0);
x += plw;
drw_setscheme(drw, nxtscheme);
drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], invert, False);
if (occ & 1 << i && !selmon->hideemptytags)
drw_rect(drw, x + boxs, boxs, boxw, boxw, bar->mon == selmon && selmon->sel && selmon->sel->tags & 1 << i, invert);
x += w;
prevscheme = nxtscheme;
}
nxtscheme = scheme[SchemeBar];
drw_settrans(drw, prevscheme, nxtscheme);
if (selmon->tagplshape)
drw_arrow(drw, x, 0, plw, bh, 1, 1);
else
drw_arrow(drw, x, 0, plw, bh, 1, 0);
return a->x + a->w;
}
int
click_tags(Bar *bar, Arg *arg, BarClickArg *a)
{
int i = 0, x = lrpad / 2;
int plw = drw->font->h / 2 + 1;
unsigned int occ = 0;
Client *c;
if (selmon->hideemptytags) {
for (c = bar->mon->clients; c; c = c->next)
occ |= c->tags == 255 ? 0 : c->tags;
}
do {
x += TEXTW(tags[i]);
if (!(occ & 1 << i || bar->mon->tagset[bar->mon->seltags] & 1 << i) && selmon->hideemptytags)
continue;
x += TEXTW(tags[i]) + plw;
} while (a->rel_x >= x && ++i < LENGTH(tags));
if (i < LENGTH(tags)) {
arg->ui = 1 << i;