Changeset 738

Timestamp:

01/22/11 14:44:13 (16 months ago)

Author:

bhaak

Message:

UTF-8 glyphs in map

Location:

trunk

Files:

• configure (modified) (6 diffs)
• include/config.h (modified) (1 diff)
• include/extern.h (modified) (3 diffs)
• include/flag.h (modified) (1 diff)
• include/rm.h (modified) (2 diffs)
• src/drawing.c (modified) (10 diffs)
• src/mapglyph.c (modified) (4 diffs)
• src/options.c (modified) (5 diffs)
• src/unicode.c (modified) (4 diffs)
• sys/autoconf/autoconf.hin (modified) (3 diffs)
• sys/autoconf/configure.ac (modified) (3 diffs)
• sys/autoconf/m4/ax_define_integer_bits.m4 (added)
• util/makedefs.c (modified) (1 diff)
• win/tty/wintty.c (modified) (2 diffs)

trunk/configure

@@ -749 +749 @@
 enable_dump_html_css_file
 enable_dump_html_css_embedded
+enable_utf8_glyphs
 enable_whereis_file
 enable_wizmode
@@ -1450 +1451 @@
                           CSS file should be included in the HTML dump
                           (default=no)
+  --enable-utf8-glyphs    Enable UTF-8 glyphs in TTY (default=yes)
   --enable-whereis-file=FILE
                           Log information about running games (default=no,
@@ -2010 +2012 @@
 
 } # ac_fn_c_check_func
+
+# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
+# --------------------------------------------
+# Tries to find the compile-time value of EXPR in a program that includes
+# INCLUDES, setting VAR accordingly. Returns whether the value could be
+# computed
+ac_fn_c_compute_int ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if test "$cross_compiling" = yes; then
+    # Depending upon the size, compute the lo and hi bounds.
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) >= 0)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_hi=$ac_mid; break
+else
+  as_fn_arith $ac_mid + 1 && ac_lo=$as_val
+                        if test $ac_lo -le $ac_mid; then
+                          ac_lo= ac_hi=
+                          break
+                        fi
+                        as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) < 0)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) >= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_lo=$ac_mid; break
+else
+  as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
+                        if test $ac_mid -le $ac_hi; then
+                          ac_lo= ac_hi=
+                          break
+                        fi
+                        as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  ac_lo= ac_hi=
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+  as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_hi=$ac_mid
+else
+  as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in #((
+?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
+'') ac_retval=1 ;;
+esac
+  else
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+static long int longval () { return $2; }
+static unsigned long int ulongval () { return $2; }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
+
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    return 1;
+  if (($2) < 0)
+    {
+      long int i = longval ();
+      if (i != ($2))
+        return 1;
+      fprintf (f, "%ld", i);
+    }
+  else
+    {
+      unsigned long int i = ulongval ();
+      if (i != ($2))
+        return 1;
+      fprintf (f, "%lu", i);
+    }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
+  return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  echo >>conftest.val; read $3 <conftest.val; ac_retval=0
+else
+  ac_retval=1
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f conftest.val
+
+  fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_compute_int
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
@@ -3812 +3992 @@
 esac
 
-
 for ac_prog in flex lex
 do
