mirror of
https://github.com/mintycube/dwm.git
synced 2024-10-22 14:05:45 +02:00
hidevacanttags: width and buttonpress fix
This commit is contained in:
parent
a7d1663571
commit
23c0e9450f
@ -2,7 +2,18 @@ int
|
|||||||
width_tags(Bar *bar, BarWidthArg *a)
|
width_tags(Bar *bar, BarWidthArg *a)
|
||||||
{
|
{
|
||||||
int w, i;
|
int w, i;
|
||||||
|
#if BAR_HIDEVACANTTAGS_PATCH
|
||||||
|
Client *c;
|
||||||
|
unsigned int occ = 0;
|
||||||
|
for (c = bar->mon->clients; c; c = c->next)
|
||||||
|
occ |= c->tags == 255 ? 0 : c->tags;
|
||||||
|
#endif // BAR_HIDEVACANTTAGS_PATCH
|
||||||
|
|
||||||
for (w = 0, i = 0; i < LENGTH(tags); i++) {
|
for (w = 0, i = 0; i < LENGTH(tags); i++) {
|
||||||
|
#if BAR_HIDEVACANTTAGS_PATCH
|
||||||
|
if (!(occ & 1 << i || bar->mon->tagset[bar->mon->seltags] & 1 << i))
|
||||||
|
continue;
|
||||||
|
#endif // BAR_HIDEVACANTTAGS_PATCH
|
||||||
#if BAR_ALTERNATIVE_TAGS_PATCH
|
#if BAR_ALTERNATIVE_TAGS_PATCH
|
||||||
w += selmon->alttag ? TEXTW(tagsalt[i]) : TEXTW(tags[i]);
|
w += selmon->alttag ? TEXTW(tagsalt[i]) : TEXTW(tags[i]);
|
||||||
#else
|
#else
|
||||||
@ -111,13 +122,24 @@ int
|
|||||||
click_tags(Bar *bar, Arg *arg, BarClickArg *a)
|
click_tags(Bar *bar, Arg *arg, BarClickArg *a)
|
||||||
{
|
{
|
||||||
int i = 0, x = lrpad / 2;
|
int i = 0, x = lrpad / 2;
|
||||||
do
|
#if BAR_HIDEVACANTTAGS_PATCH
|
||||||
|
Client *c;
|
||||||
|
unsigned int occ = 0;
|
||||||
|
for (c = bar->mon->clients; c; c = c->next)
|
||||||
|
occ |= c->tags == 255 ? 0 : c->tags;
|
||||||
|
#endif // BAR_HIDEVACANTTAGS_PATCH
|
||||||
|
|
||||||
|
do {
|
||||||
|
#if BAR_HIDEVACANTTAGS_PATCH
|
||||||
|
if (!(occ & 1 << i || bar->mon->tagset[bar->mon->seltags] & 1 << i))
|
||||||
|
continue;
|
||||||
|
#endif // BAR_HIDEVACANTTAGS_PATCH
|
||||||
#if BAR_ALTERNATIVE_TAGS_PATCH
|
#if BAR_ALTERNATIVE_TAGS_PATCH
|
||||||
x += selmon->alttag ? TEXTW(tagsalt[i]) : TEXTW(tags[i]);
|
x += selmon->alttag ? TEXTW(tagsalt[i]) : TEXTW(tags[i]);
|
||||||
#else
|
#else
|
||||||
x += TEXTW(tags[i]);
|
x += TEXTW(tags[i]);
|
||||||
#endif
|
#endif
|
||||||
while (a->rel_x >= x && ++i < LENGTH(tags));
|
} while (a->rel_x >= x && ++i < LENGTH(tags));
|
||||||
if (i < LENGTH(tags)) {
|
if (i < LENGTH(tags)) {
|
||||||
arg->ui = 1 << i;
|
arg->ui = 1 << i;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user