osama/dwm
1
0
Fork 0
mirror of https://github.com/mintycube/dwm.git synced 2024-10-22 12:05:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

taggrid: fix for invalid highlighting for the last tag when columns have an uneven number of clients

Browse Source
This commit is contained in:
bakkeby 2020-07-15 17:14:14 +02:00
parent aa70728d00
commit e780c5078f
1 changed files with 112 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

215
patch/bar_taggrid.c
View File

@ -7,47 +7,56 @@ width_taggrid(Monitor *m, BarWidthArg *a)
int int
draw_taggrid(Monitor *m, BarDrawArg *a) draw_taggrid(Monitor *m, BarDrawArg *a)
{ {
unsigned int x, y, h, max_x, columns, occ = 0; unsigned int x, y, h, max_x, columns, occ = 0;
int invert, i,j, k; int invert, i,j, k;
Client *c; Client *c;
for (c = m->clients; c; c = c->next) for (c = m->clients; c; c = c->next)
occ |= c->tags; occ |= c->tags;
h = bh / tagrows; h = bh / tagrows;
x = max_x = a->x; x = max_x = a->x;
y = 0; y = 0;
columns = LENGTH(tags) / tagrows + ((LENGTH(tags) % tagrows > 0) ? 1 : 0); columns = LENGTH(tags) / tagrows + ((LENGTH(tags) % tagrows > 0) ? 1 : 0);
/* Firstly we will fill the borders of squares */ /* Firstly we will fill the borders of squares */
XFillRectangle(dpy, drw->drawable, drw->gc, x, y, h*columns + 1, bh); XFillRectangle(dpy, drw->drawable, drw->gc, x, y, h*columns + 1, bh);
/* We will draw LENGTH(tags) squares in tagraws raws. */ /* We will draw LENGTH(tags) squares in tagraws raws. */
for (j = 0, i = 0; j < tagrows; j++) { for (j = 0, i = 0; j < tagrows; j++) {
x = a->x; x = a->x;
for (k = 0; k < columns && i < LENGTH(tags); k++, i++) { for (k = 0; k < columns; k++, i++) {
invert = m->tagset[m->seltags] & 1 << i ? 0 : 1; if (i < LENGTH(tags)) {
invert = m->tagset[m->seltags] & 1 << i ? 0 : 1;
/* Select active color for current square */ /* Select active color for current square */
XSetForeground(drw->dpy, drw->gc, !invert ? scheme[SchemeSel][ColBg].pixel : XSetForeground(drw->dpy, drw->gc, !invert ? scheme[SchemeSel][ColBg].pixel :
scheme[SchemeNorm][ColFg].pixel); scheme[SchemeNorm][ColFg].pixel);
XFillRectangle(dpy, drw->drawable, drw->gc, x+1, y+1, h-1, h-1); XFillRectangle(dpy, drw->drawable, drw->gc, x+1, y+1, h-1, h-1);
/* Mark square if tag has client */ /* Mark square if tag has client */
if (occ & 1 << i) { if (occ & 1 << i) {
XSetForeground(drw->dpy, drw->gc, !invert ? scheme[SchemeSel][ColFg].pixel : XSetForeground(drw->dpy, drw->gc, !invert ? scheme[SchemeSel][ColFg].pixel :
scheme[SchemeNorm][ColBg].pixel); scheme[SchemeNorm][ColBg].pixel);
XFillRectangle(dpy, drw->drawable, drw->gc, x + 1, y + 1, XFillRectangle(dpy, drw->drawable, drw->gc, x + 1, y + 1,
h / 2, h / 2); h / 2, h / 2);
} }
x += h; } else {
if (x > max_x) { #if BAR_VTCOLORS_PATCH
max_x = x; XSetForeground(drw->dpy, drw->gc, scheme[SchemeTagsNorm][ColBg].pixel);
} #else
} XSetForeground(drw->dpy, drw->gc, scheme[SchemeNorm][ColBg].pixel);
y += h; #endif // BAR_VTCOLORS_PATCH
XFillRectangle(dpy, drw->drawable, drw->gc, x+1, y+1, h-1, h);
}
x += h;
if (x > max_x) {
max_x = x;
}
}
y += h;
} }
return max_x; return max_x;
} }
int int
@ -67,76 +76,76 @@ click_taggrid(Monitor *m, Arg *arg, BarClickArg *a)
void void
switchtag(const Arg *arg) switchtag(const Arg *arg)
{ {
unsigned int columns; unsigned int columns;
unsigned int new_tagset = 0; unsigned int new_tagset = 0;
unsigned int pos, i; unsigned int pos, i;
int col, row; int col, row;
Arg new_arg; Arg new_arg;
columns = LENGTH(tags) / tagrows + ((LENGTH(tags) % tagrows > 0) ? 1 : 0); columns = LENGTH(tags) / tagrows + ((LENGTH(tags) % tagrows > 0) ? 1 : 0);
for (i = 0; i < LENGTH(tags); ++i) { for (i = 0; i < LENGTH(tags); ++i) {
if (!(selmon->tagset[selmon->seltags] & 1 << i)) { if (!(selmon->tagset[selmon->seltags] & 1 << i)) {
continue; continue;
} }
pos = i; pos = i;
row = pos / columns; row = pos / columns;
col = pos % columns; col = pos % columns;
if (arg->ui & SWITCHTAG_UP) { /* UP */ if (arg->ui & SWITCHTAG_UP) { /* UP */
row --; row --;
if (row < 0) { if (row < 0) {
row = tagrows - 1; row = tagrows - 1;
} }
do { do {
pos = row * columns + col; pos = row * columns + col;
row --; row --;
} while (pos >= LENGTH(tags)); } while (pos >= LENGTH(tags));
} }
if (arg->ui & SWITCHTAG_DOWN) { /* DOWN */ if (arg->ui & SWITCHTAG_DOWN) { /* DOWN */
row ++; row ++;
if (row >= tagrows) { if (row >= tagrows) {
row = 0; row = 0;
} }
pos = row * columns + col; pos = row * columns + col;
if (pos >= LENGTH(tags)) { if (pos >= LENGTH(tags)) {
row = 0; row = 0;
} }
pos = row * columns + col; pos = row * columns + col;
} }
if (arg->ui & SWITCHTAG_LEFT) { /* LEFT */ if (arg->ui & SWITCHTAG_LEFT) { /* LEFT */
col --; col --;
if (col < 0) { if (col < 0) {
col = columns - 1; col = columns - 1;
} }
do { do {
pos = row * columns + col; pos = row * columns + col;
col --; col --;
} while (pos >= LENGTH(tags)); } while (pos >= LENGTH(tags));
} }
if (arg->ui & SWITCHTAG_RIGHT) { /* RIGHT */ if (arg->ui & SWITCHTAG_RIGHT) { /* RIGHT */
col ++; col ++;
if (col >= columns) { if (col >= columns) {
col = 0; col = 0;
} }
pos = row * columns + col; pos = row * columns + col;
if (pos >= LENGTH(tags)) { if (pos >= LENGTH(tags)) {
col = 0; col = 0;
pos = row * columns + col; pos = row * columns + col;
} }
} }
new_tagset |= 1 << pos; new_tagset |= 1 << pos;
} }
new_arg.ui = new_tagset; new_arg.ui = new_tagset;
if (arg->ui & SWITCHTAG_TOGGLETAG) { if (arg->ui & SWITCHTAG_TOGGLETAG) {
toggletag(&new_arg); toggletag(&new_arg);
} }
if (arg->ui & SWITCHTAG_TAG) { if (arg->ui & SWITCHTAG_TAG) {
tag(&new_arg); tag(&new_arg);
} }
if (arg->ui & SWITCHTAG_VIEW) { if (arg->ui & SWITCHTAG_VIEW) {
view (&new_arg); view (&new_arg);
} }
if (arg->ui & SWITCHTAG_TOGGLEVIEW) { if (arg->ui & SWITCHTAG_TOGGLEVIEW) {
toggleview (&new_arg); toggleview (&new_arg);
} }
} }