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

Draw: Clean draw_text and textw

Browse Source
This commit is contained in:
Martin Duquesnoy 2011-06-14 19:12:44 +02:00
parent ff0d345b11
commit fbcd31253b
2 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/draw.c
View File

@ -112,23 +112,13 @@ parse_image_block(Drawable dr, char *str)
void
draw_text(Drawable d, int x, int y, char* fg, char *str)
{
#ifdef HAVE_IMLIB
char *ostr = NULL;
int i, ni, sw = 0;
size_t textlen;
bool ii = False;
#else
(void)x_image_ofset;
(void)y_image_ofset;
#endif /* HAVE_IMLIB */
if(!str)
return;
CHECK(str);
/* To draw image everywhere we can draw text */
#ifdef HAVE_IMLIB
ostr = xstrdup(str);
textlen = strlen(ostr);
char *ostr = xstrdup(str);
bool ii = False;
size_t textlen = strlen(ostr);
if(strstr(str, "i["))
{
@ -230,18 +220,14 @@ textw(char *text)
{
Drawable d = 0;
ushort ret = 0;
#ifdef HAVE_IMLIB
char *ostr = NULL;
size_t textlen;
bool ii = False;
#endif /* HAVE_IMLIB */
if(!text)
return 0;
#ifdef HAVE_IMLIB
ostr = xstrdup(text);
textlen = strlen(ostr);
char *ostr = xstrdup(text);
size_t textlen = strlen(ostr);
bool ii = False;
if(strstr(text, "i["))
{

4
src/status.c
View File

@ -107,7 +107,7 @@ statustext_graph(InfoBar *ib, char *str)
else if(j != i)
str[j] = str[i];
for(k = j; k < i; str[k++] = 0);
for(k = j; k < i; str[k++] = '\0');
return;
}
@ -135,7 +135,7 @@ statustext_text(InfoBar *ib, char *str)
else if(j != i)
str[j] = str[i];
for(k = j; k < i; str[k++] = 0);
for(k = j; k < i; str[k++] = '\0');
return;
}