fix more issues in vertical cursor moves, use utf8_str_visible_length() instead of runes().len

Author: mike-ward

render.v

@@ -356,7 +356,6 @@ fn render_text(mut shape Shape, clip DrawClip, mut window Window) {
 		}
 		y += lh
 		char_count += len
-		unsafe { lnr.free() }
 	}
 
 	render_cursor(shape, clip, mut window)

view_input.v

@@ -403,13 +403,13 @@ pub fn (cfg &InputCfg) copy(w &Window) ?string {
 	input_state := w.view_state.input_state[cfg.id_focus]
 	if input_state.select_beg != input_state.select_end {
 		beg, end := u32_sort(input_state.select_beg, input_state.select_end)
-		len := cfg.text.runes().len
+		len := utf8_str_visible_length(cfg.text)
 		if beg >= len || end > len {
 			log.error('beg or end out of range (copy)')
 			return none
 		}
 		rune_text := cfg.text.runes()
-		if beg < 0 || end >= rune_text.len {
+		if beg < 0 || end >= len {
 			return none
 		}
 		cpy := rune_text[beg..end]

view_text.v

@@ -214,7 +214,7 @@ fn scroll_cursor_into_view(cursor_pos int, layout &Layout, _ &Event, mut w Windo
 	mut total_len := 0
 	for i, line in layout.shape.text_lines {
 		line_idx = i
-		total_len += line.runes().len
+		total_len += utf8_str_visible_length(line)
 		if total_len > cursor_pos {
 			break
 		}
@@ -326,11 +326,11 @@ fn (tv &TextView) on_key_down(layout &Layout, mut e Event, mut w Window) {
 			// Standard navigation: char by char, prev/next line, home/end of text
 			match e.key_code {
 				.left { new_cursor_pos = int_max(0, new_cursor_pos - 1) }
-				.right { new_cursor_pos = int_min(tv.text.runes().len, new_cursor_pos + 1) }
+				.right { new_cursor_pos = int_min(count_chars(text_lines), new_cursor_pos + 1) }
 				.up { new_cursor_pos = cursor_up(text_lines, new_cursor_pos) }
 				.down { new_cursor_pos = cursor_down(text_lines, new_cursor_pos) }
 				.home { new_cursor_pos = 0 }
-				.end { new_cursor_pos = tv.text.runes().len }
+				.end { new_cursor_pos = utf8_str_visible_length(tv.text) }
 				else { return }
 			}
 		} else if e.modifiers == Modifier.super {
@@ -492,7 +492,7 @@ pub fn (tv &TextView) select_all(shape &Shape, mut w Window) {
 		return
 	}
 	input_state := w.view_state.input_state[tv.id_focus]
-	len := tv.text.runes().len
+	len := utf8_str_visible_length(tv.text)
 	w.view_state.input_state[tv.id_focus] = InputState{
 		...input_state
 		cursor_pos: len

xtra_text.v

@@ -476,17 +476,14 @@ fn end_of_word_pos(strs []string, pos int) int {
 // start_of_line_pos finds start of line position in wrapped text starting from pos
 fn start_of_line_pos(strs []string, pos int) int {
 	mut len := 0
-
 	for str in strs {
-		runes := str.runes()
-		if pos > len + runes.len {
-			len += runes.len
+		str_len := utf8_str_visible_length(str)
+		if pos > len + str_len {
+			len += str_len
 			continue
 		}
-
 		return len
 	}
-
 	return len
 }
 
@@ -497,15 +494,15 @@ fn end_of_line_pos(strs []string, pos int) int {
 
 	for str in strs {
 		cnt += 1
-		runes := str.runes()
-		if pos >= len + runes.len - 1 {
-			len += runes.len
+		str_len := utf8_str_visible_length(str)
+		if pos >= len + str_len - 1 {
+			len += str_len
 			continue
 		}
 
 		is_last_line := cnt == strs.len
 		eol := if is_last_line { 0 } else { 1 }
-		return int_max(0, len + runes.len - eol)
+		return int_max(0, len + str_len - eol)
 	}
 
 	return len
@@ -553,26 +550,26 @@ fn start_of_paragraph(strs []string, pos int) int {
 fn cursor_up(strs []string, pos int) int {
 	mut idx := 0
 	mut offset := 0
-	runes := strs.map(it.runes())
+	lengths := strs.map(utf8_str_visible_length(it))
 
 	// find which line to from
-	for i, r in runes {
-		if offset + r.len > pos {
+	for i, len in lengths {
+		idx = i
+		if offset + len > pos {
 			break
 		}
-		idx = i
-		offset += r.len
+		offset += len
 	}
 
 	// move to previous line
 	if idx > 0 {
 		col := pos - offset
 		p_idx := idx - 1
-		p_len := runes[p_idx].len
+		p_len := lengths[p_idx]
 		mut p_start := 0
-		for i, r in runes {
-			if i <= p_idx {
-				p_start += r.len
+		for i, len in lengths {
+			if i < p_idx {
+				p_start += len
 			}
 		}
 		return if col >= p_len { p_start + p_len - 1 } else { p_start + col }
@@ -583,29 +580,29 @@ fn cursor_up(strs []string, pos int) int {
 fn cursor_down(strs []string, pos int) int {
 	mut idx := 0
 	mut offset := 0
-	runes := strs.map(it.runes())
+	lengths := strs.map(utf8_str_visible_length(it))
 
 	// find which line to from
-	for i, r in runes {
-		if offset + r.len > pos {
+	for i, len in lengths {
+		idx = i
+		if offset + len > pos {
 			break
 		}
-		idx = i
-		offset += r.len
+		offset += len
 	}
 
 	// move to next line
-	if idx < runes.len - 2 {
+	if idx < strs.len - 1 {
 		col := pos - offset
 		n_idx := idx + 1
-		n_len := runes[n_idx].len
+		n_len := lengths[n_idx]
 		mut n_start := 0
-		for i, r in runes {
-			if i <= n_idx {
-				n_start += r.len
+		for i, len in lengths {
+			if i < n_idx {
+				n_start += len
 			}
 		}
-		return if col >= n_len { n_start + n_len } else { n_start + col }
+		return if col >= n_len { n_start + n_len - 1 } else { n_start + col }
 	}
 	return pos
 }
@@ -624,3 +621,11 @@ pub fn to_clipboard(s ?string) bool {
 	}
 	return false
 }
+
+fn count_chars(strs []string) int {
+	mut count := 0
+	for str in strs {
+		count += utf8_str_visible_length(str)
+	}
+	return count
+}