speedie/spmenu
2
0
Fork 1
Code Issues 1 Pull requests Packages Projects Releases 15 Wiki Activity

change some names to make the function more readable

Browse source
This commit is contained in:
speedie 2023-03-29 21:07:23 +02:00
parent 8c93ee5fbe
commit 93ce81f05f
1 changed files with 36 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
libs/draw.c
View file

@ -5,6 +5,7 @@ drawhighlights(struct item *item, int x, int y, int w)
char *highlight; char *highlight;
char c; char c;
// limitation in order to prevent highlighting from drawing when the text isn't visible
if (columns > 5 && lines > 1) return; if (columns > 5 && lines > 1) return;
char *itemtext = item->text; char *itemtext = item->text;
@ -40,18 +41,17 @@ drawhighlights(struct item *item, int x, int y, int w)
int int
drawitemtext(struct item *item, int x, int y, int w) drawitemtext(struct item *item, int x, int y, int w)
{ {
char buffer[MAXITEMLENGTH]; char buffer[MAXITEMLENGTH]; // buffer containing item text
Clr scm[3]; Clr scm[2]; // color scheme
int lp = lrpad / 2; // padding int leftpadding = lrpad / 2; // padding
int wr, rd; int wr, rd; // character
int rw = 0; // width of text int fg = 7; // foreground
int orw = 0; int bg = 0; // background
int fg = 7; int bgfg = 0; // both
int bg = 0; int ignore = 0; // ignore colors
int bgfg = 0; int skiphighlight = 0; // skip highlighting
int ignore = 0;
int ib = 0;
// memcpy the correct scheme
if (item == sel) { if (item == sel) {
memcpy(scm, scheme[SchemeItemSel], sizeof(scm)); memcpy(scm, scheme[SchemeItemSel], sizeof(scm));
@ -77,52 +77,52 @@ drawitemtext(struct item *item, int x, int y, int w)
buffer[wr] = '\0'; buffer[wr] = '\0';
apply_fribidi(buffer); apply_fribidi(buffer);
rw = MIN(w, TEXTW(buffer) - lrpad); drw_text(drw, x, y, MIN(w, TEXTW(buffer) - lrpad) + leftpadding, bh, leftpadding, isrtl ? fribidi_text : buffer, 0, pango_item ? True : False);
drw_text(drw, x, y, rw + lp, bh, lp, isrtl ? fribidi_text : buffer, 0, pango_item ? True : False);
x += rw + lp; // position and width
w -= rw + lp; x += MIN(w, TEXTW(buffer) - lrpad) + leftpadding;
w -= MIN(w, TEXTW(buffer) - lrpad) + leftpadding;
orw += rw; // width of all colored text, we add this to the full width later // no highlighting if colored text
ib = 1; skiphighlight = 1;
lp = 0; leftpadding = 0;
char *ep = item->text + rd + 1; char *character = item->text + rd + 1; // current character
// parse hex colors in scm // parse hex colors in scm, m is always the last character
while (*ep != 'm') { while (*character != 'm') {
unsigned v = strtoul(ep + 1, &ep, 10); unsigned nextchar = strtoul(character + 1, &character, 10);
if (ignore) if (ignore)
continue; continue;
if (bgfg) { if (bgfg) {
if (bgfg < 4 && v == 5) { if (bgfg < 4 && nextchar == 5) {
bgfg <<= 1; bgfg <<= 1;
continue; continue;
} }
if (bgfg == 4) if (bgfg == 4)
scm[0] = textclrs[fg = v]; scm[0] = textclrs[fg = nextchar];
else if (bgfg == 6) else if (bgfg == 6)
scm[1] = textclrs[bg = v]; scm[1] = textclrs[bg = nextchar];
ignore = 1; ignore = 1;
continue; continue;
} }
if (v == 1) { if (nextchar == 1) {
fg |= 8; fg |= 8;
scm[0] = textclrs[fg]; scm[0] = textclrs[fg];
} else if (v == 22) { } else if (nextchar == 22) {
fg &= ~8; fg &= ~8;
scm[0] = textclrs[fg]; scm[0] = textclrs[fg];
} else if (v >= 30 && v <= 37) { } else if (nextchar >= 30 && nextchar <= 37) {
fg = v % 10 | (fg & 8); fg = nextchar % 10 | (fg & 8);
scm[0] = textclrs[fg]; scm[0] = textclrs[fg];
} else if (v == 38) { } else if (nextchar == 38) {
bgfg = 2; bgfg = 2;
} else if (v >= 40 && v <= 47) { } else if (nextchar >= 40 && nextchar <= 47) {
bg = v % 10; bg = nextchar % 10;
scm[1] = textclrs[bg]; scm[1] = textclrs[bg];
} else if (v == 48) { } else if (nextchar == 48) {
bgfg = 3; bgfg = 3;
} }
} }
@ -143,10 +143,10 @@ drawitemtext(struct item *item, int x, int y, int w)
// now draw any non-colored text // now draw any non-colored text
apply_fribidi(buffer); apply_fribidi(buffer);
int r = drw_text(drw, x, y, w, bh, lp, isrtl ? fribidi_text : buffer, 0, pango_item ? True : False); int r = drw_text(drw, x, y, w, bh, leftpadding, isrtl ? fribidi_text : buffer, 0, pango_item ? True : False);
if (!hidehighlight && !ib) drawhighlights(item, x, y, w); if (!hidehighlight && !skiphighlight) drawhighlights(item, x, y, w);
// this should allow us to use it for tab completion // copy current buffer to item->clntext instead of item->text, this way SGR sequences aren't drawn
item->clntext = malloc(sizeof(buffer)); item->clntext = malloc(sizeof(buffer));
memcpy(item->clntext, buffer, sizeof(buffer)); memcpy(item->clntext, buffer, sizeof(buffer));