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

tweaks: rewrap and reindent a few lines

master
Benno Schulenberg 2021-01-29 10:52:40 +01:00
parent dc745c0b77
commit 36855544d1
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/winio.c
View File

@ -2664,9 +2664,8 @@ void draw_row(int row, const char *converted, linestruct *line, size_t from_col)
* looking only after an end match, if there is one. */ * looking only after an end match, if there is one. */
index = (paintlen == 0) ? 0 : endmatch.rm_eo; index = (paintlen == 0) ? 0 : endmatch.rm_eo;
while (regexec(varnish->start, line->data + index, while (regexec(varnish->start, line->data + index, 1, &startmatch,
1, &startmatch, (index == 0) ? (index == 0) ? 0 : REG_NOTBOL) == 0) {
0 : REG_NOTBOL) == 0) {
/* Make the match relative to the beginning of the line. */ /* Make the match relative to the beginning of the line. */
startmatch.rm_so += index; startmatch.rm_so += index;
startmatch.rm_eo += index; startmatch.rm_eo += index;
@ -2676,22 +2675,19 @@ void draw_row(int row, const char *converted, linestruct *line, size_t from_col)
thetext = converted + actual_x(converted, start_col); thetext = converted + actual_x(converted, start_col);
if (regexec(varnish->end, line->data + startmatch.rm_eo, if (regexec(varnish->end, line->data + startmatch.rm_eo, 1, &endmatch,
1, &endmatch, (startmatch.rm_eo == 0) ? (startmatch.rm_eo == 0) ? 0 : REG_NOTBOL) == 0) {
0 : REG_NOTBOL) == 0) {
/* Make the match relative to the beginning of the line. */ /* Make the match relative to the beginning of the line. */
endmatch.rm_so += startmatch.rm_eo; endmatch.rm_so += startmatch.rm_eo;
endmatch.rm_eo += startmatch.rm_eo; endmatch.rm_eo += startmatch.rm_eo;
/* Only paint the match if it is visible on screen /* Only paint the match if it is visible on screen
* and it is more than zero characters long. */ * and it is more than zero characters long. */
if (endmatch.rm_eo > from_x && if (endmatch.rm_eo > from_x && endmatch.rm_eo > startmatch.rm_so) {
endmatch.rm_eo > startmatch.rm_so) {
paintlen = actual_x(thetext, wideness(line->data, paintlen = actual_x(thetext, wideness(line->data,
endmatch.rm_eo) - from_col - start_col); endmatch.rm_eo) - from_col - start_col);
wattron(edit, varnish->attributes); wattron(edit, varnish->attributes);
mvwaddnstr(edit, row, margin + start_col, mvwaddnstr(edit, row, margin + start_col, thetext, paintlen);
thetext, paintlen);
wattroff(edit, varnish->attributes); wattroff(edit, varnish->attributes);
line->multidata[varnish->id] = JUSTONTHIS; line->multidata[varnish->id] = JUSTONTHIS;
@ -2699,7 +2695,7 @@ void draw_row(int row, const char *converted, linestruct *line, size_t from_col)
index = endmatch.rm_eo; index = endmatch.rm_eo;
/* If both start and end match are anchors, advance. */ /* If both start and end match are anchors, advance. */
if (startmatch.rm_so == startmatch.rm_eo && if (startmatch.rm_so == startmatch.rm_eo &&
endmatch.rm_so == endmatch.rm_eo) { endmatch.rm_so == endmatch.rm_eo) {
if (line->data[index] == '\0') if (line->data[index] == '\0')
break; break;
index = step_right(line->data, index); index = step_right(line->data, index);
@ -2710,8 +2706,8 @@ void draw_row(int row, const char *converted, linestruct *line, size_t from_col)
/* There is no end on this line. But maybe on later lines? */ /* There is no end on this line. But maybe on later lines? */
end_line = line->next; end_line = line->next;
while (end_line != NULL && regexec(varnish->end, end_line->data, while (end_line && regexec(varnish->end, end_line->data,
0, NULL, 0) == REG_NOMATCH) 0, NULL, 0) == REG_NOMATCH)
end_line = end_line->next; end_line = end_line->next;
/* If there is no end, we're done with this regex. */ /* If there is no end, we're done with this regex. */