godzil/wmfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Infobar: Add bar feature in infobar_draw_statustext to make rectangle with wmfs -s -> \b[xx;yy;width;height;#color]\ *TEST*

Browse Source
This commit is contained in:
Martin Duquesnoy 2010-01-03 23:02:25 +01:00
parent f0daf5ba20
commit 000a1f4c3d
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/infobar.c
View File

@ -175,8 +175,10 @@ infobar_draw_statustext(int sc, char *str)
{
char buf[512] = { 0 };
char strwc[512] = { 0 };
char col[8] = { 0 };
int i, j, c, k = 0;
char as, col[8] = { 0 };
int i, j, c, b, x, k = 0, z;
int bcord[4] = { 0 };
uint bcol = 0;
int len;
char *lastst;
@ -194,15 +196,28 @@ infobar_draw_statustext(int sc, char *str)
len = ((strlen(str) > sizeof(strwc)) ? sizeof(strwc) : strlen(str));
/* Count how many color block there is and make a string without color block (\#....\)*/
for(i = j = c = 0; i < len; ++i, ++j)
/* Count how many blocks there is and make a string without block (\#....\, \b[;;;;]\) */
for(i = j = c = b = 0; i < len; ++i, ++j)
{
/* Colors */
if(str[i] == '\\' && str[i + 1] == '#' && str[i + 8] == '\\')
{
++c;
i += 8;
--j;
}
/* Bars */
else if(str[i] == '\\' && str[i + 1] == 'b' && str[i + 2] == '[')
{
for(z = 1; str[z + i] != '\\' && str[z + i]; ++z);
--j;
if(sscanf(&str[i + 1], "b[%d;%d;%d;%d;#%x]%c",
&bcord[0], &bcord[1], &bcord[2], &bcord[3], &bcol, &as) == 6 && as == '\\')
draw_rectangle(infobar[sc].bar->dr, bcord[0], bcord[1], bcord[2], bcord[3], bcol);
i += z;
}
else
strwc[j] = str[i];
}
@ -210,7 +225,7 @@ infobar_draw_statustext(int sc, char *str)
strwc[j] = '\0';
/* Draw a first time the statustext for non colorized text */
draw_text(infobar[sc].bar->dr, (sgeo[sc].width - SHADH) - textw(strwc),
draw_text(infobar[sc].bar->dr, (x = (sgeo[sc].width - SHADH) - textw(strwc)),
FHINFOBAR, infobar[sc].bar->fg, 0, strwc);
/* Draw text with its color */
@ -230,7 +245,7 @@ infobar_draw_statustext(int sc, char *str)
INFOBARH, conf.colors.bar);
/* Draw text with its color */
draw_text(infobar[sc].bar->dr, (sgeo[sc].width - SHADH) - textw(&buf[k]),
draw_text(infobar[sc].bar->dr, (x = ((sgeo[sc].width - SHADH) - textw(&buf[k]))),
FHINFOBAR, col, 0, &buf[k]);
strcpy(buf, strwc);