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

tweaks: rename two variables, for contrast, and frob some comments

master
Benno Schulenberg 2017-09-26 20:54:04 +02:00
parent 762f997244
commit f2f7498f12
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/winio.c
View File

@ -3006,16 +3006,16 @@ size_t get_softwrap_breakpoint(const char *text, size_t leftedge,
{ {
size_t column = 0; size_t column = 0;
/* Current column position in text. */ /* Current column position in text. */
size_t prev_column = 0; size_t previous_col = 0;
/* Previous column position in text. */ /* Previous column position in text. */
size_t goal_column; size_t goal_column;
/* Column of the last character where we can break the text. */ /* The place at or before which text must be broken. */
size_t lastblank_column = 0; size_t last_blank_col = 0;
/* Current column position of the last blank in text. */ /* The column position of the last seen whitespace character. */
const char *farthest_blank = NULL; const char *farthest_blank = NULL;
/* A pointer to the last seen whitespace character in text. */ /* A pointer to the last seen whitespace character in text. */
int char_len = 0; int char_len = 0;
/* Length of current character, in bytes. */ /* Length of the current character, in bytes. */
while (*text != '\0' && column < leftedge) { while (*text != '\0' && column < leftedge) {
char_len = parse_mbchar(text, NULL, &column); char_len = parse_mbchar(text, NULL, &column);
@ -3029,39 +3029,38 @@ size_t get_softwrap_breakpoint(const char *text, size_t leftedge,
/* When breaking at blanks, do it *before* the target column. */ /* When breaking at blanks, do it *before* the target column. */
if (ISSET(AT_BLANKS) && is_blank_mbchar(text) && column < goal_column) { if (ISSET(AT_BLANKS) && is_blank_mbchar(text) && column < goal_column) {
farthest_blank = text; farthest_blank = text;
lastblank_column = column; last_blank_col = column;
} }
prev_column = column; previous_col = column;
char_len = parse_mbchar(text, NULL, &column); char_len = parse_mbchar(text, NULL, &column);
text += char_len; text += char_len;
} }
/* If we didn't overshoot the target, we've found a breaking point. */ /* If we didn't overshoot the limit, we've found a breaking point;
* and we've reached EOL if we didn't even *reach* the limit. */
if (column <= goal_column) { if (column <= goal_column) {
/* We've reached EOL if we didn't even reach the target. */
*end_of_line = (column < goal_column); *end_of_line = (column < goal_column);
return column; return column;
} }
/* If we're softwrapping at blanks and we found at least one blank, move /* If we're softwrapping at blanks and we found at least one blank, break
* the pointer back to the last blank, step beyond it, and we're done. */ * after that blank -- if it doesn't overshoot the screen's edge. */
if (farthest_blank != NULL) { if (farthest_blank != NULL) {
char_len = parse_mbchar(farthest_blank, NULL, &lastblank_column); char_len = parse_mbchar(farthest_blank, NULL, &last_blank_col);
text = farthest_blank + char_len; text = farthest_blank + char_len;
/* If we haven't overshot the screen's edge, break after the blank. */ if (last_blank_col <= goal_column)
if (lastblank_column <= goal_column) return last_blank_col;
return lastblank_column;
} }
/* If a tab is split over two chunks, break at the screen's edge. */ /* If a tab is split over two chunks, break at the screen's edge. */
if (*(text - char_len) == '\t') if (*(text - char_len) == '\t')
prev_column = goal_column; previous_col = goal_column;
/* Otherwise, return the column of the last character that doesn't /* Otherwise, return the column of the last character that doesn't
* overshoot the target, since we can't break the text anywhere else. */ * overshoot the limit, since we can't break the text anywhere else. */
return (editwincols > 1) ? prev_column : column - 1; return (editwincols > 1) ? previous_col : column - 1;
} }
/* Get the row of the softwrapped chunk of the given line that column is on, /* Get the row of the softwrapped chunk of the given line that column is on,