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

Draw: Simplify draw_text & textw

Browse Source
This commit is contained in:
Martin Duquesnoy 2011-06-14 19:21:48 +02:00
parent fbcd31253b
commit 52020cb22d
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/draw.c
View File

@ -116,14 +116,14 @@ draw_text(Drawable d, int x, int y, char* fg, char *str)
/* To draw image everywhere we can draw text */
#ifdef HAVE_IMLIB
char *ostr = xstrdup(str);
bool ii = False;
size_t textlen = strlen(ostr);
char *ostr;
size_t textlen = 0;
if(strstr(str, "i["))
{
ostr = xstrdup(str);
textlen = strlen(ostr);
parse_image_block(d, str);
ii = True;
}
#endif /* HAVE_IMLIB */
@ -157,10 +157,11 @@ draw_text(Drawable d, int x, int y, char* fg, char *str)
#ifdef HAVE_IMLIB
if(ii)
if(textlen)
{
strncpy(str, ostr, textlen);
free(ostr);
free(ostr);
}
#endif /* HAVE_IMLIB */
return;
@ -225,14 +226,14 @@ textw(char *text)
return 0;
#ifdef HAVE_IMLIB
char *ostr = xstrdup(text);
size_t textlen = strlen(ostr);
bool ii = False;
char *ostr;
size_t textlen = 0;
if(strstr(text, "i["))
{
ostr = xstrdup(text);
textlen = strlen(ostr);
parse_image_block(d, text);
ii = True;
}
#endif /* HAVE_IMLIB */
@ -254,10 +255,11 @@ textw(char *text)
}
#ifdef HAVE_IMLIB
if(ii)
if(textlen)
{
strncpy(text, ostr, textlen);
free(ostr);
free(ostr);
}
#endif /* HAVE_IMLIB */
return ret;