Rename --with-gtk-version to --with-gtk, and support its negation

[u/mdw/putty] / unix / uxucs.c

diff --git a/unix/uxucs.c b/unix/uxucs.c
index 601b35d..071ecfc 100644 (file)
--- a/unix/uxucs.c
+++ b/unix/uxucs.c
@@ -26,8 +26,9 @@ int mb_to_wc(int codepage, int flags, char *mbstr, int mblen,
 {
     if (codepage == DEFAULT_CODEPAGE) {
        int n = 0;
-       mbstate_t state = { 0 };
+       mbstate_t state;
 
+       memset(&state, 0, sizeof state);
        setlocale(LC_CTYPE, "");
 
        while (mblen > 0) {
@@ -68,9 +69,10 @@ int wc_to_mb(int codepage, int flags, wchar_t *wcstr, int wclen,
 
     if (codepage == DEFAULT_CODEPAGE) {
        char output[MB_LEN_MAX];
-       mbstate_t state = { 0 };
+       mbstate_t state;
        int n = 0;
 
+       memset(&state, 0, sizeof state);
        setlocale(LC_CTYPE, "");
 
        while (wclen > 0) {
@@ -106,8 +108,8 @@ int wc_to_mb(int codepage, int flags, wchar_t *wcstr, int wclen,
 /*
  * Return value is TRUE if pterm is to run in direct-to-font mode.
  */
-int init_ucs(struct unicode_data *ucsdata, 
-            char *linecharset, int font_charset, int vtmode)
+int init_ucs(struct unicode_data *ucsdata, char *linecharset,
+            int utf8_override, int font_charset, int vtmode)
 {
     int i, ret = 0;
 
@@ -120,10 +122,27 @@ int init_ucs(struct unicode_data *ucsdata,
     ucsdata->font_codepage = -1;
 
     /*
-     * line_codepage should be decoded from the specification in
-     * cfg.
+     * If utf8_override is set and the POSIX locale settings
+     * dictate a UTF-8 character set, then just go straight for
+     * UTF-8.
      */
-    ucsdata->line_codepage = decode_codepage(linecharset);
+    ucsdata->line_codepage = CS_NONE;
+    if (utf8_override) {
+       const char *s;
+       if (((s = getenv("LC_ALL"))   && *s) ||
+           ((s = getenv("LC_CTYPE")) && *s) ||
+           ((s = getenv("LANG"))     && *s)) {
+           if (strstr(s, "UTF-8"))
+               ucsdata->line_codepage = CS_UTF8;
+       }
+    }
+
+    /*
+     * Failing that, line_codepage should be decoded from the
+     * specification in conf.
+     */
+    if (ucsdata->line_codepage == CS_NONE)
+       ucsdata->line_codepage = decode_codepage(linecharset);
 
     /*
      * If line_codepage is _still_ CS_NONE, we assume we're using