Xinqi Bao's Git

projects / dwm.git / commitdiff
summary | log | commit | diff | tree
raw | patch | inline | side by side (from parent 1: 6b34535)
using the portable Xmb+UTF-8 way of life, will see if this works well...
authorarg@mig29 <unknown>
Thu, 7 Dec 2006 08:47:55 +0000 (09:47 +0100)
committerarg@mig29 <unknown>
Thu, 7 Dec 2006 08:47:55 +0000 (09:47 +0100)
draw.c patch | blob | history

diff --git a/draw.c b/draw.c
index cef5efb..e4b2b88 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -167,14 +167,16 @@ 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;
 
-       setlocale(LC_CTYPE, "");
+       lc = setlocale(LC_CTYPE, NULL);
+       setlocale(LC_CTYPE, "UTF-8");
        missing = NULL;
        if(dc.font.set)
                XFreeFontSet(dpy, dc.font.set);
        dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
        missing = NULL;
        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]);
        if(missing) {
                while(n--)
                        fprintf(stderr, "missing fontset: %s\n", missing[n]);