ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tweaks: rename a variable, drop a false assert, and reshuffle a bit

master
Benno Schulenberg 2017-02-24 15:03:02 +01:00
parent 6e9d6a08b9
commit 0378146add
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/winio.c
View File

@ -3100,16 +3100,17 @@ void disable_nodelay(void)
* expect word to have tabs and control characters expanded. */
void spotlight(bool active, const char *word)
{
size_t word_len = strlenpt(word), room = word_len;
size_t word_span = strlenpt(word);
size_t room = word_span;
/* Compute the number of columns that are available for the word. */
if (!ISSET(SOFTWRAP))
if (!ISSET(SOFTWRAP)) {
room = editwincols + get_page_start(xplustabs()) - xplustabs();
assert(room > 0);
if (word_len > room)
room--;
/* If the word is partially offscreen, reserve space for the "$". */
if (word_span > room)
room--;
}
reset_cursor();
@ -3117,12 +3118,12 @@ void spotlight(bool active, const char *word)
wattron(edit, hilite_attribute);
/* This is so we can show zero-length matches. */
if (word_len == 0)
if (word_span == 0)
waddch(edit, ' ');
else
waddnstr(edit, word, actual_x(word, room));
if (word_len > room)
if (word_span > room)
waddch(edit, '$');
if (active)