From f45eaee6e00af151f4c6ae32e7bdadbefa0b81b4 Mon Sep 17 00:00:00 2001 From: gotmor Date: Thu, 12 Feb 2009 23:32:53 +0000 Subject: reverted strlen_utf8() change. now we use default strlen() again git-svn-id: http://dzen.googlecode.com/svn/trunk@248 f2baff5b-bf2c-0410-a398-912abdc3d8b2 --- draw.c | 56 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'draw.c') diff --git a/draw.c b/draw.c index e73e3f2..07d21c5 100644 --- a/draw.c +++ b/draw.c @@ -72,7 +72,7 @@ textnw(Fnt *font, const char *text, unsigned int len) { } return XTextWidth(font->xfont, text, len); #else - XftTextExtentsUtf8(dzen.dpy, dzen.font.xftfont, (unsigned const char *) text, strlen_utf8(text), dzen.font.extents); + XftTextExtentsUtf8(dzen.dpy, dzen.font.xftfont, (unsigned const char *) text, strlen(text), dzen.font.extents); if(dzen.font.extents->height > dzen.font.height) dzen.font.height = dzen.font.extents->height; return dzen.font.extents->width; @@ -153,9 +153,9 @@ setfont(const char *fontstr) { if(!dzen.font.xftfont) fprintf(stderr, "error, cannot load font: '%s'\n", fontstr); dzen.font.extents = malloc(sizeof(XGlyphInfo)); - XftTextExtentsUtf8(dzen.dpy, dzen.font.xftfont, (unsigned const char *) fontstr, strlen_utf8(fontstr), dzen.font.extents); + XftTextExtentsUtf8(dzen.dpy, dzen.font.xftfont, (unsigned const char *) fontstr, strlen(fontstr), dzen.font.extents); dzen.font.height = dzen.font.xftfont->ascent + dzen.font.xftfont->descent; - dzen.font.width = (dzen.font.extents->width)/strlen_utf8(fontstr); + dzen.font.width = (dzen.font.extents->width)/strlen(fontstr); #endif } @@ -441,7 +441,7 @@ parse_line(const char *line, int lnr, int align, int reverse, int nodraw) { } - for(i=0; (unsigned)i < strlen_utf8(line); i++) { + for(i=0; (unsigned)i < strlen(line); i++) { if(*(line+i) == ESC_CHAR) { lbuf[j] = '\0'; @@ -664,10 +664,10 @@ parse_line(const char *line, int lnr, int align, int reverse, int nodraw) { } /* check if text is longer than window's width */ - tw = textnw(cur_fnt, lbuf, strlen_utf8(lbuf)); + tw = textnw(cur_fnt, lbuf, strlen(lbuf)); while( ((tw + px) > (dzen.w - h)) && j>=0) { lbuf[--j] = '\0'; - tw = textnw(cur_fnt, lbuf, strlen_utf8(lbuf)); + tw = textnw(cur_fnt, lbuf, strlen(lbuf)); } if(!nobg) @@ -676,15 +676,15 @@ parse_line(const char *line, int lnr, int align, int reverse, int nodraw) { #ifndef DZEN_XFT if(cur_fnt->set) XmbDrawString(dzen.dpy, pm, cur_fnt->set, - dzen.tgc, px, py + cur_fnt->ascent, lbuf, strlen_utf8(lbuf)); + dzen.tgc, px, py + cur_fnt->ascent, lbuf, strlen(lbuf)); else - XDrawString(dzen.dpy, pm, dzen.tgc, px, py+dzen.font.ascent, lbuf, strlen_utf8(lbuf)); + XDrawString(dzen.dpy, pm, dzen.tgc, px, py+dzen.font.ascent, lbuf, strlen(lbuf)); #else XftColorAllocName(dzen.dpy, DefaultVisual(dzen.dpy, dzen.screen), DefaultColormap(dzen.dpy, dzen.screen), xftcs, &xftc); XftDrawStringUtf8(xftd, &xftc, - cur_fnt->xftfont, px, py + dzen.font.xftfont->ascent, lbuf, strlen_utf8(lbuf)); + cur_fnt->xftfont, px, py + dzen.font.xftfont->ascent, lbuf, strlen(lbuf)); if(xftcs_f) { free(xftcs); @@ -926,10 +926,10 @@ parse_line(const char *line, int lnr, int align, int reverse, int nodraw) { } /* check if text is longer than window's width */ - tw = textnw(cur_fnt, lbuf, strlen_utf8(lbuf)); + tw = textnw(cur_fnt, lbuf, strlen(lbuf)); while( ((tw + px) > (dzen.w - h)) && j>=0) { lbuf[--j] = '\0'; - tw = textnw(cur_fnt, lbuf, strlen_utf8(lbuf)); + tw = textnw(cur_fnt, lbuf, strlen(lbuf)); } if(!nobg) @@ -938,15 +938,15 @@ parse_line(const char *line, int lnr, int align, int reverse, int nodraw) { #ifndef DZEN_XFT if(cur_fnt->set) XmbDrawString(dzen.dpy, pm, cur_fnt->set, - dzen.tgc, px, py + cur_fnt->ascent, lbuf, strlen_utf8(lbuf)); + dzen.tgc, px, py + cur_fnt->ascent, lbuf, strlen(lbuf)); else - XDrawString(dzen.dpy, pm, dzen.tgc, px, py+dzen.font.ascent, lbuf, strlen_utf8(lbuf)); + XDrawString(dzen.dpy, pm, dzen.tgc, px, py+dzen.font.ascent, lbuf, strlen(lbuf)); #else XftColorAllocName(dzen.dpy, DefaultVisual(dzen.dpy, dzen.screen), DefaultColormap(dzen.dpy, dzen.screen), xftcs, &xftc); XftDrawStringUtf8(xftd, &xftc, - cur_fnt->xftfont, px, py + dzen.font.xftfont->ascent, lbuf, strlen_utf8(lbuf)); + cur_fnt->xftfont, px, py + dzen.font.xftfont->ascent, lbuf, strlen(lbuf)); if(xftcs_f) { free(xftcs); @@ -1022,66 +1022,66 @@ parse_non_drawing_commands(char * text) { if(!text) return 1; - if(!strncmp(text, "^togglecollapse()", strlen_utf8("^togglecollapse()"))) { + if(!strncmp(text, "^togglecollapse()", strlen("^togglecollapse()"))) { a_togglecollapse(NULL); return 0; } - if(!strncmp(text, "^collapse()", strlen_utf8("^collapse()"))) { + if(!strncmp(text, "^collapse()", strlen("^collapse()"))) { a_collapse(NULL); return 0; } - if(!strncmp(text, "^uncollapse()", strlen_utf8("^uncollapse()"))) { + if(!strncmp(text, "^uncollapse()", strlen("^uncollapse()"))) { a_uncollapse(NULL); return 0; } - if(!strncmp(text, "^togglestick()", strlen_utf8("^togglestick()"))) { + if(!strncmp(text, "^togglestick()", strlen("^togglestick()"))) { a_togglestick(NULL); return 0; } - if(!strncmp(text, "^stick()", strlen_utf8("^stick()"))) { + if(!strncmp(text, "^stick()", strlen("^stick()"))) { a_stick(NULL); return 0; } - if(!strncmp(text, "^unstick()", strlen_utf8("^unstick()"))) { + if(!strncmp(text, "^unstick()", strlen("^unstick()"))) { a_unstick(NULL); return 0; } - if(!strncmp(text, "^togglehide()", strlen_utf8("^togglehide()"))) { + if(!strncmp(text, "^togglehide()", strlen("^togglehide()"))) { a_togglehide(NULL); return 0; } - if(!strncmp(text, "^hide()", strlen_utf8("^ide()"))) { + if(!strncmp(text, "^hide()", strlen("^ide()"))) { a_hide(NULL); return 0; } - if(!strncmp(text, "^unhide()", strlen_utf8("^unhide()"))) { + if(!strncmp(text, "^unhide()", strlen("^unhide()"))) { a_unhide(NULL); return 0; } - if(!strncmp(text, "^raise()", strlen_utf8("^raise()"))) { + if(!strncmp(text, "^raise()", strlen("^raise()"))) { a_raise(NULL); return 0; } - if(!strncmp(text, "^lower()", strlen_utf8("^lower()"))) { + if(!strncmp(text, "^lower()", strlen("^lower()"))) { a_lower(NULL); return 0; } - if(!strncmp(text, "^scrollhome()", strlen_utf8("^scrollhome()"))) { + if(!strncmp(text, "^scrollhome()", strlen("^scrollhome()"))) { a_scrollhome(NULL); return 0; } - if(!strncmp(text, "^scrollend()", strlen_utf8("^scrollend()"))) { + if(!strncmp(text, "^scrollend()", strlen("^scrollend()"))) { a_scrollend(NULL); return 0; } - if(!strncmp(text, "^exit()", strlen_utf8("^exit()"))) { + if(!strncmp(text, "^exit()", strlen("^exit()"))) { a_exit(NULL); return 0; } -- cgit v1.2.3-54-g00ecf