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 a67ac58..e4b2b88 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -167,22 +167,20 @@ getcolor(const char *colstr) {
 
 void
 setfont(const char *fontstr) {
 
 void
 setfont(const char *fontstr) {

-       char **missing, *def;
+       char *def, *lc, **missing;

        int i, n;
 
        int i, n;
 

+       lc = setlocale(LC_CTYPE, NULL);
+       setlocale(LC_CTYPE, "UTF-8");

        missing = NULL;
        missing = NULL;

-       setlocale(LC_ALL, "");

        if(dc.font.set)
                XFreeFontSet(dpy, dc.font.set);
        dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
        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(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;
        }
        if(dc.font.set) {
                XFontSetExtents *font_extents;