@@ -5563 +5742 @@
 
 
+
+
+ac_fn_c_check_type "$LINENO" "uint32_t" "ac_cv_type_uint32_t" "$ac_includes_default"
+if test "x$ac_cv_type_uint32_t" = x""yes; then :
+
+else
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: trying to find a suitable 4-byte replacement for uint32_t" >&5
+$as_echo "$as_me: trying to find a suitable 4-byte replacement for uint32_t" >&6;}
+  uint32_t=no
+  find_uint32_t ()
+  {
+
+
+  # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned int" >&5
+$as_echo_n "checking size of unsigned int... " >&6; }
+if test "${ac_cv_sizeof_unsigned_int+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned int))" "ac_cv_sizeof_unsigned_int"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_unsigned_int" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (unsigned int)
+See \`config.log' for more details." "$LINENO" 5; }; }
+   else
+     ac_cv_sizeof_unsigned_int=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned_int" >&5
+$as_echo "$ac_cv_sizeof_unsigned_int" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_UNSIGNED_INT $ac_cv_sizeof_unsigned_int
+_ACEOF
+
+
+  if test "$ac_cv_sizeof_unsigned_int" -eq 4; then
+    uint32_t="unsigned int"
+    return
+  fi
+
+
+  # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned long" >&5
+$as_echo_n "checking size of unsigned long... " >&6; }
+if test "${ac_cv_sizeof_unsigned_long+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned long))" "ac_cv_sizeof_unsigned_long"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_unsigned_long" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (unsigned long)
+See \`config.log' for more details." "$LINENO" 5; }; }
+   else
+     ac_cv_sizeof_unsigned_long=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned_long" >&5
+$as_echo "$ac_cv_sizeof_unsigned_long" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long
+_ACEOF
+
+
+  if test "$ac_cv_sizeof_unsigned_long" -eq 4; then
+    uint32_t="unsigned long"
+    return
+  fi
+
+
+  # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned long long" >&5
+$as_echo_n "checking size of unsigned long long... " >&6; }
+if test "${ac_cv_sizeof_unsigned_long_long+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned long long))" "ac_cv_sizeof_unsigned_long_long"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_unsigned_long_long" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (unsigned long long)
+See \`config.log' for more details." "$LINENO" 5; }; }
+   else
+     ac_cv_sizeof_unsigned_long_long=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned_long_long" >&5
+$as_echo "$ac_cv_sizeof_unsigned_long_long" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_UNSIGNED_LONG_LONG $ac_cv_sizeof_unsigned_long_long
+_ACEOF
+
+
+  if test "$ac_cv_sizeof_unsigned_long_long" -eq 4; then
+    uint32_t="unsigned long long"
+    return
+  fi
+
+
+
+
+
+
+
+
+    :
+  }
+  find_uint32_t
+
+cat >>confdefs.h <<_ACEOF
+#define uint32_t $uint32_t
+_ACEOF
+
+
+fi
+
+
+
 # Extract the first word of "nroff", so it can be a program name with args.
 set dummy nroff; ac_word=$2
@@ -6551 +6883 @@
         fi
 fi
+
+if test "$enable_tty_graphics" != "no"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable utf8-glyphs" >&5
+$as_echo_n "checking whether to enable utf8-glyphs... " >&6; }
+   # Check whether --enable-utf8-glyphs was given.
+if test "${enable_utf8_glyphs+set}" = set; then :
+  enableval=$enable_utf8_glyphs;
+else
+  enable_utf8_glyphs="yes"
+fi
+
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_utf8_glyphs" >&5
+$as_echo "$enable_utf8_glyphs" >&6; }
+   if test "$enable_utf8_glyphs" != "no" ; then
+
+cat >>confdefs.h <<_ACEOF
+#define UTF8_GLYPHS /**/
+_ACEOF
+
+   fi
+
+        if test "$enable_utf8_glyphs" != "no" ; then
+                                if test "$uint32_t" = no; then
+                        as_fn_error "unable to continue without a 4-bytes datatype that could hold unicode codepoints" "$LINENO" 5
+                fi
+        fi
+fi
+
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable whereis file" >&5

trunk/include/config.h

@@ -292 +292 @@
 #ifndef _AIX32          /* identical typedef in system file causes trouble */
 typedef unsigned char   uchar;
+#endif
+
+/* Type used for outputting DECgraphics and IBMgraphics characters into
+ * HTML dumps or for holding unicode codepoints. */
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
+#else
+# if HAVE_STDINT_H
+#  include <stdint.h>
+# endif
+#endif
+#ifdef UINT32_MAX
+typedef uint32_t glyph_t;
+#else
+/* Fallback that should work on most systems */
+typedef long glyph_t;
 #endif
 

trunk/include/extern.h

@@ -470 +470 @@
 E int FDECL(def_char_to_monclass, (CHAR_P));
 #if !defined(MAKEDEFS_C) && !defined(LEV_LEX_C)
-E void FDECL(assign_graphics, (uchar *,int,int,int));
+E void FDECL(assign_graphics, (glyph_t *,int,int,int));
 E void FDECL(switch_graphics, (int));
 #ifdef REINCARNATION
@@ -1028 +1028 @@
 /* ### mapglyph.c ### */
 
-E void FDECL(mapglyph, (int, int *, int *, unsigned *, int, int));
+E void FDECL(mapglyph, (int, glyph_t *, int *, unsigned *, int, int));
 
 /* ### mcastu.c ### */
@@ -2553 +2553 @@
 E int FDECL(check_tutorial_location, (int, int, BOOLEAN_P));
 
+/* ### unicode.c ### */
+E glyph_t FDECL(get_unicode_codepoint, (int));
+E int FDECL(pututf8char, (glyph_t));
+
 #undef E
 

trunk/include/flag.h

@@ -191 +191 @@
         boolean  echo;          /* 1 to echo characters */
         boolean  IBMgraphics;   /* use IBM extended character set */
+        boolean  UTF8graphics;  /* use UTF-8 characters */
         unsigned msg_history;   /* hint: # of top lines to save */
         boolean  num_pad;       /* use numbers for movement commands */

trunk/include/rm.h

@@ -226 +226 @@
 
 extern struct symdef defsyms[MAXPCHARS];        /* defaults */
-extern uchar showsyms[MAXPCHARS];
+extern glyph_t showsyms[MAXPCHARS];
 extern const struct symdef def_warnsyms[WARNCOUNT];
 
@@ -236 +236 @@
 #define DEC_GRAPHICS    2       /* VT100 line drawing characters */
 #define MAC_GRAPHICS    3       /* Macintosh drawing characters */
-#define CURS_GRAPHICS   4   /* Portable curses drawing characters */
+#define CURS_GRAPHICS   4       /* Portable curses drawing characters */
+#define UTF8_GRAPHICS   5       /* UTF8 characters */
 
 /*

trunk/src/drawing.c

@@ -19 +19 @@
 #define g_FILLER(symbol) 0
 
-uchar oc_syms[MAXOCLASSES] = DUMMY; /* the current object  display symbols */
-uchar showsyms[MAXPCHARS]  = DUMMY; /* the current feature display symbols */
-uchar monsyms[MAXMCLASSES] = DUMMY; /* the current monster display symbols */
-uchar warnsyms[WARNCOUNT]  = DUMMY;  /* the current warning display symbols */
+uchar oc_syms[MAXOCLASSES]  = DUMMY; /* the current object  display symbols */
+glyph_t showsyms[MAXPCHARS] = DUMMY; /* the current feature display symbols */
+uchar monsyms[MAXMCLASSES]  = DUMMY; /* the current monster display symbols */
+uchar warnsyms[WARNCOUNT]   = DUMMY;  /* the current warning display symbols */
 
 /* Default object class symbols.  See objclass.h. */
@@ -319 +319 @@
 #endif
 
-static uchar ibm_graphics[MAXPCHARS] = {
+static glyph_t ibm_graphics[MAXPCHARS] = {
 /* 0*/  g_FILLER(S_stone),
         0xb3,   /* S_vwall:     meta-3, vertical rule */
@@ -419 +419 @@
 void NDECL((*decgraphics_mode_callback)) = 0;  /* set in tty_start_screen() */
 
-static uchar dec_graphics[MAXPCHARS] = {
+static glyph_t dec_graphics[MAXPCHARS] = {
 /* 0*/  g_FILLER(S_stone),
         0xf8,   /* S_vwall:     meta-x, vertical rule */
@@ -517 +517 @@
 
 #ifdef MAC_GRAPHICS_ENV
-static uchar mac_graphics[MAXPCHARS] = {
+static glyph_t mac_graphics[MAXPCHARS] = {
 /* 0*/  g_FILLER(S_stone),
         0xba,   /* S_vwall */
@@ -614 +614 @@
 #endif  /* MAC_GRAPHICS_ENV */
 
+#ifdef UTF8_GLYPHS
+/* Probably best to only use characters from this list
+ * http://en.wikipedia.org/wiki/WGL4 */
+static glyph_t utf8_graphics[MAXPCHARS] = {
+/* 0*/  g_FILLER(S_stone),
+        0x2502, /* S_vwall:     BOX DRAWINGS LIGHT VERTICAL */
+        0x2500, /* S_hwall:     BOX DRAWINGS LIGHT HORIZONTAL */
+        0x250c, /* S_tlcorn:    BOX DRAWINGS LIGHT DOWN AND RIGHT */
+        0x2510, /* S_trcorn:    BOX DRAWINGS LIGHT DOWN AND LEFT */
+        0x2514, /* S_blcorn:    BOX DRAWINGS LIGHT UP AND RIGHT */
+        0x2518, /* S_brcorn:    BOX DRAWINGS LIGHT UP AND LEFT */
+        0x253c, /* S_crwall:    BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL */
+        0x2534, /* S_tuwall:    BOX DRAWINGS LIGHT UP AND HORIZONTAL */
+        0x252c, /* S_tdwall:    BOX DRAWINGS LIGHT DOWN AND HORIZONTAL */
+        0x2524, /* S_tlwall:    BOX DRAWINGS LIGHT VERTICAL AND LEFT */
+        0x251c, /* S_trwall:    BOX DRAWINGS LIGHT VERTICAL AND RIGHT */
+        0x00b7, /* S_ndoor:     MIDDLE DOT */
+        0x2592, /* S_vodoor:    MEDIUM SHADE */
+        0x2592, /* S_hodoor:    MEDIUM SHADE */
+        g_FILLER(S_vcdoor),
+        g_FILLER(S_hcdoor),
+        0x03c0, /* S_bars:      GREEK SMALL LETTER PI */
+        0x03a8, /* S_tree:      GREEK CAPITAL LETTER PSI */
+        0x00b7, /* S_room:      MIDDLE DOT */
+        g_FILLER(S_stone),      /* S_darkroom:  meta-~, centered dot */
+        g_FILLER(S_corr),
+        g_FILLER(S_litcorr),
+        g_FILLER(S_upstair),
+        g_FILLER(S_dnstair),
+        0x2265, /* S_upladder:  GREATER-THAN OR EQUAL TO */
+        0x2264, /* S_dnladder:  LESS-THAN OR EQUAL TO */
+        0x2020, /* S_altar:     DAGGER */
+        0x03A9, /* S_grave:     GREEK CAPITAL LETTER OMEGA */
+        g_FILLER(S_throne),
+        g_FILLER(S_sink),
+        0x00b6, /* S_fountain:  PILCROW SIGN */
+        0x2248, /* S_pool:      ALMOST EQUAL TO */
+        0x00b7, /* S_ice:       MIDDLE DOT */
+        0x25c6, /* S_lava:      BLACK DIAMOND */
+        0x00b7, /* S_vodbridge: MIDDLE DOT */
+        0x00b7, /* S_hodbridge: MIDDLE DOT */
+        g_FILLER(S_vcdbridge),
+        g_FILLER(S_hcdbridge),
+        g_FILLER(S_air),
+        g_FILLER(S_cloud),
+        0x2248, /* S_water:     ALMOST EQUAL TO */
+        g_FILLER(S_arrow_trap),
+        g_FILLER(S_dart_trap),
+        g_FILLER(S_falling_rock_trap),
+        g_FILLER(S_squeaky_board),
+        g_FILLER(S_bear_trap),
+        g_FILLER(S_land_mine),
+        g_FILLER(S_rolling_boulder_trap),
+        g_FILLER(S_sleeping_gas_trap),
+        g_FILLER(S_rust_trap),
+        g_FILLER(S_fire_trap),
+        g_FILLER(S_pit),
+        g_FILLER(S_spiked_pit),
+        g_FILLER(S_hole),
+        g_FILLER(S_trap_door),
+        g_FILLER(S_teleportation_trap),
+        g_FILLER(S_level_teleporter),
+        g_FILLER(S_magic_portal),
+        0x00A4, /* S_web:       CURRENCY SIGN */
+        g_FILLER(S_statue_trap),
+        g_FILLER(S_magic_trap),
+        g_FILLER(S_anti_magic_trap),
+        g_FILLER(S_polymorph_trap),
+        0x58,   /* S_vbeam:     meta-x, vertical rule */ // TODO
+        0x51,   /* S_hbeam:     meta-q, horizontal rule */ // TODO
+        g_FILLER(S_lslant),
+        g_FILLER(S_rslant),
+        g_FILLER(S_digbeam),
+        g_FILLER(S_flashbeam),
+        g_FILLER(S_boomleft),
+        g_FILLER(S_boomright),
+        g_FILLER(S_ss1),
+        g_FILLER(S_ss2),
+        g_FILLER(S_ss3),
+        g_FILLER(S_ss4),
+        g_FILLER(S_sw_tl),
+        0x5f,   /* S_sw_tc:     meta-o, high horizontal line */ // TODO
+        g_FILLER(S_sw_tr),
+        0x58,   /* S_sw_ml:     meta-x, vertical rule */ // TODO
+        0x58,   /* S_sw_mr:     meta-x, vertical rule */ // TODO
+        g_FILLER(S_sw_bl),
+        0x53,   /* S_sw_bc:     meta-s, low horizontal line */ // TODO
+        g_FILLER(S_sw_br),
+        g_FILLER(S_explode1),
+        0x5f,   /* S_explode2:  meta-o, high horizontal line */ // TODO
+        g_FILLER(S_explode3),
+        0x58,   /* S_explode4:  meta-x, vertical rule */ // TODO
+        g_FILLER(S_explode5),
+        0x58,   /* S_explode6:  meta-x, vertical rule */ // TODO
+        g_FILLER(S_explode7),
+        0x53,   /* S_explode8:  meta-s, low horizontal line */ // TODO
+        g_FILLER(S_explode9)
+};
+#endif
+
 #ifdef PC9800
 void NDECL((*ascgraphics_mode_callback)) = 0;   /* set in tty_start_screen() */
@@ -649 +749 @@
 void
 assign_graphics(graph_chars, glth, maxlen, offset)
-register uchar *graph_chars;
+register glyph_t *graph_chars;
 int glth, maxlen, offset;
 {
@@ -663 +763 @@
 int gr_set_flag;
 {
+    iflags.IBMgraphics = FALSE;
+    iflags.DECgraphics = FALSE;
+    iflags.cursesgraphics = FALSE;
+    iflags.UTF8graphics = FALSE;
+
     switch (gr_set_flag) {
         default:
         case ASCII_GRAPHICS:
-            assign_graphics((uchar *)0, 0, MAXPCHARS, 0);
+            assign_graphics((glyph_t *)0, 0, MAXPCHARS, 0);
 #ifdef PC9800
             if (ascgraphics_mode_callback) (*ascgraphics_mode_callback)();
@@ -712 +817 @@
 #ifdef CURSES_GRAPHICS
     case CURS_GRAPHICS:
-            assign_graphics((uchar *)0, 0, MAXPCHARS, 0);
+            assign_graphics((glyph_t *)0, 0, MAXPCHARS, 0);
         iflags.cursesgraphics = TRUE;
             iflags.IBMgraphics = FALSE;
@@ -718 +823 @@
         break;
 #endif
+#ifdef UTF8_GLYPHS
+        case UTF8_GRAPHICS:
+            assign_graphics(utf8_graphics, SIZE(utf8_graphics), MAXPCHARS, 0);
+            iflags.UTF8graphics = TRUE;
+            break;
+#endif
         }
     return;
@@ -728 +839 @@
  * saved display symbols for objects & features.
  */
-static uchar save_oc_syms[MAXOCLASSES] = DUMMY;
-static uchar save_showsyms[MAXPCHARS]  = DUMMY;
-static uchar save_monsyms[MAXPCHARS]   = DUMMY;
-
-static const uchar r_oc_syms[MAXOCLASSES] = {
+static uchar save_oc_syms[MAXOCLASSES]  = DUMMY;
+static glyph_t save_showsyms[MAXPCHARS] = DUMMY;
+static uchar save_monsyms[MAXPCHARS]    = DUMMY;
+
+static const glyph_t r_oc_syms[MAXOCLASSES] = {
 /* 0*/  '\0',
         ILLOBJ_SYM,

trunk/src/mapglyph.c

@@ -64 +64 @@
 mapglyph(glyph, ochar, ocolor, ospecial, x, y)
 int glyph, *ocolor, x, y;
-int *ochar;
+glyph_t *ochar;
 unsigned *ospecial;
 {
@@ -71 +71 @@
         int color = NO_COLOR;
 #endif
-        uchar ch;
+        glyph_t ch;
         unsigned special = 0;
 
@@ -90 +90 @@
     } else if ((offset = (glyph - GLYPH_SWALLOW_OFF)) >= 0) {   /* swallow */
         /* see swallow_to_glyph() in display.c */
-        ch = (uchar) showsyms[S_sw_tl + (offset & 0x7)];
+        ch = showsyms[S_sw_tl + (offset & 0x7)];
 #ifdef ROGUE_COLOR
         if (HAS_ROGUE_IBM_GRAPHICS && iflags.use_color)
@@ -248 +248 @@
 #endif
 
-    *ochar = (int)ch;
+    *ochar = ch;
     *ospecial = special;
 #ifdef TEXTCOLOR

trunk/src/options.c

@@ -252 +252 @@
         {"toptenwin",&flags.toptenwin, FALSE, SET_IN_GAME},
         {"travel", &iflags.travelcmd, TRUE, SET_IN_GAME},
+#ifdef UTF8_GLYPHS
+        {"UTF8graphics", &iflags.UTF8graphics, FALSE, SET_IN_GAME},
+#else
+        {"UTF8graphics", (boolean *)0, FALSE, SET_IN_FILE},
+#endif
         {"use_inverse",   &iflags.wc_inverse, TRUE, SET_IN_GAME},               /*WC*/
 #ifdef WIN_EDGE
@@ -920 +925 @@
 int maxlen, offset;
 {
-        uchar translate[MAXPCHARS+1];
+        glyph_t translate[MAXPCHARS+1];
         int length, i;
 
@@ -931 +936 @@
         /* match the form obtained from PC configuration files */
         for (i = 0; i < length; i++)
-                translate[i] = (uchar) opts[i];
+                translate[i] = (glyph_t) opts[i];
         assign_graphics(translate, length, maxlen, offset);
 }
@@ -2842 +2847 @@
                                  || (boolopt[i].addr) == &iflags.cursesgraphics
 # endif
+# ifdef UTF8_GLYPHS
+                                 || (boolopt[i].addr) == &iflags.UTF8graphics
+# endif
                                 ) {
 # ifdef REINCARNATION
@@ -2867 +2875 @@
                                 switch_graphics(iflags.cursesgraphics ?
                                                 CURS_GRAPHICS : ASCII_GRAPHICS);
+# endif
+# ifdef UTF8_GLYPHS
+                            if ((boolopt[i].addr) == &iflags.UTF8graphics)
+                                switch_graphics(iflags.UTF8graphics ?
+                                                UTF8_GRAPHICS : ASCII_GRAPHICS);
 # endif
 # ifdef REINCARNATION

trunk/src/unicode.c

@@ -7 +7 @@
 /** CP437 to Unicode mapping according to the Unicode Consortium
  * http://unicode.org/Public/MAPPINGS/VENDORS/MICSFT/PC/CP437.TXT */
-static int cp437_to_unicode[] = {
+static glyph_t cp437_to_unicode[] = {
         0x00c7, /* LATIN CAPITAL LETTER C WITH CEDILLA */
         0x00fc, /* LATIN SMALL LETTER U WITH DIAERESIS */
@@ -141 +141 @@
  * Only the last 32 characters are significantly different from ASCII
  * http://support.attachmate.com/techdocs/1184.html */
-static int dec_graphics_to_unicode[] = {
+static glyph_t dec_graphics_to_unicode[] = {
         0x25c6, /* BLACK DIAMOND */
         0x2592, /* MEDIUM SHADE */
@@ -177 +177 @@
 
 /** Returns unicode codepoint of character according to selected graphics mode. */
-int
+glyph_t
 get_unicode_codepoint(int ch)
 {
@@ -192 +192 @@
 }
 
+#ifdef UTF8_GLYPHS
+/** Prints a Unicode codepoint as UTF-8 encoded byte sequence.
+ * Originally from Ray Chason's Unicode proof of concept patch. */
+int
+pututf8char(glyph_t c)
+{
+  if (c < 0x80) {
+    putchar(c);
+  } else if(c < 0x800) {
+    putchar(0xC0 | (c>>6));
+    putchar(0x80 | (c & 0x3F));
+  } else if (c < 0x10000) {
+    putchar(0xE0 | (c>>12));
+    putchar(0x80 | (c>>6 & 0x3F));
+    putchar(0x80 | (c & 0x3F));
+  } else if (c < 0x200000) {
+    putchar(0xF0 | (c>>18));
+    putchar(0x80 | (c>>12 & 0x3F));
+    putchar(0x80 | (c>>6 & 0x3F));
+    putchar(0x80 | (c & 0x3F));
+  }
+
+  return 0;
+}
+#endif
+
 /*unicode.c*/

trunk/sys/autoconf/autoconf.hin

@@ -222 +222 @@
 #undef SINKS
 
+/* The size of `unsigned int', as computed by sizeof. */
+#undef SIZEOF_UNSIGNED_INT
+
+/* The size of `unsigned long', as computed by sizeof. */
+#undef SIZEOF_UNSIGNED_LONG
+
+/* The size of `unsigned long long', as computed by sizeof. */
+#undef SIZEOF_UNSIGNED_LONG_LONG
+
 /* TTY graphics status color */
 #undef STATUS_COLORS
