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

tweaks: stop converting text once we overshoot span columns 

Since we only need span columns of the string, stop scanning the string
as soon as we have that many columns, instead of scanning the string all
the way to the end.  This speeds up the conversion of very long lines.
master
David Lawrence Ramsey 2017-02-24 14:44:58 -06:00 committed by Benno Schulenberg
parent a80ade38d7
commit 0404474ec2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/winio.c
View File

@ -1807,9 +1807,11 @@ char *display_string(const char *buf, size_t start_col, size_t span,
/* The string we return. */
size_t index;
/* Current position in converted. */
size_t beyond = start_col + span;
/* The column number just beyond the last shown character. */
/* If this is data, make room for the "$" at the end of the line. */
if (isdata && !ISSET(SOFTWRAP) && strlenpt(buf) > start_col + span)
if (isdata && !ISSET(SOFTWRAP) && strlenpt(buf) > beyond)
span--;
if (span == 0)
@ -1855,7 +1857,7 @@ char *display_string(const char *buf, size_t start_col, size_t span,
#endif
}
while (*buf != '\0') {
while (*buf != '\0' && start_col < beyond) {
int charlength, charwidth = 1;
if (*buf == ' ') {