X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=selector.cc;h=c9360291b24b021766904489bc9f8f3a3d731d6f;hb=b830e75fad587e5222eaf07659e7ee39deddf3d0;hp=06456abd14c033fdd47def783fbd1cc9edf27e7b;hpb=42c2c8bc64a8182a29d0e23526c78cbbbf074b06;p=selector.git diff --git a/selector.cc b/selector.cc index 06456ab..c936029 100644 --- a/selector.cc +++ b/selector.cc @@ -41,7 +41,7 @@ using namespace std; #define VERSION "1.0" -const int buffer_size = 1024; +const int buffer_size = 4096; // Yeah, global variables! @@ -53,6 +53,8 @@ int zsh_history = 0, bash_history = 0; int inverse_order = 0; int remove_duplicates = 0; int use_regexp = 0; +int case_sensitive = 0; +char *title = 0; ////////////////////////////////////////////////////////////////////// @@ -85,6 +87,10 @@ void check_opt(int argc, char **argv, int n_opt, int n, const char *help) { ////////////////////////////////////////////////////////////////////// // A quick and dirty hash table +// The table itself stores index of the strings in a char +// **table. When a string is added, if it was already in the table, +// the new index replaces the previous one. + int *new_hash_table(int hash_table_size) { int *result; result = new int[hash_table_size]; @@ -94,6 +100,10 @@ int *new_hash_table(int hash_table_size) { return result; } +// Adds new_string in the table, associated to new_index. If this +// string was not already in the table, returns -1. Otherwise, returns +// the previous index it had. + int test_and_add(char *new_string, int new_index, char **strings, int *hash_table, int hash_table_size) { unsigned int code = 0; @@ -108,16 +118,23 @@ int test_and_add(char *new_string, int new_index, code = code % hash_table_size; while(hash_table[code] >= 0) { + // There is a string with that code if(strcmp(new_string, strings[hash_table[code]]) == 0) { + // It is the same string, we keep a copy of the stored index int result = hash_table[code]; + // Put the new one hash_table[code] = new_index; + // And return the previous one return result; } + // This collision was not the same string, let's move to the next + // in the table code = (code + 1) % hash_table_size; } + // This string was not already in there, store the index in the + // table and return -1 hash_table[code] = new_index; - return -1; } @@ -129,13 +146,20 @@ struct matcher_t { regex_t preg; int regexp_error; int nb_patterns; + int case_sensitive; char *splitted_patterns, **patterns; }; int match(char *string, matcher_t *matcher) { if(matcher->nb_patterns >= 0) { - for(int n = 0; n < matcher->nb_patterns; n++) { - if(strstr(string, matcher->patterns[n]) == 0) return 0; + if(matcher->case_sensitive) { + for(int n = 0; n < matcher->nb_patterns; n++) { + if(strstr(string, matcher->patterns[n]) == 0) return 0; + } + } else { + for(int n = 0; n < matcher->nb_patterns; n++) { + if(strcasestr(string, matcher->patterns[n]) == 0) return 0; + } } return 1; } else { @@ -152,13 +176,16 @@ void free_matcher(matcher_t *matcher) { } } -void initialize_matcher(int use_regexp, matcher_t *matcher, const char *pattern) { +void initialize_matcher(int use_regexp, int case_sensitive, + matcher_t *matcher, const char *pattern) { + if(use_regexp) { matcher->nb_patterns = -1; - matcher->regexp_error = regcomp(&matcher->preg, pattern, REG_ICASE); + matcher->regexp_error = regcomp(&matcher->preg, pattern, case_sensitive ? 0 : REG_ICASE); } else { matcher->regexp_error = 0; matcher->nb_patterns = 1; + matcher->case_sensitive = case_sensitive; for(const char *s = pattern; *s; s++) { if(*s == pattern_separator) { @@ -205,12 +232,13 @@ int next_visible(int current_line, int nb_lines, char **lines, matcher_t *matche void update_screen(int *current_line, int *temporary_line, int motion, int nb_lines, char **lines, + int cursor_position, char *pattern) { char buffer[buffer_size]; matcher_t matcher; - initialize_matcher(use_regexp, &matcher, pattern); + initialize_matcher(use_regexp, case_sensitive, &matcher, pattern); // We now take care of printing the lines per se @@ -228,8 +256,7 @@ void update_screen(int *current_line, int *temporary_line, int motion, if(matcher.regexp_error) { addstr("[regexp error]"); - } else { - + } else if(nb_lines > 0) { int new_line; if(match(lines[*current_line], &matcher)) { new_line = *current_line; @@ -349,27 +376,70 @@ void update_screen(int *current_line, int *temporary_line, int motion, if(nb_printed_lines == 0) { addnstr("[no selection]\n", console_width); } + } else { + addnstr("[empty choice]\n", console_width); } // Draw the modeline - sprintf(buffer, "%d/%d pattern: %s%s", - nb_printed_lines, - nb_lines, - pattern, - use_regexp ? " [regexp]" : ""); + move(0, 0); + if(with_colors) { + attron(COLOR_PAIR(1)); + } else { + attron(A_REVERSE); + } - for(int k = strlen(buffer); k < console_width; k++) buffer[k] = ' '; + for(int k = 0; k < console_width; k++) buffer[k] = ' '; buffer[console_width] = '\0'; + addnstr(buffer, console_width); move(0, 0); + + if(title) { + addstr(title); + addstr(" "); + } + + printw("%d/%d ", nb_printed_lines, nb_lines); + + addnstr(pattern, cursor_position); + + // Now we print the cursor. All that mess to have reverse video with + // and without color. + if(with_colors) { - attron(COLOR_PAIR(1)); - addnstr(buffer, console_width); attroff(COLOR_PAIR(1)); + attron(COLOR_PAIR(3)); + } else { + attroff(A_REVERSE); + } + + if(pattern[cursor_position]) { + addnstr(&pattern[cursor_position], 1); + } else { + addstr(" "); + } + + if(with_colors) { + attroff(COLOR_PAIR(3)); + attron(COLOR_PAIR(1)); } else { attron(A_REVERSE); - addnstr(buffer, console_width); + } + + if(pattern[cursor_position]) { + addstr(pattern + cursor_position + 1); + } + + // Finished printing the cursor + + if(use_regexp) { + addstr(" [regexp]"); + } + + if(with_colors) { + attroff(COLOR_PAIR(1)); + } else { attroff(A_REVERSE); } @@ -462,6 +532,19 @@ int main(int argc, char **argv) { i++; } + else if(strcmp(argv[i], "-a") == 0) { + case_sensitive = 1; + i++; + } + + else if(strcmp(argv[i], "-t") == 0) { + check_opt(argc, argv, i, 1, "