@@ -251 +260 @@
 /* Using Mersenne Twister as RNG */
 #undef USE_MERSENNE_TWISTER
+
+/* Enable UTF-8 glyphs in TTY */
+#undef UTF8_GLYPHS
 
 /* Fancy mazes */
@@ -274 +286 @@
 #undef YYTEXT_POINTER
 
+/* If not already defined, then define as a datatype of *exactly* 32 bits. */
+#undef uint32_t
+
 #endif /* AUTOCONF_H */

trunk/sys/autoconf/configure.ac

@@ -112 +112 @@
      *linux* )          AC_DEFINE(LINUX,[],[GNU Linux]);;
 esac
-
 
 dnl  ----- Check for programs
@@ -346 +345 @@
 AC_CHECK_FUNCS(fcntl)
 
+dnl ------ Check for 32 bit datatype
+AX_DEFINE_INTEGER_BITS(uint32_t, unsigned int, unsigned long, unsigned long long)
+
 dnl  ----- Check for program needed to build Guidebook
 AC_CHECK_PROG(HAVE_NROFF, nroff, "yes", "no")
@@ -460 +462 @@
 fi
 
+if test "$enable_tty_graphics" != "no"; then
+        NETHACK_ARG(utf8-glyphs,[Enable UTF-8 glyphs in TTY],UTF8_GLYPHS,yes)
+        if test "$enable_utf8_glyphs" != "no" ; then
+                dnl check for uint32_t
+                if test "$uint32_t" = no; then
+                        AC_MSG_ERROR([unable to continue without a 4-bytes datatype that could hold unicode codepoints])
+                fi
+        fi
+fi
+
+
 NETHACK_ARG_WITH_PARAM(whereis-file,[Log information about running games],WHEREIS_FILE,no,FILE,[%n.whereis])
 

trunk/util/makedefs.c

@@ -785 +785 @@
 #ifdef TOURIST
                 "tourists",
+#endif
+#ifdef TOURIST
+                "UTF-8 glyphs",
 #endif
 #ifdef USER_SOUNDS

trunk/win/tty/wintty.c

@@ -1832 +1832 @@
     case NHW_BASE:
         tty_curs(window, x, y);
+#ifdef UTF8_GLYPHS
+        if (iflags.UTF8graphics) {
+                pututf8char(ch);
+        } else {
+                (void) putchar(ch);
+        }
+#else
         (void) putchar(ch);
+#endif
         ttyDisplay->curx++;
         cw->curx++;
@@ -2586 +2594 @@
     else
 #endif
+#ifdef UTF8_GLYPHS
+        if (iflags.UTF8graphics) {
+                pututf8char(ch);
+        } else {
+                g_putch(ch);    /* print the character */
+        }
+#else
         g_putch(ch);            /* print the character */
+#endif
 
     if (reverse_on) {