Xinqi Bao's Git
projects
/
dwm.git
/ diff
summary
|
log
|
commit
|
diff
|
tree
raw
|
patch
|
inline
| side by side (parent:
4b06155
)
with this patch everything works fine for me
author
arg@mig29 <unknown>
Thu, 7 Dec 2006 09:02:46 +0000
(10:02 +0100)
committer
arg@mig29 <unknown>
Thu, 7 Dec 2006 09:02:46 +0000
(10:02 +0100)
draw.c
diff
|
blob
|
history
main.c
diff
|
blob
|
history
diff --git
a/draw.c
b/draw.c
index
2dcafe1
..
eeb3e56
100644
(file)
--- a/
draw.c
+++ b/
draw.c
@@
-2,7
+2,6
@@
* See LICENSE file for license details.
*/
#include "dwm.h"
* See LICENSE file for license details.
*/
#include "dwm.h"
-#include <locale.h>
#include <stdio.h>
#include <string.h>
#include <stdio.h>
#include <string.h>
@@
-167,16
+166,13
@@
getcolor(const char *colstr) {
void
setfont(const char *fontstr) {
void
setfont(const char *fontstr) {
- char *def, *
lc, *
*missing;
+ char *def, **missing;
int i, n;
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);
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]);
diff --git
a/main.c
b/main.c
index
cde7e46
..
c42d1ff
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-4,6
+4,7
@@
#include "dwm.h"
#include <errno.h>
#include "dwm.h"
#include <errno.h>
+#include <locale.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.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");
}
else if(argc != 1)
eprint("usage: dwm [-v]\n");
+ setlocale(LC_CTYPE, "");
dpy = XOpenDisplay(0);
if(!dpy)
eprint("dwm: cannot open display\n");
dpy = XOpenDisplay(0);
if(!dpy)
eprint("dwm: cannot open display\n");