diff --git a/CHANGES b/CHANGES
index 2f4115a5..78ce700f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,6 @@
 30 April 2009
 
+* Display the layout name in window lists.
 * Merge resize-pane-up and resize-pane-down into resize-pane with -U and -D
   flags.
 
@@ -1234,7 +1235,7 @@
   (including mutt, emacs). No status bar yet and no key remapping or other
   customisation.
 
-$Id: CHANGES,v 1.279 2009-04-30 06:01:23 nicm Exp $
+$Id: CHANGES,v 1.280 2009-04-30 20:54:52 nicm Exp $
 
  LocalWords:  showw utf UTF fulvio ciriaco joshe OSC APC gettime abc DEF OA clr
  LocalWords:  rivo nurges lscm Erdely eol smysession mysession ek dstname RB ms
diff --git a/TODO b/TODO
index 270582cc..30a38f63 100644
--- a/TODO
+++ b/TODO
@@ -63,8 +63,6 @@
 - refer to windows by name etc (duplicates? fnmatch?)
 - the output code (tty.c) could do with optimisation depending on term
   capibilities
-- resize-pane-up/down should be resize-pane -U/-D. ditto up-pane/down-pane
-  should be select-pane -U/-D
 
 (hopefully) for 0.9, in no particular order:
 - a command to display the status line briefly when it is turned off
@@ -80,7 +78,6 @@
 - attach should have a flag to create session if it doesn't exist
 - layout/split stuff:
      horiz split command, and similar resizing commands as for vert split
-     display the layout in a readable format somewhere
      previous-layout command
      select-layout command
      make manual layout a bit less of a hack and make it handle a grid
