summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorarg@mig29 <unknown>2006-12-07 10:02:46 +0100
committerarg@mig29 <unknown>2006-12-07 10:02:46 +0100
commitd42c3ba2dc249a77f1f2417a1c72a3b7744fd932 (patch)
tree90029cbcfba6836bbfec3aaa2a6bf2ea15eb4308
parent4b06155873d8d6b6588c3fc50c92c64a61a863f4 (diff)
with this patch everything works fine for me
-rw-r--r--draw.c6
-rw-r--r--main.c2
2 files changed, 3 insertions, 5 deletions
diff --git a/draw.c b/draw.c
index 2dcafe1e..eeb3e568 100644
--- a/draw.c
+++ b/draw.c
@@ -2,7 +2,6 @@
* See LICENSE file for license details.
*/
#include "dwm.h"
-#include <locale.h>
#include <stdio.h>
#include <string.h>
@@ -167,16 +166,13 @@ getcolor(const char *colstr) {
void
setfont(const char *fontstr) {
- char *def, *lc, **missing;
+ char *def, **missing;
int i, n;
- 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);
- setlocale(LC_CTYPE, lc);
if(missing) {
while(n--)
fprintf(stderr, "missing fontset: %s\n", missing[n]);
diff --git a/main.c b/main.c
index cde7e465..c42d1ffe 100644
--- a/main.c
+++ b/main.c
@@ -4,6 +4,7 @@
#include "dwm.h"
#include <errno.h>
+#include <locale.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -240,6 +241,7 @@ main(int argc, char *argv[]) {
}
else if(argc != 1)
eprint("usage: dwm [-v]\n");
+ setlocale(LC_CTYPE, "");
dpy = XOpenDisplay(0);
if(!dpy)
eprint("dwm: cannot open display\n");