X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=selector.git;a=blobdiff_plain;f=selector.c;h=24ad55d607862c63e516db2d1da28af9897905af;hp=3246a0055c39d7d237f3b3a4969c99be137a10d3;hb=db0d8f2855537dee1b1a39600d8acecd98f603ed;hpb=dd8062da09a47dfb4c1520bf3d23742b7103c00d diff --git a/selector.c b/selector.c index 3246a00..24ad55d 100644 --- a/selector.c +++ b/selector.c @@ -3,7 +3,7 @@ * selector is a simple command line utility for selection of strings * with a dynamic pattern-matching. * - * Copyright (c) 2009, 2010, 2011 Francois Fleuret + * Copyright (c) 2009, 2010, 2011, 2012 Francois Fleuret * Written by Francois Fleuret * * This file is part of selector. @@ -45,7 +45,7 @@ #include #include -#define VERSION "1.1.5" +#define VERSION "1.1.6" #define BUFFER_SIZE 4096 @@ -67,8 +67,9 @@ char *title = 0; int error_flash = 0; int upper_caps_makes_case_sensitive = 0; int show_long_lines = 0; +int show_hits = 0; -int attr_modeline, attr_focus_line, attr_error; +int attr_modeline, attr_focus_line, attr_error, attr_hits; /********************************************************************/ @@ -190,7 +191,9 @@ void usage(FILE *out) { fprintf(out, " -a, --case-sensitive\n"); fprintf(out, " start in case sensitive mode\n"); fprintf(out, " -j, --show-long-lines\n"); - fprintf(out, " print three dots at the end of truncated lines\n"); + fprintf(out, " print a long-line indicator at the end of truncated lines\n"); + fprintf(out, " -y, --show-hits\n"); + fprintf(out, " highlight the matching substrings\n"); fprintf(out, " -u, --upper-case-makes-case-sensitive\n"); fprintf(out, " using an upper case character in the matching string makes\n"); fprintf(out, " the matching case-sensitive\n"); @@ -316,21 +319,115 @@ struct matcher { char *splitted_patterns, **patterns; }; -int match(struct matcher *matcher, char *string) { +/* Routine to add an interval to a sorted list of intervals + extremities. Returns the resulting number of extremities. + + This routine is an effing nightmare */ + +int add_interval(int n, int *switches, int start, int end) { + int f, g, k; + + if(start == end) { return n; } + + f = 0; + while(f < n && switches[f] <= start) { f++; } + g = f; + while(g < n && switches[g] <= end) { g++; } + + if(f == n) { + /* switches[n-1] start end */ + /* XXXXXXXXXXXX| */ + switches[f] = start; + switches[f+1] = end; + return n + 2; + } + + if(f % 2) { + + if(g % 2) { + /* switches[f-1] start switches[f] switches[g-1] end switches[g] */ + /* |XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX| ... |XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX| */ + for(k = f; k < n; k++) { switches[k] = switches[k + (g - f)]; } + return n - (g - f); + } else { + /* switches[f-1] start switches[f] switches[g-1] end switches[g] */ + /* |XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX| ... XXXXXXXXXXXX| |XXXXXXXXXX */ + switches[g - 1] = end; + for(k = f; k < n; k++) { switches[k] = switches[k + ((g - 1) - f)]; } + return n - ((g - 1) - f); + } + + } else { + + if(f == g) { + /* switches[f-1] start end switches[f] */ + /* XXXXXXXXXXXX| |XXXXXXXXXX */ + for(k = n - 1; k >= f; k--) { + switches[k + 2] = switches[k]; + } + switches[f] = start; + switches[f + 1] = end; + return n + 2; + } + + if(g % 2) { + /* switches[f-1] start switches[f] switches[g-1] end switches[g] */ + /* XXXXXXXXXXXX| |XXXXXXXXXX ... |XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX| */ + switches[f] = start; + for(k = f + 1; k < n; k++) { switches[k] = switches[k + (g - (f + 1))]; } + return n - (g - (f + 1)); + } else { + /* switches[f-1] start switches[f] switches[g-1] end switches[g] */ + /* XXXXXXXXXXXX| |XXXXXXXXXX ... XXXXXXXXXXXX| |XXXXXXXXXX */ + switches[f] = start; + switches[g - 1] = end; + for(k = f + 1; k < n; k++) { switches[k] = switches[k + ((g - 1) - (f + 1))]; } + return n - ((g - 1) - (f + 1)); + } + } +} + +int match(struct matcher *matcher, char *string, int *nb_switches, int *switches) { int n; + char *where; + regmatch_t matches; + + if(nb_switches) { *nb_switches = 0; } + if(matcher->nb_patterns >= 0) { if(matcher->case_sensitive) { for(n = 0; n < matcher->nb_patterns; n++) { - if(strstr(string, matcher->patterns[n]) == 0) return 0; + if((where = strstr(string, matcher->patterns[n])) == 0) return 0; + if(switches) { + *nb_switches = add_interval(*nb_switches, switches, + (int) (where - string), + (int) (where - string) + strlen(matcher->patterns[n])); + } } } else { for(n = 0; n < matcher->nb_patterns; n++) { - if(strcasestr(string, matcher->patterns[n]) == 0) return 0; + if((where = strcasestr(string, matcher->patterns[n])) == 0) return 0; + if(switches) { + *nb_switches = add_interval(*nb_switches, switches, + (int) (where - string), + (int) (where - string) + strlen(matcher->patterns[n])); + } } } return 1; } else { - return regexec(&matcher->preg, string, 0, 0, 0) == 0; + if(switches) { + if(regexec(&matcher->preg, string, 1, &matches, 0) == 0) { + *nb_switches = 2; + switches[0] = matches.rm_so; + switches[1] = matches.rm_eo; + return 1; + } else { + return 0; + } + } else { + return regexec(&matcher->preg, string, 0, 0, 0) == 0; + } } } @@ -456,14 +553,14 @@ void kill_after_cursor(char *buffer, int *position) { int previous_visible(int current_line, char **lines, struct matcher *matcher) { int line = current_line - 1; - while(line >= 0 && !match(matcher, lines[line])) line--; + while(line >= 0 && !match(matcher, lines[line], 0, 0)) line--; return line; } int next_visible(int current_line, int nb_lines, char **lines, struct matcher *matcher) { int line = current_line + 1; - while(line < nb_lines && !match(matcher, lines[line])) line++; + while(line < nb_lines && !match(matcher, lines[line], 0, 0)) line++; if(line < nb_lines) return line; @@ -473,6 +570,32 @@ int next_visible(int current_line, int nb_lines, char **lines, /*********************************************************************/ +void print_string_with_switches(char *buffer, int line_width, + int nb_patterns, int *switches) { + int w, current = 0, next; + if(switches) { + for(w = 0; w < nb_patterns && switches[2 * w] < line_width; w++) { + if(switches[2 * w] < switches[2 * w + 1]) { + next = switches[2 * w]; + if(next > line_width) { next = line_width; } + if(next > current) { addnstr(buffer + current, next - current); } + attron(attr_hits); + current = next; + next = switches[2 * w + 1]; + if(next > line_width) { next = line_width; } + if(next > current) { addnstr(buffer + current, next - current); } + attroff(attr_hits); + current = next; + } + } + if(current < line_width) { + addnstr(buffer + current, line_width - current); + } + } else { + addnstr(buffer, line_width); + } +} + /* The line highlighted is the first one matching the matcher in that order: (1) current_focus_line after motion, if it does not match, then (2) the first with a greater index, if none matches, then (3) @@ -490,16 +613,27 @@ void update_screen(int *current_focus_line, int *displayed_focus_line, int nb_lines, char **lines, int cursor_position, char *pattern) { - + int *switches; char buffer[BUFFER_SIZE]; struct matcher matcher; int k, l, m; int console_width, console_height; int nb_printed_lines = 0; int cursor_x; + int nb_switches; initialize_matcher(&matcher, use_regexp, case_sensitive, pattern); + if(show_hits) { + if(matcher.nb_patterns >= 0) { + switches = safe_malloc(sizeof(int) * matcher.nb_patterns * 2); + } else { + switches = safe_malloc(sizeof(int) * 2); + } + } else { + switches = 0; + } + console_width = getmaxx(stdscr); console_height = getmaxy(stdscr); @@ -521,7 +655,7 @@ void update_screen(int *current_focus_line, int *displayed_focus_line, else if(nb_lines > 0) { int new_focus_line; - if(match(&matcher, lines[*current_focus_line])) { + if(match(&matcher, lines[*current_focus_line], 0, 0)) { new_focus_line = *current_focus_line; } else { new_focus_line = next_visible(*current_focus_line, nb_lines, lines, @@ -571,21 +705,21 @@ void update_screen(int *current_focus_line, int *displayed_focus_line, if(first_line > 0) { first_line--; - while(first_line > 0 && !match(&matcher, lines[first_line])) { + while(first_line > 0 && !match(&matcher, lines[first_line], 0, 0)) { first_line--; } - if(match(&matcher, lines[first_line])) { + if(match(&matcher, lines[first_line], 0, 0)) { nb_match++; } } if(nb_match < console_height - 1 && last_line < nb_lines - 1) { last_line++; - while(last_line < nb_lines - 1 && !match(&matcher, lines[last_line])) { + while(last_line < nb_lines - 1 && !match(&matcher, lines[last_line], 0, 0)) { last_line++; } - if(match(&matcher, lines[last_line])) { + if(match(&matcher, lines[last_line], 0, 0)) { nb_match++; } } @@ -594,7 +728,7 @@ void update_screen(int *current_focus_line, int *displayed_focus_line, /* Now we display them */ for(l = first_line; l <= last_line; l++) { - if(match(&matcher, lines[l])) { + if(match(&matcher, lines[l], &nb_switches, switches)) { int k = 0; while(lines[l][k] && k < BUFFER_SIZE - 2 && k < console_width) { @@ -606,34 +740,36 @@ void update_screen(int *current_focus_line, int *displayed_focus_line, if(l == new_focus_line) { if(show_long_lines && k >= console_width) { - if(console_width >= 4) { - buffer[console_width - 4] = ' '; - buffer[console_width - 3] = '.'; - buffer[console_width - 2] = '.'; - buffer[console_width - 1] = '.'; - } + attron(attr_focus_line); + print_string_with_switches(buffer, console_width-1, + nb_switches / 2, switches); + /* attron(attr_error); */ + addnstr("\\", 1); + /* attroff(attr_error); */ + attroff(attr_focus_line); } else { while(k < console_width) { buffer[k++] = ' '; } + attron(attr_focus_line); + print_string_with_switches(buffer, k, + nb_switches / 2, switches); + attroff(attr_focus_line); } - attron(attr_focus_line); - addnstr(buffer, console_width); - attroff(attr_focus_line); } else { if(show_long_lines && k >= console_width) { - if(console_width >= 4) { - buffer[console_width - 4] = ' '; - buffer[console_width - 3] = '.'; - buffer[console_width - 2] = '.'; - buffer[console_width - 1] = '.'; - } + print_string_with_switches(buffer, console_width-1, + nb_switches / 2, switches); + attron(attr_focus_line); + addnstr("\\", 1); + attroff(attr_focus_line); } else { buffer[k++] = '\n'; buffer[k++] = '\0'; + + print_string_with_switches(buffer, k, + nb_switches / 2, switches); } - /* clrtoeol(); */ - addnstr(buffer, console_width); } nb_printed_lines++; @@ -728,6 +864,7 @@ void update_screen(int *current_focus_line, int *displayed_focus_line, /* We are done */ refresh(); + if(switches) { free(switches); } free_matcher(&matcher); } @@ -825,6 +962,7 @@ static struct option long_options[] = { { "regexp", no_argument, 0, 'e' }, { "case-sensitive", no_argument, 0, 'a' }, { "show-long-lines", no_argument, 0, 'j'}, + { "show-hits", no_argument, 0, 'j'}, { "upper-case-makes-case-sensitive", no_argument, 0, 'u' }, { "title", 1, 0, 't' }, { "number-of-lines", 1, 0, 'l' }, @@ -867,7 +1005,7 @@ int main(int argc, char **argv) { strcpy(output_filename, ""); - while ((c = getopt_long(argc, argv, "o:s:x:vwmqf:ibzdeajunt:l:c:-h", + while ((c = getopt_long(argc, argv, "o:s:x:vwmqf:ibzdeajyunt:l:c:-h", long_options, NULL)) != -1) { switch(c) { @@ -928,6 +1066,10 @@ int main(int argc, char **argv) { show_long_lines = 1; break; + case 'y': + show_hits = 1; + break; + case 'u': upper_caps_makes_case_sensitive = 1; break; @@ -1073,6 +1215,7 @@ int main(int argc, char **argv) { attr_error = A_STANDOUT; attr_modeline = A_REVERSE; attr_focus_line = A_STANDOUT; + attr_hits = A_BOLD; if(with_colors && has_colors()) {