[Merge] #40883 Win版が通る所までマージ完了．他環境でのチェックや他見落としはこれからチェックする。 / Merge is completed until...

[hengband/hengband.git] / src / main-gcu.c

diff --git a/src/main-gcu.c b/src/main-gcu.c
index 541c624..87022a0 100644 (file)
--- a/src/main-gcu.c
+++ b/src/main-gcu.c
@@ -174,7 +174,7 @@
 # include <ncurses.h>
 #else
 # include <curses.h>
-#endif
+#include <iconv.h>
 
 typedef struct term_data term_data;
 
@@ -188,7 +188,7 @@ struct term_data
 #define MAX_TERM_DATA 4
 
 static term_data data[MAX_TERM_DATA];
-
+static iconv_t iconvd;
 
 /*
  * Hack -- try to guess which systems use what commands
@@ -1094,8 +1094,13 @@ static errr Term_text_gcu(int x, int y, int n, byte a, concptr s)
    term_data *td = (term_data *)(Term->data);
 
    int i;
-
-   char text[81];
+   char intext[n];
+   char text[80 * 3 + 1];
+   size_t inlen = n;
+   size_t outlen = sizeof(text);
+   char *inbuf = intext;
+   char *outbuf = text;
+   size_t res;
 
 #ifdef USE_NCURSES_ACS
    /* do we have colors + 16 ? */
@@ -1107,12 +1112,20 @@ static errr Term_text_gcu(int x, int y, int n, byte a, concptr s)
    }
 #endif
 
+   /* Copy to char array because of iconv's warning by const char pointer */
+   memcpy(intext, s, (size_t)n);
+
    /* Obtain a copy of the text */
-   for (i = 0; i < n; i++) text[i] = s[i];    text[n] = 0;
+   if(res == (size_t)-1) return (-1);
+   if(res == (size_t)-1) return (-1);
+   res = iconv(iconvd, 0, 0, &outbuf, &outlen);
+   if(res == (size_t)-1) return (-1);
+
+   if(outlen == 0) return (-1);
+   *outbuf = '\0';
 
    /* Move the cursor and dump the string */
    wmove(td->win, y, x);
-
 #ifdef A_COLOR
    /* Set the color */
    if (can_use_color) wattrset(td->win, colortable[a & 0x0F]);
@@ -1181,8 +1194,10 @@ static void hook_quit(concptr str)
        /* Unused */
        (void)str;
 
-       /* Exit curses */
-       endwin();
+   /* Exit curses */
+   endwin();
+
+   iconv_close(iconvd);
 }
 
 
@@ -1207,6 +1222,8 @@ errr init_gcu(int argc, char *argv[])
 
 
    setlocale(LC_ALL, "");
+   iconvd = iconv_open("", "EUC-JP");
+   if(iconvd == (iconv_t)-1) return (-1);
 
 #ifdef USE_SOUND