| Revision | 9a129fade18aa51426faf32fab48e25713d9e9ca (tree) |
|---|---|
| Time | 2017-05-08 23:03:02 |
| Author | Deskull <desull@user...> |
| Commiter | Deskull |
#25917 Linux版対応ロケールをUTF-8に変更 / Change locale to UTF-8 on linux.
src/main-x11.c (diff)| @@ -126,7 +126,7 @@ char *XSetIMValues(XIM, ...); /* Hack for XFree86 4.0 */ | ||
| 126 | 126 | #include <X11/Xatom.h> |
| 127 | 127 | #endif /* __MAKEDEPEND__ */ |
| 128 | 128 | |
| 129 | - | |
| 129 | +#include <iconv.h> | |
| 130 | 130 | /* |
| 131 | 131 | * Include some helpful X11 code. |
| 132 | 132 | */ |
| @@ -1665,8 +1665,18 @@ static errr Infofnt_text_std(int x, int y, cptr str, int len) | ||
| 1665 | 1665 | Infokfnt->info, Infofnt->wid * 2); |
| 1666 | 1666 | #else |
| 1667 | 1667 | #ifdef USE_FONTSET |
| 1668 | + | |
| 1669 | + iconv_t cd = iconv_open("UTF-8", "EUC-JP"); | |
| 1670 | + size_t inlen = len; | |
| 1671 | + size_t outlen = len * 2; | |
| 1672 | + char *kanji = malloc(outlen); | |
| 1673 | + char *sp = str; char *kp = kanji; | |
| 1674 | + size_t n = iconv(cd, &sp, &inlen, &kp, &outlen); | |
| 1675 | + iconv_close(cd); | |
| 1676 | + | |
| 1668 | 1677 | XmbDrawImageString(Metadpy->dpy, Infowin->win, Infofnt->info, |
| 1669 | - Infoclr->gc, x, y, str, len); | |
| 1678 | + Infoclr->gc, x, y, kanji, kp-kanji); | |
| 1679 | + free(kanji); | |
| 1670 | 1680 | #else |
| 1671 | 1681 | XDrawImageString(Metadpy->dpy, Infowin->win, Infoclr->gc, |
| 1672 | 1682 | x, y, str, len); |
Fork