arnekeller/tmux-thumbs
1
0
Fork 0
mirror of https://github.com/FliegendeWurst/tmux-thumbs.git synced 2024-11-09 16:00:35 +00:00
Code Issues Projects Releases Wiki Activity

Fix offsets with long utf sequences

Browse Source
This commit is contained in:
Ferran Basora 2019-03-02 23:41:05 +00:00
parent 12759fa098
commit 6924612e24
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main.rs
View File

@ -84,7 +84,7 @@ fn main() {
let output = String::from_utf8_lossy(&execution.stdout);
let lines = output.split("\n").collect::<Vec<&str>>();
let mut state = state::State::new(lines, alphabet);
let mut state = state::State::new(&lines, alphabet);
let mut paste = false;
{
@ -125,15 +125,10 @@ fn main() {
foreground_color
};
// TODO: Find long utf sequences and extract it from mat.x
// let re = regex::bytes::Regex::new(r"127").unwrap();
// let line = lines[mat.y as usize];
// let extra = re
// .find_iter(line.as_bytes())
// .fold(0, |sum, item| sum + item.as_bytes().len());
let extra = 0;
// Find long utf sequences and extract it from mat.x
let line = &lines[mat.y as usize];
let prefix = &line[0..mat.x as usize];
let extra = prefix.len() - prefix.chars().count();
let offset = (mat.x as usize) - extra;
rustbox.print(offset, mat.y as usize, rustbox::RB_NORMAL, selected_color, background_color, mat.text);

4
src/state.rs
View File

@ -29,13 +29,13 @@ impl<'a> PartialEq for Match<'a> {
}
pub struct State<'a> {
pub lines: Vec<&'a str>,
pub lines: &'a Vec<&'a str>,
alphabet: &'a str,
pub skip: usize,
}
impl<'a> State<'a> {
pub fn new(lines: Vec<&'a str>, alphabet: &'a str) -> State<'a> {
pub fn new(lines: &'a Vec<&'a str>, alphabet: &'a str) -> State<'a> {
State{
lines: lines,
alphabet: alphabet,