aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorarg@mig29 <unknown>2006-12-07 10:06:06 +0100
committerarg@mig29 <unknown>2006-12-07 10:06:06 +0100
commitdd7ee0dae1e8cb9ffd58fbcab7708e9042eb560c (patch)
treeb4450235ebe9c0b160fef4b512c4c15c873b6e11
parent250aa199bbc3f12a538ac3162d8065d44fab8c22 (diff)
also fixing dmenu accordingly
-rw-r--r--draw.c2
-rw-r--r--main.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/draw.c b/draw.c
index 29289a4..62f6e2c 100644
--- a/draw.c
+++ b/draw.c
@@ -4,7 +4,6 @@
4#include "dmenu.h" 4#include "dmenu.h"
5#include <stdio.h> 5#include <stdio.h>
6#include <string.h> 6#include <string.h>
7#include <X11/Xlocale.h>
8 7
9/* static */ 8/* static */
10 9
@@ -84,7 +83,6 @@ setfont(const char *fontstr) {
84 int i, n; 83 int i, n;
85 84
86 missing = NULL; 85 missing = NULL;
87 setlocale(LC_CTYPE, "");
88 if(dc.font.set) 86 if(dc.font.set)
89 XFreeFontSet(dpy, dc.font.set); 87 XFreeFontSet(dpy, dc.font.set);
90 dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def); 88 dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
diff --git a/main.c b/main.c
index ce13a80..743967a 100644
--- a/main.c
+++ b/main.c
@@ -5,6 +5,7 @@
5#include "dmenu.h" 5#include "dmenu.h"
6 6
7#include <ctype.h> 7#include <ctype.h>
8#include <locale.h>
8#include <stdlib.h> 9#include <stdlib.h>
9#include <stdio.h> 10#include <stdio.h>
10#include <string.h> 11#include <string.h>
@@ -309,6 +310,7 @@ main(int argc, char *argv[]) {
309 } 310 }
310 else 311 else
311 eprint("usage: dmenu [-font <name>] [-{norm,sel}{bg,fg} <color>] [-t <seconds>] [-v]\n", stdout); 312 eprint("usage: dmenu [-font <name>] [-{norm,sel}{bg,fg} <color>] [-t <seconds>] [-v]\n", stdout);
313 setlocale(LC_CTYPE, "");
312 dpy = XOpenDisplay(0); 314 dpy = XOpenDisplay(0);
313 if(!dpy) 315 if(!dpy)
314 eprint("dmenu: cannot open display\n"); 316 eprint("dmenu: cannot open display\n");