using the portable Xmb+UTF-8 way of life, will see if this works well...

[dwm.git] / draw.c

diff --git a/draw.c b/draw.c
index 3842685..e4b2b88 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -76,14 +76,14 @@ drawtext(const char *text, unsigned long col[ColLast], Bool filledsquare, Bool e
        }
        x = (h + 2) / 4;
        if(filledsquare) {
-               r.x = dc.x + 2;
-               r.y = dc.y + 2;
-               r.width = r.height = x;
+               r.x = dc.x + 1;
+               r.y = dc.y + 1;
+               r.width = r.height = x + 1;
                XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
        }
        else if(emptysquare) {
-               pt[0].x = dc.x + 2;
-               pt[0].y = dc.y + 2;
+               pt[0].x = dc.x + 1;
+               pt[0].y = dc.y + 1;
                pt[1].x = x;
                pt[1].y = 0;
                pt[2].x = 0;
@@ -167,22 +167,20 @@ getcolor(const char *colstr) {
 
 void
 setfont(const char *fontstr) {
-       char **missing, *def;
+       char *def, *lc, **missing;
        int i, n;
 
+       lc = setlocale(LC_CTYPE, NULL);
+       setlocale(LC_CTYPE, "UTF-8");
        missing = NULL;
-       setlocale(LC_ALL, "");
        if(dc.font.set)
                XFreeFontSet(dpy, dc.font.set);
        dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
+       setlocale(LC_CTYPE, lc);
        if(missing) {
                while(n--)
                        fprintf(stderr, "missing fontset: %s\n", missing[n]);
                XFreeStringList(missing);
-               if(dc.font.set) {
-                       XFreeFontSet(dpy, dc.font.set);
-                       dc.font.set = NULL;
-               }
        }
        if(dc.font.set) {
                XFontSetExtents *font_extents;