From ce080c34350db96a158f0fb420b2bbc31cd0b384 Mon Sep 17 00:00:00 2001 From: Charlie Gordon Date: Sun, 1 Jun 2014 14:18:17 +0000 Subject: [PATCH] simplified line colorization call sequence --- list.c | 2 +- qe.c | 114 ++++++++++++++++++++++++++++----------------------------- qe.h | 2 - 3 files changed, 57 insertions(+), 61 deletions(-) diff --git a/list.c b/list.c index e5ea8b7..626ea19 100644 --- a/list.c +++ b/list.c @@ -32,7 +32,7 @@ static int list_get_colorized_line(EditState *s, offset = *offsetp; /* Get line contents including static buffer styles */ - len = get_non_colorized_line(s, buf, buf_size, offsetp, line_num); + len = generic_get_colorized_line(s, buf, buf_size, offsetp, line_num); if (((qs->active_window == s) || s->force_highlight) && s->offset >= offset && s->offset < *offsetp) diff --git a/qe.c b/qe.c index 7eee891..63fe25a 100644 --- a/qe.c +++ b/qe.c @@ -3297,27 +3297,54 @@ static int bidir_compute_attributes(TypeLink *list_tab, int max_size, } #endif -#ifndef CONFIG_TINY - /************************************************************/ /* colorization handling */ /* NOTE: only one colorization mode can be selected at a time for a buffer */ +static int get_staticly_colorized_line(EditState *s, unsigned int *buf, int buf_size, + int *offset_ptr, int line_num) +{ + EditBuffer *b = s->b; + unsigned int *buf_ptr, *buf_end; + int c, offset; + + offset = *offset_ptr; + + buf_ptr = buf; + buf_end = buf + buf_size - 1; + b->cur_style = 0; + for (;;) { + c = eb_nextc(b, offset, &offset); + if (c == '\n') + break; + if (buf_ptr < buf_end) { + c |= b->cur_style << STYLE_SHIFT; + *buf_ptr++ = c; + } + } + *buf_ptr = '\0'; + *offset_ptr = offset; + return buf_ptr - buf; +} + +#ifndef CONFIG_TINY + /* Gets the colorized line beginning at 'offset'. Its length excluding '\n' is returned */ #define COLORIZED_LINE_PREALLOC_SIZE 64 -int generic_get_colorized_line(EditState *s, unsigned int *buf, int buf_size, - int *offsetp, int line_num) +static int syntax_get_colorized_line(EditState *s, unsigned int *buf, + int buf_size, int *offsetp, int line_num) { QEColorizeContext cctx; + EditBuffer *b = s->b; int len, line, n, col, offset, bom; /* invalidate cache if needed */ if (s->colorize_max_valid_offset != INT_MAX) { - eb_get_pos(s->b, &line, &col, s->colorize_max_valid_offset); + eb_get_pos(b, &line, &col, s->colorize_max_valid_offset); line++; if (line < s->colorize_nb_valid_lines) s->colorize_nb_valid_lines = line; @@ -3341,6 +3368,7 @@ int generic_get_colorized_line(EditState *s, unsigned int *buf, int buf_size, memset(&cctx, 0, sizeof(cctx)); cctx.s = s; + cctx.b = b; /* propagate state if needed */ if (line_num >= s->colorize_nb_valid_lines) { @@ -3348,12 +3376,12 @@ int generic_get_colorized_line(EditState *s, unsigned int *buf, int buf_size, s->colorize_states[0] = 0; /* initial state : zero */ s->colorize_nb_valid_lines = 1; } - offset = eb_goto_pos(s->b, s->colorize_nb_valid_lines - 1, 0); + offset = eb_goto_pos(b, s->colorize_nb_valid_lines - 1, 0); cctx.colorize_state = s->colorize_states[s->colorize_nb_valid_lines - 1]; cctx.state_only = 1; for (line = s->colorize_nb_valid_lines; line <= line_num; line++) { - len = eb_get_line(s->b, buf, buf_size - 1, &offset); + len = eb_get_line(b, buf, buf_size - 1, &offset); /* skip byte order mark if present */ bom = (len > 0 && buf[0] == 0xFEFF); if (bom) { @@ -3369,7 +3397,7 @@ int generic_get_colorized_line(EditState *s, unsigned int *buf, int buf_size, /* compute line color */ cctx.colorize_state = s->colorize_states[line_num]; cctx.state_only = 0; - len = eb_get_line(s->b, buf, buf_size - 1, offsetp); + len = eb_get_line(b, buf, buf_size - 1, offsetp); bom = (len > 0 && buf[0] == 0xFEFF); if (bom) { SET_COLOR1(buf, 0, QE_STYLE_PREPROCESS); @@ -3399,68 +3427,38 @@ static void colorize_callback(__unused__ EditBuffer *b, if (offset < e->colorize_max_valid_offset) e->colorize_max_valid_offset = offset; } +#endif /* CONFIG_TINY */ void set_colorize_func(EditState *s, ColorizeFunc colorize_func) { + s->get_colorized_line = generic_get_colorized_line; + s->colorize_func = NULL; + +#ifndef CONFIG_TINY /* invalidate the previous states & free previous colorizer */ eb_free_callback(s->b, colorize_callback, s); qe_free(&s->colorize_states); s->colorize_nb_lines = 0; s->colorize_nb_valid_lines = 0; s->colorize_max_valid_offset = INT_MAX; - s->get_colorized_line = get_non_colorized_line; - s->colorize_func = NULL; - - if (colorize_func) { + s->colorize_func = colorize_func; + if (colorize_func) eb_add_callback(s->b, colorize_callback, s, 0); - s->get_colorized_line = generic_get_colorized_line; - s->colorize_func = colorize_func; - } +#endif } -#else /* CONFIG_TINY */ - -void set_colorize_func(EditState *s, ColorizeFunc colorize_func) +int generic_get_colorized_line(EditState *s, unsigned int *buf, int buf_size, + int *offsetp, int line_num) { - s->get_colorized_line = get_non_colorized_line; -} - -#endif /* CONFIG_TINY */ - -static int get_staticly_colorized_line(EditState *s, unsigned int *buf, int buf_size, - int *offset_ptr, int line_num) -{ - EditBuffer *b = s->b; - unsigned int *buf_ptr, *buf_end; - int c, offset; - - offset = *offset_ptr; - - buf_ptr = buf; - buf_end = buf + buf_size - 1; - b->cur_style = 0; - for (;;) { - c = eb_nextc(b, offset, &offset); - if (c == '\n') - break; - if (buf_ptr < buf_end) { - c |= b->cur_style << STYLE_SHIFT; - *buf_ptr++ = c; - } - } - *buf_ptr = '\0'; - *offset_ptr = offset; - return buf_ptr - buf; -} - -int get_non_colorized_line(EditState *s, unsigned int *buf, int buf_size, - int *offsetp, int line_num) -{ - if (s->b->b_styles) { + if (s->b->b_styles) return get_staticly_colorized_line(s, buf, buf_size, offsetp, line_num); - } else { - return eb_get_line(s->b, buf, buf_size, offsetp); - } + +#ifndef CONFIG_TINY + if (s->colorize_func) + return syntax_get_colorized_line(s, buf, buf_size, offsetp, line_num); +#endif + + return eb_get_line(s->b, buf, buf_size, offsetp); } #define RLE_EMBEDDINGS_SIZE 128 @@ -3477,7 +3475,7 @@ int text_display(EditState *s, DisplayState *ds, int offset) line_num = 0; /* XXX: should test a flag, to avoid this call in hex/binary */ - if (s->line_numbers || s->get_colorized_line != get_non_colorized_line) { + if (s->line_numbers || s->colorize_func) { eb_get_pos(s->b, &line_num, &col_num, offset); } @@ -3525,7 +3523,7 @@ int text_display(EditState *s, DisplayState *ds, int offset) /* colorize */ colored_nb_chars = 0; offset0 = offset; - if (s->get_colorized_line != get_non_colorized_line + if (s->colorize_func || s->curline_style || s->region_style || s->b->b_styles) { colored_nb_chars = s->get_colorized_line(s, colored_chars, diff --git a/qe.h b/qe.h index ff853b0..8bab656 100644 --- a/qe.h +++ b/qe.h @@ -1782,8 +1782,6 @@ int text_display(EditState *s, DisplayState *ds, int offset); void set_colorize_func(EditState *s, ColorizeFunc colorize_func); int generic_get_colorized_line(EditState *s, unsigned int *buf, int buf_size, int *offsetp, int line_num); -int get_non_colorized_line(EditState *s, unsigned int *buf, int buf_size, - int *offsetp, int line_num); void do_char(EditState *s, int key, int argval); void do_combine_char(EditState *s, int accent);