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

Fixing status2d and statuscmd / dwmblocks compatibility issues.

Browse Source 
Text width calculations when using status2d strings resulted in
statuscmd button placement calculations to be way off. Fixed by
introducing a separate function status2dtextlength to get an
approximate correct text width.
This commit is contained in:
bakkeby 2020-05-27 21:04:22 +02:00
parent 1bf50728a7
commit 2e30bddc16
3 changed files with 62 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
dwm.c
View File

@ -450,6 +450,7 @@ static char estext[256];
static int screen; static int screen;
static int sw, sh; /* X display screen geometry width, height */ static int sw, sh; /* X display screen geometry width, height */
static int bh, blw = 0; /* bar geometry */ static int bh, blw = 0; /* bar geometry */
static int tw = 0; /* bar text width */
static int lrpad; /* sum of left and right padding for text */ static int lrpad; /* sum of left and right padding for text */
#if BARPADDING_PATCH #if BARPADDING_PATCH
static int vp; /* vertical padding for bar */ static int vp; /* vertical padding for bar */
@ -764,99 +765,7 @@ buttonpress(XEvent *e)
if (ev->x < x) { if (ev->x < x) {
click = ClkLtSymbol; click = ClkLtSymbol;
} else { } else {
#if HIDEVACANTTAGS_PATCH #endif // LEFTLAYOUT_PATCH
for (c = m->clients; c; c = c->next)
occ |= c->tags == 255 ? 0 : c->tags;
#endif // HIDEVACANTTAGS_PATCH
#if TAGGRID_PATCH
if (drawtagmask & DRAWCLASSICTAGS)
#endif // TAGGRID_PATCH
do {
#if HIDEVACANTTAGS_PATCH
/* do not reserve space for vacant tags */
if (!(occ & 1 << i || m->tagset[m->seltags] & 1 << i))
continue;
#endif // HIDEVACANTTAGS_PATCH
x += TEXTW(tags[i]);
} while (ev->x >= x && ++i < LENGTH(tags));
if (i < LENGTH(tags)) {
click = ClkTagBar;
arg.ui = 1 << i;
#if TAGGRID_PATCH
} else if (ev->x < x + columns * bh / tagrows && (drawtagmask & DRAWTAGGRID)) {
click = ClkTagBar;
i = (ev->x - x) / (bh / tagrows);
i = i + columns * (ev->y / (bh / tagrows));
if (i >= LENGTH(tags)) {
i = LENGTH(tags) - 1;
}
arg.ui = 1 << i;
}
else if (ev->x < x + blw + columns * bh / tagrows)
click = ClkLtSymbol;
#else // TAGGRID_PATCH
} else if (ev->x < x + blw)
click = ClkLtSymbol;
#endif // TAGGRID_PATCH
else if (ev->x > selmon->ww - TEXTW(stext) + padding)
#if !STATUSCMD_PATCH
click = ClkStatusText;
#else
{
click = ClkStatusText;
xc = selmon->ww - TEXTW(stext) + padding;
char *text = rawstext;
int i = -1;
char ch;
#if DWMBLOCKS_PATCH
dwmblockssig = 0;
#else
statuscmdn = 0;
#endif // DWMBLOCKS_PATCH
while (text[++i]) {
if ((unsigned char)text[i] < ' ') {
ch = text[i];
text[i] = '\0';
xc += TEXTW(text) - lrpad;
text[i] = ch;
text += i+1;
i = -1;
if (xc >= ev->x)
break;
#if DWMBLOCKS_PATCH
dwmblockssig = ch;
#else
if (ch <= LENGTH(statuscmds))
statuscmdn = ch - 1;
#endif // DWMBLOCKS_PATCH
}
}
}
#endif // STATUSCMD_PATCH
#if AWESOMEBAR_PATCH
else {
x += blw;
c = m->clients;
do {
if (!ISVISIBLE(c))
continue;
else
x += (1.0 / (double)m->bt) * m->btw;
} while (ev->x > x && (c = c->next));
if (c) {
click = ClkWinTitle;
arg.v = c;
}
}
#else
} else
click = ClkWinTitle;
#endif // AWESOMEBAR_PATCH
}
#else // LEFTLAYOUT_PATCH
#if HIDEVACANTTAGS_PATCH #if HIDEVACANTTAGS_PATCH
for (c = m->clients; c; c = c->next) for (c = m->clients; c; c = c->next)
occ |= c->tags == 255 ? 0 : c->tags; occ |= c->tags == 255 ? 0 : c->tags;
@ -895,14 +804,13 @@ buttonpress(XEvent *e)
} else if (ev->x < x + blw) } else if (ev->x < x + blw)
click = ClkLtSymbol; click = ClkLtSymbol;
#endif // TAGGRID_PATCH #endif // TAGGRID_PATCH
else if (ev->x > selmon->ww - TEXTW(stext) + padding) else if (ev->x > selmon->ww - tw + padding)
#if !STATUSCMD_PATCH #if !STATUSCMD_PATCH
click = ClkStatusText; click = ClkStatusText;
#else #else
{ {
click = ClkStatusText; click = ClkStatusText;
xc = selmon->ww - tw + padding;
xc = selmon->ww - TEXTW(stext) + padding;
char *text = rawstext; char *text = rawstext;
int i = -1; int i = -1;
char ch; char ch;
@ -915,7 +823,11 @@ buttonpress(XEvent *e)
if ((unsigned char)text[i] < ' ') { if ((unsigned char)text[i] < ' ') {
ch = text[i]; ch = text[i];
text[i] = '\0'; text[i] = '\0';
#if STATUS2D_PATCH && !STATUSCOLORS_PATCH
xc += status2dtextlength(text);
#else
xc += TEXTW(text) - lrpad; xc += TEXTW(text) - lrpad;
#endif // STATUS2D_PATCH
text[i] = ch; text[i] = ch;
text += i+1; text += i+1;
i = -1; i = -1;
@ -952,6 +864,8 @@ buttonpress(XEvent *e)
else else
click = ClkWinTitle; click = ClkWinTitle;
#endif // AWESOMEBAR_PATCH #endif // AWESOMEBAR_PATCH
#if LEFTLAYOUT_PATCH
}
#endif // LEFTLAYOUT_PATCH #endif // LEFTLAYOUT_PATCH
} else if ((c = wintoclient(ev->window))) { } else if ((c = wintoclient(ev->window))) {
#if FOCUSONCLICK_PATCH #if FOCUSONCLICK_PATCH
@ -1469,7 +1383,7 @@ dirtomon(int dir)
void void
drawbar(Monitor *m) drawbar(Monitor *m)
{ {
int x, w, tw = 0, stw = 0, stp = 0, invert; int x, w, stw = 0, stp = 0, invert;
#if ALTERNATIVE_TAGS_PATCH #if ALTERNATIVE_TAGS_PATCH
int wdelta; int wdelta;
#endif // ALTERNATIVE_TAGS_PATCH #endif // ALTERNATIVE_TAGS_PATCH

51
patch/status2d.c
View File

@ -6,14 +6,18 @@ drawstatusbar(Monitor *m, int bh, char* stext, int stw, int stp)
char *text; char *text;
char *p; char *p;
len = strlen(stext) + 1 ; len = strlen(stext) + 1;
if (!(text = (char*) malloc(sizeof(char)*len))) if (!(text = (char*) malloc(sizeof(char)*len)))
die("malloc"); die("malloc");
p = text; p = text;
#if STATUSCMD_PATCH
copyvalidchars(text, stext);
#else
memcpy(text, stext, len); memcpy(text, stext, len);
#endif // STATUSCMD_PATCH
/* compute width of the status text */ /* compute width of the status text */
w = stp * 2;; w = stp * 2;
i = -1; i = -1;
while (text[++i]) { while (text[++i]) {
if (text[i] == '^') { if (text[i] == '^') {
@ -126,3 +130,46 @@ drawstatusbar(Monitor *m, int bh, char* stext, int stw, int stp)
return ret; return ret;
} }
int
status2dtextlength(char* stext)
{
int i, w, len;
short isCode = 0;
char *text;
len = strlen(stext) + 1;
if (!(text = (char*) malloc(sizeof(char)*len)))
die("malloc");
#if STATUSCMD_PATCH
copyvalidchars(text, stext);
#else
memcpy(text, stext, len);
#endif // STATUSCMD_PATCH
/* compute width of the status text */
w = 0;
i = -1;
while (text[++i]) {
if (text[i] == '^') {
if (!isCode) {
isCode = 1;
text[i] = '\0';
w += TEXTW(text) - lrpad;
text[i] = '^';
if (text[++i] == 'f')
w += atoi(text + ++i);
} else {
isCode = 0;
text = text + i + 1;
i = -1;
}
}
}
if (!isCode)
w += TEXTW(text) - lrpad;
else
isCode = 0;
return w;
}

1
patch/status2d.h
View File

@ -1 +1,2 @@
static int drawstatusbar(Monitor *m, int bh, char* text, int stw, int stp); static int drawstatusbar(Monitor *m, int bh, char* text, int stw, int stp);
static int status2dtextlength(char* stext);