From d57e594737a617f7ad2c7c2f7bd89b01f360fd53 Mon Sep 17 00:00:00 2001
From: nilninull <nilninull@gmail.com>
Date: Mon, 7 Sep 2020 02:00:15 +0900
Subject: [PATCH] Added support for wide characters such as cjk and emoji

---
 Cargo.lock  | 1 +
 Cargo.toml  | 1 +
 src/view.rs | 8 +++++---
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 32978c4..3c991d4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -147,6 +147,7 @@ dependencies = [
  "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex 1.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "termion 1.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 337e4d3..e3d3a9b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,6 +13,7 @@ termion = "1.5"
 regex = "1.3.1"
 clap = "2.33.0"
 base64 = "0.11.0"
+unicode-width = "0.1.7"
 
 [[bin]]
 name = "thumbs"
diff --git a/src/view.rs b/src/view.rs
index e7cffc5..ee6666f 100644
--- a/src/view.rs
+++ b/src/view.rs
@@ -8,6 +8,8 @@ use termion::raw::IntoRawMode;
 use termion::screen::AlternateScreen;
 use termion::{color, cursor};
 
+use unicode_width::UnicodeWidthStr;
+
 pub struct View<'a> {
   state: &'a mut state::State<'a>,
   skip: usize,
@@ -110,7 +112,7 @@ impl<'a> View<'a> {
       // Find long utf sequences and extract it from mat.x
       let line = &self.state.lines[mat.y as usize];
       let prefix = &line[0..mat.x as usize];
-      let extra = prefix.len() - prefix.chars().count();
+      let extra = prefix.width_cjk() - prefix.chars().count();
       let offset = (mat.x as u16) - (extra as u16);
       let text = self.make_hint_text(mat.text);
 
@@ -126,9 +128,9 @@ impl<'a> View<'a> {
 
       if let Some(ref hint) = mat.hint {
         let extra_position = match self.position {
-          "right" => text.len() - hint.len(),
+          "right" => text.width_cjk() - hint.len(),
           "off_left" => 0 - hint.len(),
-          "off_right" => text.len(),
+          "off_right" => text.width_cjk(),
           _ => 0,
         };