X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.c;h=489386a515b0c80431d53b81ec7bba06c771e076;hb=cae964f858e9c1cc6f4c6da2d2963ad7f4cd59f1;hp=daf2c26dc478c79d83533784837f52cbf2d06817;hpb=87d0df2343695853a67e240c58452603f0a5b479;p=selector.git diff --git a/selector.c b/selector.c index daf2c26..489386a 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 Francois Fleuret + * Copyright (c) 2009, 2010, 2011 Francois Fleuret * Written by Francois Fleuret * * This file is part of selector. @@ -45,7 +45,7 @@ #include #include -#define VERSION "1.1.2" +#define VERSION "1.1.3" #define BUFFER_SIZE 4096 @@ -65,6 +65,7 @@ int use_regexp = 0; int case_sensitive = 0; char *title = 0; int error_flash = 0; +int exclamation_negates = 0; int attr_modeline, attr_focus_line, attr_error; @@ -186,14 +187,15 @@ void usage(FILE *out) { fprintf(out, " start in regexp mode\n"); fprintf(out, " -a, --case-sensitive\n"); fprintf(out, " start in case sensitive mode\n"); + fprintf(out, " -n, --exclamation-negates\n"); + fprintf(out, " substrings starting with an exclamation mark have to be absent\n"); fprintf(out, " -m, --monochrome\n"); fprintf(out, " monochrome mode\n"); fprintf(out, " -q, --no-beep\n"); fprintf(out, " make a flash instead of a beep on an edition error\n"); fprintf(out, " --bash\n"); fprintf(out, " setting for bash history search, same as -b -i -d -v -w -l ${HISTSIZE}\n"); - fprintf(out, " --, --rest-are-files\n"); - fprintf(out, " all following arguments are filenames\n"); + fprintf(out, " -- all following arguments are filenames\n"); fprintf(out, " -t , --title <title>\n"); fprintf(out, " add a title in the modeline\n"); fprintf(out, " -c <colors>, --colors <colors>\n"); @@ -300,24 +302,44 @@ int add_and_get_previous_index(struct hash_table_t *hash_table, A matcher matches either with a collection of substrings, or with a regexp */ -typedef struct { +struct matcher { regex_t preg; int regexp_error; int nb_patterns; int case_sensitive; char *splitted_patterns, **patterns; -} matcher_t; +}; -int match(matcher_t *matcher, char *string) { +int match(struct matcher *matcher, char *string) { int n; 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(exclamation_negates) { + for(n = 0; n < matcher->nb_patterns; n++) { + if(matcher->patterns[n][0] == '!') { + if(strstr(string, matcher->patterns[n] + 1) != 0) return 0; + } else { + if(strstr(string, matcher->patterns[n]) == 0) return 0; + } + } + } else { + for(n = 0; n < matcher->nb_patterns; n++) { + if(strstr(string, matcher->patterns[n]) == 0) return 0; + } } } else { - for(n = 0; n < matcher->nb_patterns; n++) { - if(strcasestr(string, matcher->patterns[n]) == 0) return 0; + if(exclamation_negates) { + for(n = 0; n < matcher->nb_patterns; n++) { + if(matcher->patterns[n][0] == '!') { + if(strcasestr(string, matcher->patterns[n] + 1) != 0) return 0; + } else { + if(strcasestr(string, matcher->patterns[n]) == 0) return 0; + } + } + } else { + for(n = 0; n < matcher->nb_patterns; n++) { + if(strcasestr(string, matcher->patterns[n]) == 0) return 0; + } } } return 1; @@ -326,7 +348,7 @@ int match(matcher_t *matcher, char *string) { } } -void free_matcher(matcher_t *matcher) { +void free_matcher(struct matcher *matcher) { if(matcher->nb_patterns < 0) { if(!matcher->regexp_error) regfree(&matcher->preg); } else { @@ -335,7 +357,7 @@ void free_matcher(matcher_t *matcher) { } } -void initialize_matcher(matcher_t *matcher, +void initialize_matcher(struct matcher *matcher, int use_regexp, int case_sensitive, const char *pattern) { const char *s; @@ -438,14 +460,14 @@ void kill_after_cursor(char *buffer, int *position) { /*********************************************************************/ -int previous_visible(int current_line, char **lines, matcher_t *matcher) { +int previous_visible(int current_line, char **lines, struct matcher *matcher) { int line = current_line - 1; while(line >= 0 && !match(matcher, lines[line])) line--; return line; } int next_visible(int current_line, int nb_lines, char **lines, - matcher_t *matcher) { + struct matcher *matcher) { int line = current_line + 1; while(line < nb_lines && !match(matcher, lines[line])) line++; @@ -476,7 +498,7 @@ void update_screen(int *current_focus_line, int *displayed_focus_line, char *pattern) { char buffer[BUFFER_SIZE]; - matcher_t matcher; + struct matcher matcher; int k, l, m; int console_width, console_height; int nb_printed_lines = 0; @@ -581,32 +603,24 @@ void update_screen(int *current_focus_line, int *displayed_focus_line, if(match(&matcher, lines[l])) { int k = 0; - while(lines[l][k] && k < BUFFER_SIZE - 2 && k < console_width - 2) { + while(lines[l][k] && k < BUFFER_SIZE - 2 && k < console_width) { buffer[k] = lines[l][k]; k++; } - /* We fill the rest of the line with blanks if this is the - highlighted line */ + /* Highlight the highlighted line ... */ if(l == new_focus_line) { while(k < console_width) { buffer[k++] = ' '; } - } - - buffer[k++] = '\n'; - buffer[k++] = '\0'; - - clrtoeol(); - - /* Highlight the highlighted line ... */ - - if(l == new_focus_line) { attron(attr_focus_line); addnstr(buffer, console_width); attroff(attr_focus_line); } else { + buffer[k++] = '\n'; + buffer[k++] = '\0'; + /* clrtoeol(); */ addnstr(buffer, console_width); } @@ -841,7 +855,6 @@ static struct option long_options[] = { { "title", 1, 0, 't' }, { "number-of-lines", 1, 0, 'l' }, { "colors", 1, 0, 'c' }, - { "rest-are-files", no_argument, 0, '-' }, { "bash", no_argument, 0, OPT_BASH_MODE }, { "help", no_argument, 0, 'h' }, { 0, 0, 0, 0 } @@ -854,7 +867,6 @@ int main(int argc, char **argv) { int c, k, l, n; int cursor_position; int error = 0, show_help = 0, done = 0; - int rest_are_files = 0; int key; int current_focus_line, displayed_focus_line; @@ -881,8 +893,7 @@ int main(int argc, char **argv) { strcpy(output_filename, ""); - while (!rest_are_files && - (c = getopt_long(argc, argv, "o:s:x:vwmqf:ibzdeat:l:c:-h", + while ((c = getopt_long(argc, argv, "o:s:x:vwmqf:ibzdeant:l:c:-h", long_options, NULL)) != -1) { switch(c) { @@ -939,6 +950,10 @@ int main(int argc, char **argv) { case_sensitive = 1; break; + case 'n': + exclamation_negates = 1; + break; + case 't': free(title); title = safe_malloc((strlen(optarg) + 1) * sizeof(char)); @@ -957,10 +972,6 @@ int main(int argc, char **argv) { color_bg_highlight = colors[3]; break; - case '-': - rest_are_files = 1; - break; - case 'h': show_help = 1; break; @@ -1213,6 +1224,10 @@ int main(int argc, char **argv) { done = 1; } + else if(key == KEY_RESIZE || key == -1) { + /* Do nothing when the tty is resized */ + } + else { /* Unknown key */ error_feedback();