diff --git a/screen-write.c b/screen-write.c
index 526c6546..ac9e27fb 100644
--- a/screen-write.c
+++ b/screen-write.c
@@ -1,4 +1,4 @@
-/* $Id: screen-write.c,v 1.43 2009-03-30 20:14:50 nicm Exp $ */
+/* $Id: screen-write.c,v 1.44 2009-04-30 20:54:53 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -529,7 +529,7 @@ screen_write_cell(
 	struct screen		*s = ctx->s;
 	struct grid		*gd = s->grid;
 	struct grid_utf8	 gu, *tmp_gu;
-	u_int		 	 width, uvalue, xx, i;
+	u_int		 	 width, xx, i;
 	struct grid_cell 	 tmp_gc, *tmp_gc2;
 	size_t			 size;
 
@@ -539,8 +539,7 @@ screen_write_cell(
 
 	/* Find character width. */
 	if (gc->flags & GRID_FLAG_UTF8) {
-		uvalue = utf8_combine(udata);
-		width = utf8_width(uvalue);
+		width = utf8_width(udata);
 
 		gu.width = width;
 		memcpy(&gu.data, udata, sizeof gu.data);
diff --git a/server.c b/server.c
index e172f17e..8b635c26 100644
--- a/server.c
+++ b/server.c
@@ -1,4 +1,4 @@
-/* $Id: server.c,v 1.137 2009-04-16 10:59:59 nicm Exp $ */
+/* $Id: server.c,v 1.138 2009-04-30 20:54:53 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -163,6 +163,7 @@ server_start(char *path)
 	ARRAY_INIT(&clients);
 	ARRAY_INIT(&sessions);
 	key_bindings_init();
+	utf8_build();
 
 	server_locked = 0;
 	server_password = NULL;
diff --git a/tmux.h b/tmux.h
index 6890f01c..fd6ac814 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1,4 +1,4 @@
-/* $Id: tmux.h,v 1.307 2009-04-30 16:27:29 nicm Exp $ */
+/* $Id: tmux.h,v 1.308 2009-04-30 20:54:53 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -1599,9 +1599,8 @@ int		 session_select(struct session *, int);
 int		 session_last(struct session *);
 
 /* utf8.c */
-u_int	utf8_combine(const u_char *);
-void	utf8_split(u_int, u_char *);
-int	utf8_width(u_int);
+void	utf8_build(void);
+int	utf8_width(u_char *);
 
 /* util.c */
 char   *section_string(char *, size_t, size_t, size_t);
diff --git a/utf8.c b/utf8.c
index 661dce88..e6742611 100644
--- a/utf8.c
+++ b/utf8.c
@@ -1,4 +1,4 @@
-/* $Id: utf8.c,v 1.4 2009-01-26 20:57:45 nicm Exp $ */
+/* $Id: utf8.c,v 1.5 2009-04-30 20:54:53 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -22,226 +22,296 @@
 
 #include "tmux.h"
 
-struct {
+struct utf8_width_entry {
 	u_int	first;
 	u_int	last;
+
 	int	width;
-} utf8_width_table[] = {
-	{ 0x00300, 0x0036f, 0 },
-	{ 0x00483, 0x00486, 0 },
-	{ 0x00488, 0x00489, 0 },
-	{ 0x00591, 0x005bd, 0 },
-	{ 0x005bf, 0x005bf, 0 },
-	{ 0x005c1, 0x005c2, 0 },
-	{ 0x005c4, 0x005c5, 0 },
-	{ 0x005c7, 0x005c7, 0 },
-	{ 0x00600, 0x00603, 0 },
-	{ 0x00610, 0x00615, 0 },
-	{ 0x0064b, 0x0065e, 0 },
-	{ 0x00670, 0x00670, 0 },
-	{ 0x006d6, 0x006e4, 0 },
-	{ 0x006e7, 0x006e8, 0 },
-	{ 0x006ea, 0x006ed, 0 },
-	{ 0x0070f, 0x0070f, 0 },
-	{ 0x00711, 0x00711, 0 },
-	{ 0x00730, 0x0074a, 0 },
-	{ 0x007a6, 0x007b0, 0 },
-	{ 0x007eb, 0x007f3, 0 },
-	{ 0x00901, 0x00902, 0 },
-	{ 0x0093c, 0x0093c, 0 },
-	{ 0x00941, 0x00948, 0 },
-	{ 0x0094d, 0x0094d, 0 },
-	{ 0x00951, 0x00954, 0 },
-	{ 0x00962, 0x00963, 0 },
-	{ 0x00981, 0x00981, 0 },
-	{ 0x009bc, 0x009bc, 0 },
-	{ 0x009c1, 0x009c4, 0 },
-	{ 0x009cd, 0x009cd, 0 },
-	{ 0x009e2, 0x009e3, 0 },
-	{ 0x00a01, 0x00a02, 0 },
-	{ 0x00a3c, 0x00a3c, 0 },
-	{ 0x00a41, 0x00a42, 0 },
-	{ 0x00a47, 0x00a48, 0 },
-	{ 0x00a4b, 0x00a4d, 0 },
-	{ 0x00a70, 0x00a71, 0 },
-	{ 0x00a81, 0x00a82, 0 },
-	{ 0x00abc, 0x00abc, 0 },
-	{ 0x00ac1, 0x00ac5, 0 },
-	{ 0x00ac7, 0x00ac8, 0 },
-	{ 0x00acd, 0x00acd, 0 },
-	{ 0x00ae2, 0x00ae3, 0 },
-	{ 0x00b01, 0x00b01, 0 },
-	{ 0x00b3c, 0x00b3c, 0 },
-	{ 0x00b3f, 0x00b3f, 0 },
-	{ 0x00b41, 0x00b43, 0 },
-	{ 0x00b4d, 0x00b4d, 0 },
-	{ 0x00b56, 0x00b56, 0 },
-	{ 0x00b82, 0x00b82, 0 },
-	{ 0x00bc0, 0x00bc0, 0 },
-	{ 0x00bcd, 0x00bcd, 0 },
-	{ 0x00c3e, 0x00c40, 0 },
-	{ 0x00c46, 0x00c48, 0 },
-	{ 0x00c4a, 0x00c4d, 0 },
-	{ 0x00c55, 0x00c56, 0 },
-	{ 0x00cbc, 0x00cbc, 0 },
-	{ 0x00cbf, 0x00cbf, 0 },
-	{ 0x00cc6, 0x00cc6, 0 },
-	{ 0x00ccc, 0x00ccd, 0 },
-	{ 0x00ce2, 0x00ce3, 0 },
-	{ 0x00d41, 0x00d43, 0 },
-	{ 0x00d4d, 0x00d4d, 0 },
-	{ 0x00dca, 0x00dca, 0 },
-	{ 0x00dd2, 0x00dd4, 0 },
-	{ 0x00dd6, 0x00dd6, 0 },
-	{ 0x00e31, 0x00e31, 0 },
-	{ 0x00e34, 0x00e3a, 0 },
-	{ 0x00e47, 0x00e4e, 0 },
-	{ 0x00eb1, 0x00eb1, 0 },
-	{ 0x00eb4, 0x00eb9, 0 },
-	{ 0x00ebb, 0x00ebc, 0 },
-	{ 0x00ec8, 0x00ecd, 0 },
-	{ 0x00f18, 0x00f19, 0 },
-	{ 0x00f35, 0x00f35, 0 },
-	{ 0x00f37, 0x00f37, 0 },
-	{ 0x00f39, 0x00f39, 0 },
-	{ 0x00f71, 0x00f7e, 0 },
-	{ 0x00f80, 0x00f84, 0 },
-	{ 0x00f86, 0x00f87, 0 },
-	{ 0x00f90, 0x00f97, 0 },
-	{ 0x00f99, 0x00fbc, 0 },
-	{ 0x00fc6, 0x00fc6, 0 },
-	{ 0x0102d, 0x01030, 0 },
-	{ 0x01032, 0x01032, 0 },
-	{ 0x01036, 0x01037, 0 },
-	{ 0x01039, 0x01039, 0 },
-	{ 0x01058, 0x01059, 0 },
-	{ 0x01100, 0x0115f, 2 },
-	{ 0x01160, 0x011ff, 0 },
-	{ 0x0135f, 0x0135f, 0 },
-	{ 0x01712, 0x01714, 0 },
-	{ 0x01732, 0x01734, 0 },
-	{ 0x01752, 0x01753, 0 },
-	{ 0x01772, 0x01773, 0 },
-	{ 0x017b4, 0x017b5, 0 },
-	{ 0x017b7, 0x017bd, 0 },
-	{ 0x017c6, 0x017c6, 0 },
-	{ 0x017c9, 0x017d3, 0 },
-	{ 0x017dd, 0x017dd, 0 },
-	{ 0x0180b, 0x0180d, 0 },
-	{ 0x018a9, 0x018a9, 0 },
-	{ 0x01920, 0x01922, 0 },
-	{ 0x01927, 0x01928, 0 },
-	{ 0x01932, 0x01932, 0 },
-	{ 0x01939, 0x0193b, 0 },
-	{ 0x01a17, 0x01a18, 0 },
-	{ 0x01b00, 0x01b03, 0 },
-	{ 0x01b34, 0x01b34, 0 },
-	{ 0x01b36, 0x01b3a, 0 },
-	{ 0x01b3c, 0x01b3c, 0 },
-	{ 0x01b42, 0x01b42, 0 },
-	{ 0x01b6b, 0x01b73, 0 },
-	{ 0x01dc0, 0x01dca, 0 },
-	{ 0x01dfe, 0x01dff, 0 },
-	{ 0x0200b, 0x0200f, 0 },
-	{ 0x0202a, 0x0202e, 0 },
-	{ 0x02060, 0x02063, 0 },
-	{ 0x0206a, 0x0206f, 0 },
-	{ 0x020d0, 0x020ef, 0 },
-	{ 0x02329, 0x02329, 2 },
-	{ 0x0232a, 0x0232a, 2 },
-	{ 0x02e80, 0x03029, 2 },
-	{ 0x0302a, 0x0302f, 0 },	
-	{ 0x03030, 0x0303e, 2 },
-	{ 0x03040, 0x0a4cf, 2 },
-	{ 0x03099, 0x0309a, 0 },
-	{ 0x0a806, 0x0a806, 0 },
-	{ 0x0a80b, 0x0a80b, 0 },
-	{ 0x0a825, 0x0a826, 0 },
-	{ 0x0ac00, 0x0d7a3, 2 },
-	{ 0x0f900, 0x0faff, 2 },
-	{ 0x0fb1e, 0x0fb1e, 0 },
-	{ 0x0fe00, 0x0fe0f, 0 },
-	{ 0x0fe10, 0x0fe19, 2 },
-	{ 0x0fe20, 0x0fe23, 0 },
-	{ 0x0fe30, 0x0fe6f, 2 },
-	{ 0x0feff, 0x0feff, 0 },
-	{ 0x0ff00, 0x0ff60, 2 },
-	{ 0x0ffe0, 0x0ffe6, 2 },
-	{ 0x0fff9, 0x0fffb, 0 },
-	{ 0x10a01, 0x10a03, 0 },
-	{ 0x10a05, 0x10a06, 0 },
-	{ 0x10a0c, 0x10a0f, 0 },
-	{ 0x10a38, 0x10a3a, 0 },
-	{ 0x10a3f, 0x10a3f, 0 },
-	{ 0x1d167, 0x1d169, 0 },
-	{ 0x1d173, 0x1d182, 0 },
-	{ 0x1d185, 0x1d18b, 0 },
-	{ 0x1d1aa, 0x1d1ad, 0 },
-	{ 0x1d242, 0x1d244, 0 },
-	{ 0x20000, 0x2fffd, 2 },
-	{ 0x30000, 0x3fffd, 2 },
-	{ 0xe0001, 0xe0001, 0 },
-	{ 0xe0020, 0xe007f, 0 },
-	{ 0xe0100, 0xe01ef, 0 }
+
+	struct utf8_width_entry	*left;
+	struct utf8_width_entry	*right;
 };
 
+/* Random order. Not optimal but it'll do for now... */
+struct utf8_width_entry utf8_width_table[] = {
+	{ 0x00951, 0x00954, 0, NULL, NULL },
+	{ 0x00ccc, 0x00ccd, 0, NULL, NULL },
+	{ 0x0fff9, 0x0fffb, 0, NULL, NULL },
+	{ 0x20000, 0x2fffd, 2, NULL, NULL },
+	{ 0x00ebb, 0x00ebc, 0, NULL, NULL },
+	{ 0x01932, 0x01932, 0, NULL, NULL },
+	{ 0x0070f, 0x0070f, 0, NULL, NULL },
+	{ 0x00a70, 0x00a71, 0, NULL, NULL },
+	{ 0x02329, 0x02329, 2, NULL, NULL },
+	{ 0x00acd, 0x00acd, 0, NULL, NULL },
+	{ 0x00ac7, 0x00ac8, 0, NULL, NULL },
+	{ 0x00a3c, 0x00a3c, 0, NULL, NULL },
+	{ 0x009cd, 0x009cd, 0, NULL, NULL },
+	{ 0x00591, 0x005bd, 0, NULL, NULL },
+	{ 0x01058, 0x01059, 0, NULL, NULL },
+	{ 0x0ffe0, 0x0ffe6, 2, NULL, NULL },
+	{ 0x01100, 0x0115f, 2, NULL, NULL },
+	{ 0x0fe20, 0x0fe23, 0, NULL, NULL },
+	{ 0x0302a, 0x0302f, 0, NULL, NULL },
+	{ 0x01772, 0x01773, 0, NULL, NULL },
+	{ 0x005bf, 0x005bf, 0, NULL, NULL },
+	{ 0x006ea, 0x006ed, 0, NULL, NULL },
+	{ 0x00bc0, 0x00bc0, 0, NULL, NULL },
+	{ 0x00962, 0x00963, 0, NULL, NULL },
+	{ 0x01732, 0x01734, 0, NULL, NULL },
+	{ 0x00d41, 0x00d43, 0, NULL, NULL },
+	{ 0x01b42, 0x01b42, 0, NULL, NULL },
+	{ 0x00a41, 0x00a42, 0, NULL, NULL },
+	{ 0x00eb4, 0x00eb9, 0, NULL, NULL },
+	{ 0x00b01, 0x00b01, 0, NULL, NULL },
+	{ 0x00e34, 0x00e3a, 0, NULL, NULL },
+	{ 0x03040, 0x03098, 2, NULL, NULL },
+	{ 0x0093c, 0x0093c, 0, NULL, NULL },
+	{ 0x00c4a, 0x00c4d, 0, NULL, NULL },
+	{ 0x01032, 0x01032, 0, NULL, NULL },
+	{ 0x00f37, 0x00f37, 0, NULL, NULL },
+	{ 0x00901, 0x00902, 0, NULL, NULL },
+	{ 0x00cbf, 0x00cbf, 0, NULL, NULL },
+	{ 0x0a806, 0x0a806, 0, NULL, NULL },
+	{ 0x00dd2, 0x00dd4, 0, NULL, NULL },
+	{ 0x00f71, 0x00f7e, 0, NULL, NULL },
+	{ 0x01752, 0x01753, 0, NULL, NULL },
+	{ 0x1d242, 0x1d244, 0, NULL, NULL },
+	{ 0x005c1, 0x005c2, 0, NULL, NULL },
+	{ 0x0309b, 0x0a4cf, 2, NULL, NULL },
+	{ 0xe0100, 0xe01ef, 0, NULL, NULL },
+	{ 0x017dd, 0x017dd, 0, NULL, NULL },
+	{ 0x00600, 0x00603, 0, NULL, NULL },
+	{ 0x009e2, 0x009e3, 0, NULL, NULL },
+	{ 0x00cc6, 0x00cc6, 0, NULL, NULL },
+	{ 0x0a80b, 0x0a80b, 0, NULL, NULL },
+	{ 0x01712, 0x01714, 0, NULL, NULL },
+	{ 0x00b3c, 0x00b3c, 0, NULL, NULL },
+	{ 0x01b00, 0x01b03, 0, NULL, NULL },
+	{ 0x007eb, 0x007f3, 0, NULL, NULL },
+	{ 0xe0001, 0xe0001, 0, NULL, NULL },
+	{ 0x1d185, 0x1d18b, 0, NULL, NULL },
+	{ 0x0feff, 0x0feff, 0, NULL, NULL },
+	{ 0x01b36, 0x01b3a, 0, NULL, NULL },
+	{ 0x01920, 0x01922, 0, NULL, NULL },
+	{ 0x00670, 0x00670, 0, NULL, NULL },
+	{ 0x00f90, 0x00f97, 0, NULL, NULL },
+	{ 0x01927, 0x01928, 0, NULL, NULL },
+	{ 0x0200b, 0x0200f, 0, NULL, NULL },
+	{ 0x0ff00, 0x0ff60, 2, NULL, NULL },
+	{ 0x0f900, 0x0faff, 2, NULL, NULL },
+	{ 0x0fb1e, 0x0fb1e, 0, NULL, NULL },
+	{ 0x00cbc, 0x00cbc, 0, NULL, NULL },
+	{ 0x00eb1, 0x00eb1, 0, NULL, NULL },
+	{ 0x10a38, 0x10a3a, 0, NULL, NULL },
+	{ 0x007a6, 0x007b0, 0, NULL, NULL },
+	{ 0x00f80, 0x00f84, 0, NULL, NULL },
+	{ 0x005c4, 0x005c5, 0, NULL, NULL },
+	{ 0x0ac00, 0x0d7a3, 2, NULL, NULL },
+	{ 0x017c9, 0x017d3, 0, NULL, NULL },
+	{ 0x00d4d, 0x00d4d, 0, NULL, NULL },
+	{ 0x1d167, 0x1d169, 0, NULL, NULL },
+	{ 0x01036, 0x01037, 0, NULL, NULL },
+	{ 0xe0020, 0xe007f, 0, NULL, NULL },
+	{ 0x00f35, 0x00f35, 0, NULL, NULL },
+	{ 0x017b4, 0x017b5, 0, NULL, NULL },
+	{ 0x0206a, 0x0206f, 0, NULL, NULL },
+	{ 0x00c46, 0x00c48, 0, NULL, NULL },
+	{ 0x01939, 0x0193b, 0, NULL, NULL },
+	{ 0x01dc0, 0x01dca, 0, NULL, NULL },
+	{ 0x10a0c, 0x10a0f, 0, NULL, NULL },
+	{ 0x0102d, 0x01030, 0, NULL, NULL },
+	{ 0x017c6, 0x017c6, 0, NULL, NULL },
+	{ 0x00ec8, 0x00ecd, 0, NULL, NULL },
+	{ 0x00b41, 0x00b43, 0, NULL, NULL },
+	{ 0x017b7, 0x017bd, 0, NULL, NULL },
+	{ 0x1d173, 0x1d182, 0, NULL, NULL },
+	{ 0x00a47, 0x00a48, 0, NULL, NULL },
+	{ 0x0232a, 0x0232a, 2, NULL, NULL },
+	{ 0x01b3c, 0x01b3c, 0, NULL, NULL },
+	{ 0x10a01, 0x10a03, 0, NULL, NULL },
+	{ 0x00ae2, 0x00ae3, 0, NULL, NULL },
+	{ 0x00483, 0x00486, 0, NULL, NULL },
+	{ 0x0135f, 0x0135f, 0, NULL, NULL },
+	{ 0x01a17, 0x01a18, 0, NULL, NULL },
+	{ 0x006e7, 0x006e8, 0, NULL, NULL },
+	{ 0x03099, 0x0309a, 0, NULL, NULL },
+	{ 0x00b4d, 0x00b4d, 0, NULL, NULL },
+	{ 0x00ce2, 0x00ce3, 0, NULL, NULL },
+	{ 0x00bcd, 0x00bcd, 0, NULL, NULL },
+	{ 0x00610, 0x00615, 0, NULL, NULL },
+	{ 0x00f99, 0x00fbc, 0, NULL, NULL },
+	{ 0x009c1, 0x009c4, 0, NULL, NULL },
+	{ 0x00730, 0x0074a, 0, NULL, NULL },
+	{ 0x00300, 0x0036f, 0, NULL, NULL },
+	{ 0x03030, 0x0303e, 2, NULL, NULL },
+	{ 0x01b34, 0x01b34, 0, NULL, NULL },
+	{ 0x1d1aa, 0x1d1ad, 0, NULL, NULL },
+	{ 0x00dca, 0x00dca, 0, NULL, NULL },
+	{ 0x006d6, 0x006e4, 0, NULL, NULL },
+	{ 0x00f86, 0x00f87, 0, NULL, NULL },
+	{ 0x00b3f, 0x00b3f, 0, NULL, NULL },
+	{ 0x0fe30, 0x0fe6f, 2, NULL, NULL },
+	{ 0x01039, 0x01039, 0, NULL, NULL },
+	{ 0x0094d, 0x0094d, 0, NULL, NULL },
+	{ 0x00c55, 0x00c56, 0, NULL, NULL },
+	{ 0x00488, 0x00489, 0, NULL, NULL },
+	{ 0x00e47, 0x00e4e, 0, NULL, NULL },
+	{ 0x00a81, 0x00a82, 0, NULL, NULL },
+	{ 0x00ac1, 0x00ac5, 0, NULL, NULL },
+	{ 0x0202a, 0x0202e, 0, NULL, NULL },
+	{ 0x00dd6, 0x00dd6, 0, NULL, NULL },
+	{ 0x018a9, 0x018a9, 0, NULL, NULL },
+	{ 0x0064b, 0x0065e, 0, NULL, NULL },
+	{ 0x00abc, 0x00abc, 0, NULL, NULL },
+	{ 0x00b82, 0x00b82, 0, NULL, NULL },
+	{ 0x00f39, 0x00f39, 0, NULL, NULL },
+	{ 0x020d0, 0x020ef, 0, NULL, NULL },
+	{ 0x01dfe, 0x01dff, 0, NULL, NULL },
+	{ 0x30000, 0x3fffd, 2, NULL, NULL },
+	{ 0x00711, 0x00711, 0, NULL, NULL },
+	{ 0x0fe00, 0x0fe0f, 0, NULL, NULL },
+	{ 0x01160, 0x011ff, 0, NULL, NULL },
+	{ 0x0180b, 0x0180d, 0, NULL, NULL },
+	{ 0x10a3f, 0x10a3f, 0, NULL, NULL },
+	{ 0x00981, 0x00981, 0, NULL, NULL },
+	{ 0x0a825, 0x0a826, 0, NULL, NULL },
+	{ 0x00941, 0x00948, 0, NULL, NULL },
+	{ 0x01b6b, 0x01b73, 0, NULL, NULL },
+	{ 0x00e31, 0x00e31, 0, NULL, NULL },
+	{ 0x0fe10, 0x0fe19, 2, NULL, NULL },
+	{ 0x00a01, 0x00a02, 0, NULL, NULL },
+	{ 0x00a4b, 0x00a4d, 0, NULL, NULL },
+	{ 0x00f18, 0x00f19, 0, NULL, NULL },
+	{ 0x00fc6, 0x00fc6, 0, NULL, NULL },
+	{ 0x02e80, 0x03029, 2, NULL, NULL },
+	{ 0x00b56, 0x00b56, 0, NULL, NULL },
+	{ 0x009bc, 0x009bc, 0, NULL, NULL },
+	{ 0x005c7, 0x005c7, 0, NULL, NULL },
+	{ 0x02060, 0x02063, 0, NULL, NULL },
+	{ 0x00c3e, 0x00c40, 0, NULL, NULL },
+	{ 0x10a05, 0x10a06, 0, NULL, NULL },
+};
+
+struct utf8_width_entry	*utf8_width_root = NULL;
+
+int	utf8_overlap(struct utf8_width_entry *, struct utf8_width_entry *);
+void	utf8_print(struct utf8_width_entry *, int);
+u_int	utf8_combine(const u_char *);
+void	utf8_split(u_int, u_char *);
+
+int
+utf8_overlap(
+    struct utf8_width_entry *item1, struct utf8_width_entry *item2)
+{
+	if (item1->first >= item2->first && item1->first <= item2->last)
+		return (1);
+	if (item1->last >= item2->first && item1->last <= item2->last)
+		return (1);
+	if (item2->first >= item1->first && item2->first <= item1->last)
+		return (1);
+	if (item2->last >= item1->first && item2->last <= item1->last)
+		return (1);
+	return (0);
+}
+
+void
+utf8_build(void)
+{
+	struct utf8_width_entry	**ptr, *item, *node;
+	u_int			  i, j;
+
+	for (i = 0; i < nitems(utf8_width_table); i++) {
+		item = &utf8_width_table[i];
+
+		for (j = 0; j < nitems(utf8_width_table); j++) {
+			if (i != j && utf8_overlap(item, &utf8_width_table[j]))
+				log_fatalx("utf8 overlap: %u %u", i, j);
+		}
+
+		ptr = &utf8_width_root;
+		while (*ptr != NULL) {
+			node = *ptr;			
+			if (item->last < node->first)
+				ptr = &(node->left);
+			else if (item->first > node->last)
+				ptr = &(node->right);
+		}
+		*ptr = item;
+	}
+}
+
+void
+utf8_print(struct utf8_width_entry *node, int n)
+{
+	log_debug("%*s%04x -> %04x", n, " ",  node->first, node->last);
+	if (node->left != NULL)
+		utf8_print(node->left, n + 1);
+	if (node->right != NULL)
+		utf8_print(node->right, n + 1);
+}
+
 u_int
 utf8_combine(const u_char *data)
 {
-	u_int	uv;
+	u_int	uvalue;
 
 	if (data[1] == 0xff)
-		uv = data[0];
+		uvalue = data[0];
 	else if (data[2] == 0xff) {
-		uv = data[1] & 0x3f;
-		uv |= (data[0] & 0x1f) << 6;
+		uvalue = data[1] & 0x3f;
+		uvalue |= (data[0] & 0x1f) << 6;
 	} else if (data[3] == 0xff) {
-		uv = data[2] & 0x3f;
-		uv |= (data[1] & 0x3f) << 6;
-		uv |= (data[0] & 0x0f) << 12;
+		uvalue = data[2] & 0x3f;
+		uvalue |= (data[1] & 0x3f) << 6;
+		uvalue |= (data[0] & 0x0f) << 12;
 	} else {
-		uv = data[3] & 0x3f;
-		uv |= (data[2] & 0x3f) << 6;
-		uv |= (data[1] & 0x3f) << 12;
-		uv |= (data[0] & 0x3f) << 18;
+		uvalue = data[3] & 0x3f;
+		uvalue |= (data[2] & 0x3f) << 6;
+		uvalue |= (data[1] & 0x3f) << 12;
+		uvalue |= (data[0] & 0x3f) << 18;
 	}
-	return (uv);
+	return (uvalue);
 }
 
 void
-utf8_split(u_int uv, u_char *data)
+utf8_split(u_int uvalue, u_char *data)
 {
 	memset(data, 0xff, 4);
 
-	if (uv <= 0x7f)
-		data[0] = uv;
-	else if (uv > 0x7f && uv <= 0x7ff) {
-		data[0] = (uv >> 6) | 0xc0;
-		data[1] = (uv & 0x3f) | 0x80;
-	} else if (uv > 0x7ff && uv <= 0xffff) {
-		data[0] = (uv >> 12) | 0xe0;
-		data[1] = ((uv >> 6) & 0x3f) | 0x80;
-		data[2] = (uv & 0x3f) | 0x80;
-	} else if (uv > 0xffff && uv <= 0x10ffff) {
-		data[0] = (uv >> 18) | 0xf0;
-		data[1] = ((uv >> 12) & 0x3f) | 0x80;
-		data[2] = ((uv >> 6) & 0x3f) | 0x80;
-		data[3] = (uv & 0x3f) | 0x80;
+	if (uvalue <= 0x7f)
+		data[0] = uvalue;
+	else if (uvalue > 0x7f && uvalue <= 0x7ff) {
+		data[0] = (uvalue >> 6) | 0xc0;
+		data[1] = (uvalue & 0x3f) | 0x80;
+	} else if (uvalue > 0x7ff && uvalue <= 0xffff) {
+		data[0] = (uvalue >> 12) | 0xe0;
+		data[1] = ((uvalue >> 6) & 0x3f) | 0x80;
+		data[2] = (uvalue & 0x3f) | 0x80;
+	} else if (uvalue > 0xffff && uvalue <= 0x10ffff) {
+		data[0] = (uvalue >> 18) | 0xf0;
+		data[1] = ((uvalue >> 12) & 0x3f) | 0x80;
+		data[2] = ((uvalue >> 6) & 0x3f) | 0x80;
+		data[3] = (uvalue & 0x3f) | 0x80;
 	}
 }
 
 int
-utf8_width(u_int uv)
+utf8_width(u_char *udata)
 {
-	u_int	i;
+	struct utf8_width_entry	*item;
+	u_int			 uvalue;
 
-	for (i = 0; i < nitems(utf8_width_table); i++) {
-		/* XXX bsearch */
-		if (uv < utf8_width_table[i].first)
-			continue;
-		if (uv > utf8_width_table[i].last)
-		        continue;
-		return (utf8_width_table[i].width);
+	uvalue = utf8_combine(udata);
+
+	item = utf8_width_root;
+	while (item != NULL) {
+		if (uvalue < item->first)
+			item = item->left;
+		else if (uvalue > item->last)
+			item = item->right;
+		else
+			return (item->width);
 	}
 	return (1);
 }