X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.cc;h=cf9df599dd01e03c4fa7d82e20dedced589922a6;hb=0030dc908abe01705612bd157a64cfc8b62bd1d1;hp=3ffccc1327ec70e29c3d6591de21a15ae6e46f25;hpb=8eb6affd35f9c02dc6bfa5ec8319004bf6f8e78c;p=selector.git diff --git a/selector.cc b/selector.cc index 3ffccc1..cf9df59 100644 --- a/selector.cc +++ b/selector.cc @@ -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 @@ -354,23 +382,64 @@ void update_screen(int *current_line, int *temporary_line, int motion, // 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); } @@ -463,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, ""); + delete[] title; + title = new char[strlen(argv[i+1]) + 1]; + strcpy(title, argv[i+1]); + i += 2; + } + else if(strcmp(argv[i], "-l") == 0) { check_opt(argc, argv, i, 1, "<maximum number of lines>"); nb_lines_max = atoi(argv[i+1]); @@ -504,7 +586,10 @@ int main(int argc, char **argv) { << " -z remove the zsh history line prefix" << endl << " -i invert the order of lines" << endl << " -e start in regexp mode" << endl + << " -a case sensitive" << endl << " -m monochrome mode" << endl + << " -t <title>" << endl + << " add a title in the modeline" << endl << " -c <fg modeline> <bg modeline> <fg highlight> <bg highlight>" << endl << " set the display colors" << endl << " -o <output filename>" << endl @@ -587,8 +672,8 @@ int main(int argc, char **argv) { lines[nb_lines] = new char[strlen(s) + 1]; strcpy(lines[nb_lines], s); } else { - // We do not allocate a new string but use the pointer to the - // first occurence of it + // The string was already in there, so we do not allocate a + // new string but use the pointer to the first occurence of it lines[nb_lines] = lines[dup]; lines[dup] = 0; } @@ -619,8 +704,8 @@ int main(int argc, char **argv) { char pattern[buffer_size]; pattern[0] = '\0'; - int pattern_point; - pattern_point = 0; + int cursor_position; + cursor_position = 0; ////////////////////////////////////////////////////////////////////// // Here we start to display with curse @@ -650,6 +735,7 @@ int main(int argc, char **argv) { } init_pair(1, color_fg_modeline, color_bg_modeline); init_pair(2, color_fg_highlight, color_bg_highlight); + init_pair(3, color_bg_modeline, color_fg_modeline); } else { with_colors = 0; } @@ -658,7 +744,18 @@ int main(int argc, char **argv) { int key; int current_line = 0, temporary_line = 0; - update_screen(¤t_line, &temporary_line, 0, nb_lines, lines, pattern); + update_screen(¤t_line, &temporary_line, 0, nb_lines, lines, cursor_position, pattern); + + // \000 ^@ + // \001 ^A + // ... + // \032 ^Z + // \033 ^[ + // \034 ^\ + // \035 ^] + // \036 ^^ + // \037 ^_ + // \177 ^? do { @@ -666,16 +763,42 @@ int main(int argc, char **argv) { int motion = 0; - if(key >= ' ' && key <= '~') { - pattern[pattern_point++] = key; - pattern[pattern_point] = '\0'; + if(key >= ' ' && key <= '~') { // Insert character + int c = cursor_position; + char t = pattern[c], u; + while(t) { + c++; + u = pattern[c]; + pattern[c] = t; + t = u; + } + c++; + pattern[c] = '\0'; + pattern[cursor_position++] = key; + } + + else if(key == KEY_BACKSPACE || key == '\010' || key == '\177') { + if(cursor_position > 0) { + if(pattern[cursor_position]) { + int c = cursor_position-1; + while(pattern[c]) { + pattern[c] = pattern[c+1]; + c++; + } + } else { + pattern[cursor_position - 1] = '\0'; + } + cursor_position--; + } } - else if(key == KEY_BACKSPACE || key == '' || key == '' || - key == KEY_DC || key == '') { - if(pattern_point > 0) { - pattern_point--; - pattern[pattern_point] = '\0'; + else if(key == KEY_DC || key == '\004') { + if(pattern[cursor_position]) { + int c = cursor_position; + while(pattern[c]) { + pattern[c] = pattern[c+1]; + c++; + } } } @@ -695,27 +818,52 @@ int main(int argc, char **argv) { motion = -10; } - else if(key == KEY_DOWN || key == '') { + else if(key == KEY_DOWN || key == '\014') { motion = 1; } - else if(key == KEY_UP || key == '') { + else if(key == KEY_UP || key == '\016') { motion = -1; } - else if(key == '') { + else if(key == KEY_LEFT || key == '\002') { + if(cursor_position > 0) cursor_position--; + } + + else if(key == KEY_RIGHT || key == '\006') { + if(pattern[cursor_position]) cursor_position++; + } + + else if(key == '\001') { + cursor_position = 0; + } + + else if(key == '\005') { + cursor_position = strlen(pattern); + } + + else if(key == '\022') { use_regexp = !use_regexp; } - else if(key == '') { - pattern_point = 0; - pattern[pattern_point] = '\0'; + else if(key == '\025') { + int s = 0; + while(pattern[cursor_position + s]) { + pattern[s] = pattern[cursor_position + s]; + s++; + } + pattern[s] = '\0'; + cursor_position = 0; + } + + else if(key == '\013') { + pattern[cursor_position] = '\0'; } update_screen(¤t_line, &temporary_line, motion, - nb_lines, lines, pattern); + nb_lines, lines, cursor_position, pattern); - } while(key != '\n' && key != KEY_ENTER && key != ''); + } while(key != '\n' && key != KEY_ENTER && key != '\007'); echo(); curs_set(1); @@ -754,6 +902,7 @@ int main(int argc, char **argv) { } delete[] lines; + delete[] title; exit(0); }