nano

commit 43b42246d3d795acb6b4dbbaa87f38b5feae91d6
parent 40a74e46e61747ad905bf2bbcb538b62526f0a37
Author: David Lawrence Ramsey <pooka109@gmail.com>
Date:   Mon, 11 Feb 2019 17:16:00 -0600

display: properly handle double-width characters when spotlighting

When the right half of a two-column character gets overwritten by the
">" continuation character, then represent its left half as "[" also
when spotlighting a replacement candidate.  Achieve this by calling
display_string() in the overshooting case with 'isprompt' set to TRUE,
which also makes this function reserve space for the ">" continuation
character so spotlight() doesn't need to do this any more.

This fixes https://savannah.gnu.org/bugs/?55679.

Improved-by: Benno Schulenberg <bensberg@telfort.nl>

Diffstat:
M
src/winio.c
 | 
28
++++++++++++++--------------

1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/winio.c b/src/winio.c
@@ -3429,8 +3429,9 @@ void enable_waiting(void)
 /* Highlight the text between from_col and to_col. */
 void spotlight(size_t from_col, size_t to_col)
 {
+	size_t right_edge;
+	bool overshoots = FALSE;
 	char *word;
-	size_t word_span, room;
 
 	place_the_cursor();
 
@@ -3441,29 +3442,28 @@ void spotlight(size_t from_col, size_t to_col)
 	}
 #endif
 
+	right_edge = get_page_start(from_col) + editwincols;
+
+	/* Limit the end column to the edge of the screen. */
+	if (to_col > right_edge) {
+		to_col = right_edge;
+		overshoots = TRUE;
+	}
+
 	/* This is so we can show zero-length matches. */
 	if (to_col == from_col) {
 		word = mallocstrcpy(NULL, " ");
 		to_col++;
 	} else
 		word = display_string(openfile->current->data, from_col,
-								to_col - from_col, FALSE, FALSE);
-
-	word_span = strlenpt(word);
-
-	/* Compute the number of columns that are available for the word. */
-	room = editwincols + get_page_start(from_col) - from_col;
-
-	/* If the word is partially offscreen, reserve space for the ">". */
-	if (word_span > room)
-		room--;
+								to_col - from_col, FALSE, overshoots);
 
 	wattron(edit, interface_color_pair[SELECTED_TEXT]);
 
-	waddnstr(edit, word, actual_x(word, room));
+	waddnstr(edit, word, actual_x(word, to_col));
 
-	if (word_span > room)
-		waddch(edit, '>');
+	if (overshoots)
+		mvwaddch(edit, openfile->current_y, COLS - 1, '>');
 
 	wattroff(edit, interface_color_pair[SELECTED_TEXT]);