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

tweaks: call wattron()/wattroff() only when actually painting something 

A syntax has on average a dozen coloring rules, but on average maybe
three or four pieces of text (rough estimate) in a line get painted.
So, on average, it is cheaper to call wattron() and wattroff() only
when actually coloring a piece of text, instead of calling wattron()
before starting to evaluate each rule and wattroff() after finishing
its evaluation.
master
Benno Schulenberg 2021-01-23 17:20:32 +01:00
parent 895de17a58
commit 9d8388e836
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/winio.c
View File

@ -2505,8 +2505,6 @@ void draw_row(int row, const char *converted, linestruct *line, size_t from_col)
regmatch_t startmatch, endmatch; regmatch_t startmatch, endmatch;
/* The match positions of the start and end regexes. */ /* The match positions of the start and end regexes. */
wattron(edit, varnish->attributes);
/* First case: varnish is a single-line expression. */ /* First case: varnish is a single-line expression. */
if (varnish->end == NULL) { if (varnish->end == NULL) {
while (index < till_x) { while (index < till_x) {
@ -2539,9 +2537,12 @@ void draw_row(int row, const char *converted, linestruct *line, size_t from_col)
paintlen = actual_x(thetext, wideness(line->data, paintlen = actual_x(thetext, wideness(line->data,
match.rm_eo) - from_col - start_col); match.rm_eo) - from_col - start_col);
wattron(edit, varnish->attributes);
mvwaddnstr(edit, row, margin + start_col, thetext, paintlen); mvwaddnstr(edit, row, margin + start_col, thetext, paintlen);
wattroff(edit, varnish->attributes);
} }
goto tail_of_loop;
continue;
} }
/* Second case: varnish is a multiline expression. */ /* Second case: varnish is a multiline expression. */
@ -2622,21 +2623,25 @@ void draw_row(int row, const char *converted, linestruct *line, size_t from_col)
/* If there is no end, there is nothing to paint. */ /* If there is no end, there is nothing to paint. */
if (end_line == NULL) { if (end_line == NULL) {
line->multidata[varnish->id] = CWOULDBE; line->multidata[varnish->id] = CWOULDBE;
goto tail_of_loop; continue;
} }
/* If the end is on a later line, paint whole line, and be done. */ /* If the end is on a later line, paint whole line, and be done. */
if (end_line != line) { if (end_line != line) {
wattron(edit, varnish->attributes);
mvwaddnstr(edit, row, margin, converted, -1); mvwaddnstr(edit, row, margin, converted, -1);
wattroff(edit, varnish->attributes);
line->multidata[varnish->id] = CWHOLELINE; line->multidata[varnish->id] = CWHOLELINE;
goto tail_of_loop; continue;
} }
/* Only if it is visible, paint the part to be coloured. */ /* Only if it is visible, paint the part to be coloured. */
if (endmatch.rm_eo > from_x) { if (endmatch.rm_eo > from_x) {
paintlen = actual_x(converted, wideness(line->data, paintlen = actual_x(converted, wideness(line->data,
endmatch.rm_eo) - from_col); endmatch.rm_eo) - from_col);
wattron(edit, varnish->attributes);
mvwaddnstr(edit, row, margin, converted, paintlen); mvwaddnstr(edit, row, margin, converted, paintlen);
wattroff(edit, varnish->attributes);
} }
line->multidata[varnish->id] = CBEGINBEFORE; line->multidata[varnish->id] = CBEGINBEFORE;
@ -2673,8 +2678,10 @@ void draw_row(int row, const char *converted, linestruct *line, size_t from_col)
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);
mvwaddnstr(edit, row, margin + start_col, mvwaddnstr(edit, row, margin + start_col,
thetext, paintlen); thetext, paintlen);
wattroff(edit, varnish->attributes);
line->multidata[varnish->id] = CSTARTENDHERE; line->multidata[varnish->id] = CSTARTENDHERE;
} }
@ -2703,12 +2710,12 @@ void draw_row(int row, const char *converted, linestruct *line, size_t from_col)
} }
/* Paint the rest of the line, and we're done. */ /* Paint the rest of the line, and we're done. */
wattron(edit, varnish->attributes);
mvwaddnstr(edit, row, margin + start_col, thetext, -1); mvwaddnstr(edit, row, margin + start_col, thetext, -1);
wattroff(edit, varnish->attributes);
line->multidata[varnish->id] = CENDAFTER; line->multidata[varnish->id] = CENDAFTER;
break; break;
} }
tail_of_loop:
wattroff(edit, varnish->attributes);
} }
} }
#endif /* ENABLE_COLOR */ #endif /* ENABLE_COLOR */