X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.cc;h=0bb2d3f95ced54cd5fde0dddc68172f7b0204872;hb=af3bbcdf9a629c4fb333709dedd435b72bdc5213;hp=53b65bb93064f38d1291fdbc909756c59630c89b;hpb=4dd38ecf0a038875edd46bdbf5dcbb7264378c45;p=selector.git diff --git a/selector.cc b/selector.cc index 53b65bb..0bb2d3f 100644 --- a/selector.cc +++ b/selector.cc @@ -23,11 +23,7 @@ */ // To use it as a super-history-search for bash: -// -// alias h='./selector -i -b -v -f <(history)' - -// This software is highly Linux-specific, but I would be glad to get -// patches to make it work on other OS +// alias h='selector -d -i -b -v -f <(history)' #include #include @@ -39,12 +35,13 @@ #include #include #include +#include using namespace std; #define VERSION "1.0" -const int buffer_size = 1024; +const int buffer_size = 4096; // Yeah, global variables! @@ -55,87 +52,157 @@ int with_colors = 1; int zsh_history = 0, bash_history = 0; int inverse_order = 0; int remove_duplicates = 0; +int use_regexp = 0; +int case_sensitive = 0; ////////////////////////////////////////////////////////////////////// -// int test_and_set_hash(char *s, char **hashed, int hash_size) { - // uint32_t code = 0, mask; - // int result; - - // for(int k = 0; s[k]; k++) { - // code += ((uint32_t) (s[k])) << (8 * k%4); - // } +void inject_into_tty_buffer(char *string) { + struct termios oldtio, newtio; + tcgetattr(STDIN_FILENO, &oldtio); + memset(&newtio, 0, sizeof(newtio)); + // Set input mode (non-canonical, *no echo*,...) + tcsetattr(STDIN_FILENO, TCSANOW, &newtio); + // Put the selected string in the tty input buffer + for(char *k = string; *k; k++) { + ioctl(STDIN_FILENO, TIOCSTI, k); + } + // Restore the old settings + tcsetattr(STDIN_FILENO, TCSANOW, &oldtio); +} - // code = code%hash_table_size; +////////////////////////////////////////////////////////////////////// - // if(hashed[code]) { - // } else { - - // } -// } +void check_opt(int argc, char **argv, int n_opt, int n, const char *help) { + if(n_opt + n >= argc) { + cerr << "Missing argument for " << argv[n_opt] << "." + << " " + << "Expecting " << help << "." + << endl; + exit(1); + } +} ////////////////////////////////////////////////////////////////////// +// A quick and dirty hash table -// This looks severely Linux-only ... +int *new_hash_table(int hash_table_size) { + int *result; + result = new int[hash_table_size]; + for(int k = 0; k < hash_table_size; k++) { + result[k] = -1; + } + return result; +} -void inject_into_tty_buffer(char *line) { - char *tty = ttyname(STDIN_FILENO); - int fd = open(tty, O_RDWR); +int test_and_add(char *new_string, int new_index, + char **strings, int *hash_table, int hash_table_size) { + unsigned int code = 0; - struct termios oldtio, newtio; + // This is my recipe. I checked, it seems to work (as long as + // hash_table_size is not a multiple of 387433 that should be okay) - if (fd >= 0) { - // Save current port settings - tcgetattr(fd,&oldtio); - memset(&newtio, 0, sizeof(newtio)); - // Set input mode (non-canonical, *no echo*,...) - tcflush(fd, TCIFLUSH); - tcsetattr(fd,TCSANOW, &newtio); - // Put the selected line in the tty input buffer - for(char *k = line; *k; k++) { - ioctl(fd, TIOCSTI, k); - } - // Restore the old settings - tcsetattr(fd,TCSANOW, &oldtio); - close(fd); - } else { - cerr << "Can not open " << tty << "." << endl; - exit(1); + for(int k = 0; new_string[k]; k++) { + code = code * 387433 + (unsigned int) (new_string[k]); } + + code = code % hash_table_size; + + while(hash_table[code] >= 0) { + if(strcmp(new_string, strings[hash_table[code]]) == 0) { + int result = hash_table[code]; + hash_table[code] = new_index; + return result; + } + code = (code + 1) % hash_table_size; + } + + hash_table[code] = new_index; + + return -1; } ////////////////////////////////////////////////////////////////////// +// A matcher matches either with a collection of substrings, or with a +// regexp + +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) { + 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 { + return regexec(&matcher->preg, string, 0, 0, 0) == 0; + } +} -int match(char *string, int nb_patterns, char **patterns) { - for(int n = 0; n < nb_patterns; n++) { - if(strstr(string, patterns[n]) == 0) return 0; +void free_matcher(matcher_t *matcher) { + if(matcher->nb_patterns >= 0) { + delete[] matcher->splitted_patterns; + delete[] matcher->patterns; + } else { + if(!matcher->regexp_error) regfree(&matcher->preg); } - return 1; } -////////////////////////////////////////////////////////////////////// +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, case_sensitive ? 0 : REG_ICASE); + } else { + matcher->regexp_error = 0; + matcher->nb_patterns = 1; + matcher->case_sensitive = case_sensitive; -void check_opt(int argc, char **argv, int n_opt, int n, const char *help) { - if(n_opt + n >= argc) { - cerr << "Missing argument for " << argv[n_opt] << "." - << " " - << "Expecting " << help << "." - << endl; - exit(1); + for(const char *s = pattern; *s; s++) { + if(*s == pattern_separator) { + matcher->nb_patterns++; + } + } + + matcher->splitted_patterns = new char[strlen(pattern) + 1]; + matcher->patterns = new char*[matcher->nb_patterns]; + + strcpy(matcher->splitted_patterns, pattern); + + int n = 0; + char *last_pattern_start = matcher->splitted_patterns; + for(char *s = matcher->splitted_patterns; n < matcher->nb_patterns; s++) { + if(*s == pattern_separator || *s == '\0') { + *s = '\0'; + matcher->patterns[n++] = last_pattern_start; + last_pattern_start = s + 1; + } + } } } ////////////////////////////////////////////////////////////////////// -int previous_visible(int current_line, int nb_lines, char **lines, int nb_patterns, char **patterns) { +int previous_visible(int current_line, int nb_lines, char **lines, matcher_t *matcher) { int line = current_line - 1; - while(line >= 0 && !match(lines[line], nb_patterns, patterns)) line--; + while(line >= 0 && !match(lines[line], matcher)) line--; return line; } -int next_visible(int current_line, int nb_lines, char **lines, int nb_patterns, char **patterns) { +int next_visible(int current_line, int nb_lines, char **lines, matcher_t *matcher) { int line = current_line + 1; - while(line < nb_lines && !match(lines[line], nb_patterns, patterns)) line++; + while(line < nb_lines && !match(lines[line], matcher)) line++; if(line < nb_lines) return line; @@ -143,36 +210,16 @@ int next_visible(int current_line, int nb_lines, char **lines, int nb_patterns, return -1; } +////////////////////////////////////////////////////////////////////// + void update_screen(int *current_line, int *temporary_line, int motion, int nb_lines, char **lines, - char *pattern_list) { + char *pattern) { char buffer[buffer_size]; + matcher_t matcher; - // We split the pattern list into individual patterns - - int nb_patterns = 1; - - for(char *s = pattern_list; *s; s++) { - if(*s == pattern_separator) { - nb_patterns++; - } - } - - char splitted_patterns[strlen(pattern_list) + 1]; - char *patterns[nb_patterns]; - - strcpy(splitted_patterns, pattern_list); - - int n = 0; - char *last_pattern_start = splitted_patterns; - for(char *s = splitted_patterns; n < nb_patterns; s++) { - if(*s == pattern_separator || *s == '\0') { - *s = '\0'; - patterns[n++] = last_pattern_start; - last_pattern_start = s + 1; - } - } + initialize_matcher(use_regexp, case_sensitive, &matcher, pattern); // We now take care of printing the lines per se @@ -182,141 +229,145 @@ void update_screen(int *current_line, int *temporary_line, int motion, // First, we find a visible line. In priority: The current, or the // first visible after it, or the first visible before it. - int new_line; - if(match(lines[*current_line], nb_patterns, patterns)) { - new_line = *current_line; - } else { - new_line = next_visible(*current_line, nb_lines, lines, nb_patterns, patterns); - if(new_line < 0) { - new_line = previous_visible(*current_line, nb_lines, lines, nb_patterns, patterns); - } - } + int nb_printed_lines = 0; - // If we found a visible line and we should move, let's move + clear(); + use_default_colors(); + addstr("\n"); - if(new_line >= 0 && motion != 0) { - int l = new_line; - if(motion > 0) { - // We want to go down, let's find the first visible line below - for(int m = 0; l >= 0 && m < motion; m++) { - l = next_visible(l, nb_lines, lines, nb_patterns, patterns); - if(l >= 0) { - new_line = l; - } - } + if(matcher.regexp_error) { + addstr("[regexp error]"); + } else if(nb_lines > 0) { + int new_line; + if(match(lines[*current_line], &matcher)) { + new_line = *current_line; } else { - // We want to go up, let's find the first visible line above - for(int m = 0; l >= 0 && m < -motion; m++) { - l = previous_visible(l, nb_lines, lines, nb_patterns, patterns); - if(l >= 0) { - new_line = l; - } + new_line = next_visible(*current_line, nb_lines, lines, &matcher); + if(new_line < 0) { + new_line = previous_visible(*current_line, nb_lines, lines, &matcher); } } - } - clear(); - - use_default_colors(); - - addstr("\n"); + // If we found a visible line and we should move, let's move - int nb_printed_lines = 1; + if(new_line >= 0 && motion != 0) { + int l = new_line; + if(motion > 0) { + // We want to go down, let's find the first visible line below + for(int m = 0; l >= 0 && m < motion; m++) { + l = next_visible(l, nb_lines, lines, &matcher); + if(l >= 0) { + new_line = l; + } + } + } else { + // We want to go up, let's find the first visible line above + for(int m = 0; l >= 0 && m < -motion; m++) { + l = previous_visible(l, nb_lines, lines, &matcher); + if(l >= 0) { + new_line = l; + } + } + } + } - // Here new_line is either a line number matching the patterns, or -1 + // Here new_line is either a line number matching the patterns, or -1 - if(new_line >= 0) { + if(new_line >= 0) { - int first_line = new_line, last_line = new_line, nb_match = 1; + int first_line = new_line, last_line = new_line, nb_match = 1; - // We find the first and last line to show, so that the total of - // visible lines between them (them include) is console_height - 1 + // We find the first and last line to show, so that the total of + // visible lines between them (them include) is console_height - 1 - while(nb_match < console_height-1 && (first_line > 0 || last_line < nb_lines - 1)) { + while(nb_match < console_height-1 && (first_line > 0 || last_line < nb_lines - 1)) { - if(first_line > 0) { - first_line--; - while(first_line > 0 && !match(lines[first_line], nb_patterns, patterns)) { + if(first_line > 0) { first_line--; + while(first_line > 0 && !match(lines[first_line], &matcher)) { + first_line--; + } + if(match(lines[first_line], &matcher)) { + nb_match++; + } } - if(match(lines[first_line], nb_patterns, patterns)) { - nb_match++; - } - } - if(last_line < nb_lines - 1) { - last_line++; - while(last_line < nb_lines - 1 && !match(lines[last_line], nb_patterns, patterns)) { + if(nb_match < console_height - 1 && last_line < nb_lines - 1) { last_line++; - } + while(last_line < nb_lines - 1 && !match(lines[last_line], &matcher)) { + last_line++; + } - if(match(lines[last_line], nb_patterns, patterns)) { - nb_match++; + if(match(lines[last_line], &matcher)) { + nb_match++; + } } } - } - - // Now we display them - - for(int l = first_line; l <= last_line; l++) { - if(match(lines[l], nb_patterns, patterns)) { - int k = 0; - while(lines[l][k] && k < buffer_size - 2 && k < console_width - 2) { - buffer[k] = lines[l][k]; - k++; - } + // Now we display them - // We fill the rest of the line with blanks if either we did - // not clear() or if this is the highlighted line + for(int l = first_line; l <= last_line; l++) { + if(match(lines[l], &matcher)) { + int k = 0; - if(l == new_line) { - while(k < console_width) { - buffer[k++] = ' '; + while(lines[l][k] && k < buffer_size - 2 && k < console_width - 2) { + buffer[k] = lines[l][k]; + k++; } - } - buffer[k++] = '\n'; - buffer[k++] = '\0'; + // We fill the rest of the line with blanks if either we did + // not clear() or if this is the highlighted line - // Highlight the highlighted line ... + if(l == new_line) { + while(k < console_width) { + buffer[k++] = ' '; + } + } - if(l == new_line) { - if(with_colors) { - attron(COLOR_PAIR(2)); - addnstr(buffer, console_width); - attroff(COLOR_PAIR(2)); + buffer[k++] = '\n'; + buffer[k++] = '\0'; + + // Highlight the highlighted line ... + + if(l == new_line) { + if(with_colors) { + attron(COLOR_PAIR(2)); + addnstr(buffer, console_width); + attroff(COLOR_PAIR(2)); + } else { + attron(A_STANDOUT); + addnstr(buffer, console_width); + attroff(A_STANDOUT); + } } else { - attron(A_STANDOUT); addnstr(buffer, console_width); - attroff(A_STANDOUT); } - } else { - addnstr(buffer, console_width); - } - nb_printed_lines++; + nb_printed_lines++; + } } - } - if(motion != 0) { - *current_line = new_line; + if(motion != 0) { + *current_line = new_line; + } } - } - *temporary_line = new_line; + *temporary_line = new_line; - if(nb_printed_lines == 1) { - addnstr("[no selection]\n", console_width); - nb_printed_lines++; + 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", - nb_printed_lines - 1, + sprintf(buffer, "%d/%d pattern: %s%s", + nb_printed_lines, nb_lines, - pattern_list); + pattern, + use_regexp ? " [regexp]" : ""); for(int k = strlen(buffer); k < console_width; k++) buffer[k] = ' '; buffer[console_width] = '\0'; @@ -335,12 +386,19 @@ void update_screen(int *current_line, int *temporary_line, int motion, // We are done refresh(); + free_matcher(&matcher); } ////////////////////////////////////////////////////////////////////// int main(int argc, char **argv) { - char buffer[buffer_size]; + + if(!ttyname(STDIN_FILENO)) { + cerr << "The standard input is not a tty." << endl; + exit(1); + } + + char buffer[buffer_size], raw_line[buffer_size];; int color_fg_modeline, color_bg_modeline; int color_fg_highlight, color_bg_highlight; @@ -357,7 +415,9 @@ int main(int argc, char **argv) { strcpy(output_filename, ""); int i = 1; - while(i < argc) { + int error = 0, show_help = 0; + + while(!error && !show_help && i < argc) { if(strcmp(argv[i], "-o") == 0) { check_opt(argc, argv, i, 1, ""); @@ -392,18 +452,28 @@ int main(int argc, char **argv) { i++; } + else if(strcmp(argv[i], "-b") == 0) { + bash_history = 1; + i++; + } + else if(strcmp(argv[i], "-z") == 0) { zsh_history = 1; i++; } - else if(strcmp(argv[i], "-b") == 0) { - bash_history = 1; + else if(strcmp(argv[i], "-d") == 0) { + remove_duplicates = 1; i++; } - else if(strcmp(argv[i], "-r") == 0) { - remove_duplicates = 1; + else if(strcmp(argv[i], "-e") == 0) { + use_regexp = 1; + i++; + } + + else if(strcmp(argv[i], "-a") == 0) { + case_sensitive = 1; i++; } @@ -422,32 +492,47 @@ int main(int argc, char **argv) { i += 5; } + else if(strcmp(argv[i], "-h") == 0) { + show_help = 1; + i++; + } + else { - cerr << "Selector version " << VERSION - << endl - << "Written by Francois Fleuret " - << endl - << argv[0] - << " [-h]" - << " [-v]" - << " [-m]" - << " [-r]" - << " [-z]" - << " [-i]" - << " [-c ]" - << " [-o ]" - << " [-s ]" - << " [-l ]" - << " -f " - << endl; - if(strcmp(argv[i], "-h") == 0) { - exit(0); - } else { - exit(1); - } + cerr << "Unknown argument " << argv[i] << "." << endl; + error = 1; } } + if(show_help || error) { + cerr << "Selector version " << VERSION << "-R" << REVISION_NUMBER + << endl + << "Written by Francois Fleuret ." + << endl + << endl + << "Usage: " << argv[0] << " [options] -f " << endl + << endl + << " -h show this help" << endl + << " -v inject the selected line in the tty" << endl + << " -d remove duplicated lines" << endl + << " -b remove the bash history line prefix" << endl + << " -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 + << " -c " << endl + << " set the display colors" << endl + << " -o " << endl + << " set a file to write the selected line to" << endl + << " -s " << endl + << " set the symbol to separate substrings in the pattern" << endl + << " -l " << endl + << " set the maximum number of lines to take into account" << endl + << endl; + + exit(error); + } + char **lines = new char *[nb_lines_max]; if(!input_filename[0]) { @@ -464,10 +549,38 @@ int main(int argc, char **argv) { return 1; } + int hash_table_size = nb_lines_max * 10; + int *hash_table = 0; + + if(remove_duplicates) { + hash_table = new_hash_table(hash_table_size); + } + while(nb_lines < nb_lines_max && !file.eof()) { - file.getline(buffer, buffer_size); - if(strcmp(buffer, "") != 0) { - char *s = buffer; + + file.getline(raw_line, buffer_size); + + if(raw_line[0]) { + + if(file.fail()) { + cerr << "Line too long:" << endl; + cerr << raw_line << endl; + exit(1); + } + + char *s, *t; + const char *u; + + s = buffer; + t = raw_line; + while(*t) { + u = unctrl(*t++); + while(*u) { *s++ = *u++; } + } + *s = '\0'; + + s = buffer; + if(zsh_history && *s == ':') { while(*s && *s != ';') s++; if(*s == ';') s++; @@ -477,13 +590,39 @@ int main(int argc, char **argv) { while(*s == ' ' || (*s >= '0' && *s <= '9')) s++; } - if(!remove_duplicates || nb_lines == 0 || strcmp(lines[nb_lines - 1], s)) { + int dup; + + if(hash_table) { + dup = test_and_add(s, nb_lines, lines, hash_table, hash_table_size); + } else { + dup = -1; + } + + if(dup < 0) { lines[nb_lines] = new char[strlen(s) + 1]; strcpy(lines[nb_lines], s); - nb_lines++; + } else { + // 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; } + + nb_lines++; + } + } + + delete[] hash_table; + + // Now remove the null strings + + int n = 0; + for(int k = 0; k < nb_lines; k++) { + if(lines[k]) { + lines[n++] = lines[k]; } } + nb_lines = n; if(inverse_order) { for(int i = 0; i < nb_lines/2; i++) { @@ -493,13 +632,24 @@ int main(int argc, char **argv) { } } - char patterns[buffer_size]; - patterns[0] = '\0'; - int patterns_point; - patterns_point = 0; + char pattern[buffer_size]; + pattern[0] = '\0'; + int pattern_point; + pattern_point = 0; + + ////////////////////////////////////////////////////////////////////// + // Here we start to display with curse initscr(); + noecho(); + + // Hide the cursor + curs_set(0); + + // So that the arrow keys work + keypad(stdscr, TRUE); + if(with_colors) { if(has_colors()) { start_color(); @@ -520,14 +670,10 @@ int main(int argc, char **argv) { } } - noecho(); - curs_set(0); // Hide the cursor - keypad(stdscr, TRUE); // So that the arrow keys work - int key; int current_line = 0, temporary_line = 0; - update_screen(¤t_line, &temporary_line, 0, nb_lines, lines, patterns); + update_screen(¤t_line, &temporary_line, 0, nb_lines, lines, pattern); do { @@ -536,15 +682,15 @@ int main(int argc, char **argv) { int motion = 0; if(key >= ' ' && key <= '~') { - patterns[patterns_point++] = key; - patterns[patterns_point] = '\0'; + pattern[pattern_point++] = key; + pattern[pattern_point] = '\0'; } - else if(key == KEY_BACKSPACE || key == '' || + else if(key == KEY_BACKSPACE || key == '' || key == '' || key == KEY_DC || key == '') { - if(patterns_point > 0) { - patterns_point--; - patterns[patterns_point] = '\0'; + if(pattern_point > 0) { + pattern_point--; + pattern[pattern_point] = '\0'; } } @@ -564,16 +710,25 @@ int main(int argc, char **argv) { motion = -10; } + else if(key == KEY_DOWN || key == '') { + motion = 1; + } + else if(key == KEY_UP || key == '') { motion = -1; } - else if(key == KEY_DOWN || key == '') { - motion = 1; + else if(key == '') { + use_regexp = !use_regexp; + } + + else if(key == '') { + pattern_point = 0; + pattern[pattern_point] = '\0'; } update_screen(¤t_line, &temporary_line, motion, - nb_lines, lines, patterns); + nb_lines, lines, pattern); } while(key != '\n' && key != KEY_ENTER && key != ''); @@ -581,6 +736,9 @@ int main(int argc, char **argv) { curs_set(1); endwin(); + ////////////////////////////////////////////////////////////////////// + // Here we come back to standard display + if((key == KEY_ENTER || key == '\n')) { if(output_to_vt_buffer) { @@ -609,6 +767,7 @@ int main(int argc, char **argv) { for(int l = 0; l < nb_lines; l++) { delete[] lines[l]; } + delete[] lines; exit(0);