From b1560edb854d0e0d1f0c37f176f6bce6571d00a5 Mon Sep 17 00:00:00 2001
From: Ben S <ogham@bsago.me>
Date: Mon, 21 Jul 2014 22:05:39 +0100
Subject: [PATCH] Use string width, rather than length, to calculate column
 size

---
 src/exa.rs | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/exa.rs b/src/exa.rs
index c36d7d4..b388b8e 100644
--- a/src/exa.rs
+++ b/src/exa.rs
@@ -3,6 +3,10 @@ extern crate regex;
 #[phase(plugin)] extern crate regex_macros;
 extern crate ansi_term;
 
+extern crate unicode;
+use std::char::UnicodeChar;
+use std::iter::AdditiveIterator;
+
 use std::os;
 
 use file::File;
@@ -62,11 +66,19 @@ fn exa(opts: &Options) {
     }
 }
 
+fn width(string: &str) -> uint {
+    string.as_slice().chars()
+        .map(|c| c.width(true))
+        .filter(|o| o.is_some())
+        .map(|o| o.unwrap())
+        .sum()
+}
+
 fn grid_view(options: &Options, across: bool, dir: Dir) {
     let unsorted_files = dir.files();
     let files: Vec<&File> = options.transform_files(&unsorted_files);
     
-    let max_column_length = files.iter().map(|f| f.name.len()).max().unwrap();
+    let max_column_length = files.iter().map(|f| width(f.name.as_slice())).max().unwrap();
     let console_width = 80;
     let num_columns = (console_width + 1) / (max_column_length + 1);
     let count = files.len();