X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fterminal-opts.c;h=da69afb508f86d9caf8477e25cce97bfcfd65e2d;hb=37e80366f1930cd7043a79e0dcb1dfd282f678d3;hp=95007a0cb406a362d1521526634f66ba10e63719;hpb=5cfc7232a7cf2b6b5e81bb5d7716538d4c06e5a3;p=pspp

diff --git a/src/ui/terminal/terminal-opts.c b/src/ui/terminal/terminal-opts.c
index 95007a0cb4..da69afb508 100644
--- a/src/ui/terminal/terminal-opts.c
+++ b/src/ui/terminal/terminal-opts.c
@@ -302,14 +302,33 @@ terminal_opts_init (struct argv_parser *ap,
   return to;
 }
 
+/* Return true iff the terminal appears to be an xterm with 
+   UTF-8 capabilities */
+static bool
+term_is_utf8_xterm (void)
+{
+  char *s = NULL;
+
+  if ( (s = getenv ("TERM")) && (0 == strcmp ("xterm", s)) )
+    if ( (s = getenv ("XTERM_LOCALE")) )
+      return strcasestr (s, "utf8") || strcasestr (s, "utf-8");
+
+  return false;
+}
+
 void
 terminal_opts_done (struct terminal_opts *to, int argc, char *argv[])
 {
-      if (0 == strcmp (locale_charset (), "UTF-8"))
-        string_map_insert (&to->options, "box", "unicode");
   register_output_driver (to);
   if (!to->has_output_driver)
     {
+      if ((0 == strcmp (locale_charset (), "UTF-8"))
+	  ||
+	  (term_is_utf8_xterm ()) )
+	{
+	  string_map_insert (&to->options, "box", "unicode");
+	}
+  
       string_map_insert (&to->options, "output-file", "-");
       string_map_insert (&to->options, "format", "txt");
       register_output_driver (to);