Merge branch 'unicode'.

There are some issues left, like incorrect wrapping in some cases, but
we can fix them later.

1 files changed, 5 insertions, 24 deletions

diff --git a/crawl-ref/source/libgui.cc b/crawl-ref/source/libgui.cc
index cf9034ca79..c2f04f5b66 100644
--- a/crawl-ref/source/libgui.cc
+++ b/crawl-ref/source/libgui.cc
@@ -28,7 +28,7 @@
 
 int m_getch()
 {
-    return getch();
+    return getchk();
 }
 
 void set_mouse_enabled(bool enabled)
@@ -65,26 +65,12 @@ void gui_init_view_params(crawl_view_geometry &geom)
     geom.viewsz.y = 17;
 }
 
-int putch(unsigned char chr)
+int putwch(ucs_t chr)
 {
-    // object's method
-    TextRegion::text_mode->putch(chr);
+    TextRegion::text_mode->putwch(chr);
     return 0;
 }
 
-int putwch(unsigned chr)
-{
-    // No unicode support.
-    putch(static_cast<unsigned char>(chr));
-    return 0;
-}
-
-void writeWChar(unsigned char *ch)
-{
-    // object's method
-    TextRegion::text_mode->writeWChar(ch);
-}
-
 void clear_to_end_of_line()
 {
     // object's method
@@ -149,23 +135,18 @@ int get_number_of_cols()
     return tiles.get_number_of_cols();
 }
 
-void put_colour_ch(int colour, unsigned ch)
+void put_colour_ch(int colour, ucs_t ch)
 {
     textcolor(colour);
     putwch(ch);
 }
 
-int window(int x1, int y1, int x2, int y2)
-{
-    return 0;
-}
-
 int getch_ck()
 {
     return (tiles.getch_ck());
 }
 
-int getch()
+int getchk()
 {
     return getch_ck();
 }