X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.cc;h=ebbd0214f7d068926bfc0ef6389ca370dc62b4d1;hb=0a66c657ac6a8c10207164fbd0444ca09db6684c;hp=50620b69f7a75e9b46f9830801028ccd4edca310;hpb=49a8d9563a444aeaa5e732ef658e8ddd900d4294;p=selector.git diff --git a/selector.cc b/selector.cc index 50620b6..ebbd021 100644 --- a/selector.cc +++ b/selector.cc @@ -1,58 +1,201 @@ -/////////////////////////////////////////////////////////////////////////// -// START_IP_HEADER // -// // -// This program is free software: you can redistribute it and/or modify // -// it under the terms of the version 3 of the GNU General Public License // -// as published by the Free Software Foundation. // -// // -// This program is distributed in the hope that it will be useful, but // -// WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // -// General Public License for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with this program. If not, see . // -// // -// Written by and Copyright (C) Francois Fleuret // -// Contact for comments & bug reports // -// // -// END_IP_HEADER // -/////////////////////////////////////////////////////////////////////////// +/* + * selector is a simple shell command for selection of strings with a + * dynamic pattern-matching. + * + * Copyright (c) 2009 Francois Fleuret + * Written by Francois Fleuret + * + * This file is part of selector. + * + * selector is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 3 as + * published by the Free Software Foundation. + * + * selector is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with selector. If not, see . + * + */ + +// To use it as a super-history-search for bash: +// +// alias h='selector -d -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 -#include -#include -#include #include +#include + +#include +#include #include +#include +#include +#include +#include +#include using namespace std; -int buffer_size = 1024; -int nb_lines_max = 100000; +#define VERSION "1.0" + +const int buffer_size = 1024; + +// Yeah, global variables! + +int nb_lines_max = 1000; +char pattern_separator = ';'; +int output_to_vt_buffer = 0; +int with_colors = 1; +int zsh_history = 0, bash_history = 0; +int inverse_order = 0; +int remove_duplicates = 0; +int use_regexp = 0; + +////////////////////////////////////////////////////////////////////// + +// This looks severely Linux-only ... + +void inject_into_tty_buffer(char *line) { + 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 line in the tty input buffer + for(char *k = line; *k; k++) { + ioctl(STDIN_FILENO, TIOCSTI, k); + } + // Restore the old settings + tcsetattr(STDIN_FILENO, TCSANOW, &oldtio); +} + +////////////////////////////////////////////////////////////////////// + +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 + +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; +} + +int test_and_add(char *new_string, int new_index, + char **strings, int *hash_table, int hash_table_size) { + unsigned int code = 0; -int match(char *string, char *regexp) { - return strstr(string, regexp) != 0; + // 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) + + 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) return 1; + code = (code + 1) % hash_table_size; + } + + hash_table[code] = new_index; + + return 0; +} + +////////////////////////////////////////////////////////////////////// +// 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; + 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; + } + return 1; + } else { + return regexec(&matcher->preg, string, 0, 0, 0) == 0; + } } -void check(int condition, const char *message) { - if(!condition) { - echo(); - curs_set(1); - endwin(); - cout << message << endl; +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); } } -int previous_visible(int current_line, int nb_lines, char **lines, char *regexp) { +void initialize_matcher(int use_regexp, matcher_t *matcher, const char *pattern) { + if(use_regexp) { + matcher->nb_patterns = -1; + matcher->regexp_error = regcomp(&matcher->preg, pattern, REG_ICASE); + } else { + matcher->regexp_error = 0; + matcher->nb_patterns = 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, matcher_t *matcher) { int line = current_line - 1; - while(line >= 0 && !match(lines[line], regexp)) line--; + while(line >= 0 && !match(lines[line], matcher)) line--; return line; } -int next_visible(int current_line, int nb_lines, char **lines, char *regexp) { +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], regexp)) line++; + while(line < nb_lines && !match(lines[line], matcher)) line++; if(line < nb_lines) return line; @@ -60,210 +203,401 @@ int next_visible(int current_line, int nb_lines, char **lines, char *regexp) { return -1; } -void update_screen(int *current_line, int motion, +////////////////////////////////////////////////////////////////////// + +void update_screen(int *current_line, int *temporary_line, int motion, int nb_lines, char **lines, - char *regexp, int noblink) { + char *pattern) { char buffer[buffer_size]; + matcher_t matcher; + + initialize_matcher(use_regexp, &matcher, pattern); + + // We now take care of printing the lines per se int console_width = getmaxx(stdscr); int console_height = getmaxy(stdscr); - int nb_printed_lines = 1, last_printer_line = -1; - // 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], regexp)) { - new_line = *current_line; - } else { - new_line = next_visible(*current_line, nb_lines, lines, regexp); - if(new_line < 0) { - new_line = previous_visible(*current_line, nb_lines, lines, regexp); - } - } + 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; - l += motion; + if(matcher.regexp_error) { + addstr("[regexp error]"); + } else { - if(motion > 0) { - // We want to go down, let's find the first visible line below - l = next_visible(new_line, nb_lines, lines, regexp); - if(l >= 0) { - new_line = l; - } + 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 - l = previous_visible(new_line, nb_lines, lines, regexp); - 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); } } - } - - if(!noblink) { - clear(); - } - use_default_colors(); + // If we found a visible line and we should move, let's move - 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, &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; + } + } + } + } - check(new_line < nb_lines, "Ouch!"); + // Here new_line is either a line number matching the patterns, or -1 - // Here new_line is either a line number matching the regexp, 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 - 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], regexp)) { + 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], regexp)) { - nb_match++; - } - } - if(last_line < nb_lines - 1) { - last_line++; - while(last_line < nb_lines - 1 && !match(lines[last_line], regexp)) { + 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], regexp)) { - nb_match++; + if(match(lines[last_line], &matcher)) { + nb_match++; + } } } - } - check(first_line >= 0 && last_line < nb_lines, "ouch2"); + // Now we display them - for(int l = first_line; l <= last_line; l++) { - if(match(lines[l], regexp)) { - int k = 0; + for(int l = first_line; l <= last_line; l++) { + if(match(lines[l], &matcher)) { + int k = 0; - while(lines[l][k] && k < buffer_size - 2 && k < console_width - 1) { - buffer[k] = lines[l][k]; - k++; - } + while(lines[l][k] && k < buffer_size - 2 && k < console_width - 2) { + buffer[k] = lines[l][k]; + k++; + } - if(noblink) { - while(k < console_width - 1) { - buffer[k++] = ' '; + // We fill the rest of the line with blanks if either we did + // not clear() or if this is the highlighted line + + if(l == new_line) { + while(k < console_width) { + buffer[k++] = ' '; + } } - } - buffer[k++] = '\n'; - buffer[k++] = '\0'; + 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 { + addnstr(buffer, console_width); + } - if(l == new_line) { - attron(COLOR_PAIR(2)); - addstr(buffer); - attroff(COLOR_PAIR(2)); - } else { - addstr(buffer); + nb_printed_lines++; } + } - last_printer_line = l; - nb_printed_lines++; + if(motion != 0) { + *current_line = new_line; } } - check(nb_printed_lines != nb_match, "ouch3"); + *temporary_line = new_line; - if(motion != 0) { - *current_line = new_line; - } - } - - if(noblink) { // Erase the rest of the window. That's slightly ugly. - int k = 0; - while(k < console_width - 1) { - buffer[k++] = ' '; - } - buffer[k++] = '\n'; - buffer[k++] = '\0'; - for(int l = nb_printed_lines; l < console_height; l++) { - addstr(buffer); + if(nb_printed_lines == 0) { + addnstr("[no selection]\n", console_width); } } // Draw the modeline + sprintf(buffer, "%d/%d pattern: %s%s", + nb_printed_lines, + nb_lines, + pattern, + use_regexp ? " [regexp]" : ""); + + for(int k = strlen(buffer); k < console_width; k++) buffer[k] = ' '; + buffer[console_width] = '\0'; + move(0, 0); - attron(COLOR_PAIR(1)); - sprintf(buffer, "%d/%d pattern: %s", nb_printed_lines - 1, nb_lines, regexp); - for(int k = strlen(buffer); k < console_width - 1; k++) buffer[k] = ' '; - buffer[console_width-1] = '\0'; - addstr(buffer); - attroff(COLOR_PAIR(1)); - - refresh(); // After doing something on the display, we refresh it + if(with_colors) { + attron(COLOR_PAIR(1)); + addnstr(buffer, console_width); + attroff(COLOR_PAIR(1)); + } else { + attron(A_REVERSE); + addnstr(buffer, console_width); + attroff(A_REVERSE); + } + + // We are done + + refresh(); + free_matcher(&matcher); } +////////////////////////////////////////////////////////////////////// + int main(int argc, char **argv) { char buffer[buffer_size]; - char *lines[nb_lines_max]; - int noblink = 1; + int color_fg_modeline, color_bg_modeline; + int color_fg_highlight, color_bg_highlight; - char *file_name; - char stdin_name[] = "/dev/stdin"; + color_fg_modeline = COLOR_WHITE; + color_bg_modeline = COLOR_BLACK; + color_fg_highlight = COLOR_BLACK; + color_bg_highlight = COLOR_YELLOW; - if(argc == 2 && strcmp(argv[1], "-")) { - file_name = argv[1]; - } else { - file_name = stdin_name; + setlocale(LC_ALL, ""); + + char input_filename[buffer_size], output_filename[buffer_size]; + + strcpy(input_filename, ""); + strcpy(output_filename, ""); + + int i = 1; + int error = 0, show_help = 0; + + while(!error && !show_help && i < argc) { + + if(strcmp(argv[i], "-o") == 0) { + check_opt(argc, argv, i, 1, ""); + strncpy(output_filename, argv[i+1], buffer_size); + i += 2; + } + + else if(strcmp(argv[i], "-s") == 0) { + check_opt(argc, argv, i, 1, ""); + pattern_separator = argv[i+1][0]; + i += 2; + } + + else if(strcmp(argv[i], "-v") == 0) { + output_to_vt_buffer = 1; + i++; + } + + else if(strcmp(argv[i], "-m") == 0) { + with_colors = 0; + i++; + } + + else if(strcmp(argv[i], "-f") == 0) { + check_opt(argc, argv, i, 1, ""); + strncpy(input_filename, argv[i+1], buffer_size); + i += 2; + } + + else if(strcmp(argv[i], "-i") == 0) { + inverse_order = 1; + i++; + } + + else if(strcmp(argv[i], "-z") == 0) { + zsh_history = 1; + i++; + } + + else if(strcmp(argv[i], "-b") == 0) { + bash_history = 1; + i++; + } + + else if(strcmp(argv[i], "-d") == 0) { + remove_duplicates = 1; + i++; + } + + else if(strcmp(argv[i], "-e") == 0) { + use_regexp = 1; + i++; + } + + else if(strcmp(argv[i], "-l") == 0) { + check_opt(argc, argv, i, 1, ""); + nb_lines_max = atoi(argv[i+1]); + i += 2; + } + + else if(strcmp(argv[i], "-c") == 0) { + check_opt(argc, argv, i, 4, " "); + color_fg_modeline = atoi(argv[i+1]); + color_bg_modeline = atoi(argv[i+2]); + color_fg_highlight = atoi(argv[i+3]); + color_bg_highlight = atoi(argv[i+4]); + i += 5; + } + + else if(strcmp(argv[i], "-h") == 0) { + show_help = 1; + i++; + } + + else { + 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 + << argv[0] + << " [-h]" + << " [-v]" + << " [-m]" + << " [-d]" + << " [-e]" + << " [-z]" + << " [-i]" + << " [-c ]" + << " [-o ]" + << " [-s ]" + << " [-l ]" + << " -f " + << endl; + + exit(error); + } + + char **lines = new char *[nb_lines_max]; + + if(!input_filename[0]) { + cerr << "You must specify a input file with -f." << endl; + exit(1); } - ifstream file(file_name); + int nb_lines = 0; + + ifstream file(input_filename); if(file.fail()) { - cerr << "Can not open \"" << file_name << "\"" << endl; + cerr << "Can not open " << input_filename << endl; return 1; } - int nb_lines = 0; + 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); - lines[nb_lines] = new char[strlen(buffer) + 1]; - strcpy(lines[nb_lines], buffer); - nb_lines++; + if(strcmp(buffer, "") != 0) { + char *s = buffer; + + if(zsh_history && *s == ':') { + while(*s && *s != ';') s++; + if(*s == ';') s++; + } + + if(bash_history && (*s == ' ' || (*s >= '0' && *s <= '9'))) { + while(*s == ' ' || (*s >= '0' && *s <= '9')) s++; + } + + if(!hash_table || !test_and_add(s, nb_lines, lines, hash_table, hash_table_size)) { + lines[nb_lines] = new char[strlen(s) + 1]; + strcpy(lines[nb_lines], s); + nb_lines++; + } + } + } + + delete[] hash_table; + + if(inverse_order) { + for(int i = 0; i < nb_lines/2; i++) { + char *s = lines[nb_lines - 1 - i]; + lines[nb_lines - 1 - i] = lines[i]; + lines[i] = s; + } } - char regexp[buffer_size]; - regexp[0] = '\0'; - int regexp_point; - regexp_point = 0; + char pattern[buffer_size]; + pattern[0] = '\0'; + int pattern_point; + pattern_point = 0; initscr(); - if(!has_colors()) { - cerr << "No colors." << endl; - return 1; + if(with_colors) { + if(has_colors()) { + start_color(); + if(color_fg_modeline < 0 || color_fg_modeline >= COLORS || + color_bg_modeline < 0 || color_bg_modeline >= COLORS || + color_fg_highlight < 0 || color_bg_highlight >= COLORS || + color_bg_highlight < 0 || color_bg_highlight >= COLORS) { + echo(); + curs_set(1); + endwin(); + cerr << "Color numbers have to be between 0 and " << COLORS - 1 << "." << endl; + exit(1); + } + init_pair(1, color_fg_modeline, color_bg_modeline); + init_pair(2, color_fg_highlight, color_bg_highlight); + } else { + with_colors = 0; + } } noecho(); - curs_set(0); - keypad(stdscr, TRUE); - - start_color(); - init_pair(1, COLOR_WHITE, COLOR_BLACK); - init_pair(2, COLOR_BLACK, COLOR_YELLOW); + curs_set(0); // Hide the cursor + keypad(stdscr, TRUE); // So that the arrow keys work int key; + int current_line = 0, temporary_line = 0; - int line = 0; - - update_screen(&line, 0, nb_lines, lines, regexp, noblink); + update_screen(¤t_line, &temporary_line, 0, nb_lines, lines, pattern); do { @@ -271,44 +605,91 @@ int main(int argc, char **argv) { int motion = 0; - if(key >= ' ' && key <= 'z') { - regexp[regexp_point++] = key; - regexp[regexp_point] = '\0'; + if(key >= ' ' && key <= '~') { + pattern[pattern_point++] = key; + pattern[pattern_point] = '\0'; } - else if(key == KEY_BACKSPACE || key == KEY_DC || key == '') { - if(regexp_point > 0) { - regexp_point--; - regexp[regexp_point] = '\0'; + 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_UP || key == '') { - motion = -1; + else if(key == KEY_HOME) { + current_line = 0; + } + + else if(key == KEY_END) { + current_line = nb_lines - 1; + } + + else if(key == KEY_NPAGE) { + motion = 10; + } + + else if(key == KEY_PPAGE) { + motion = -10; } else if(key == KEY_DOWN || key == '') { motion = 1; } - update_screen(&line, motion, nb_lines, lines, regexp, noblink); + else if(key == KEY_UP || 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, pattern); + } while(key != '\n' && key != KEY_ENTER && key != ''); echo(); curs_set(1); endwin(); - ofstream out("/tmp/selector.out"); - if((key == KEY_ENTER || key == '\n') && line >= 0 && line < nb_lines) { - out << lines[line] << endl; - } else { - out << endl; + if((key == KEY_ENTER || key == '\n')) { + + if(output_to_vt_buffer) { + if(temporary_line >= 0 && temporary_line < nb_lines) { + inject_into_tty_buffer(lines[temporary_line]); + } + } + + if(output_filename[0]) { + ofstream out(output_filename); + if(out.fail()) { + cerr << "Can not open " << output_filename << " for writing." << endl; + exit(1); + } else { + if(temporary_line >= 0 && temporary_line < nb_lines) { + out << lines[temporary_line] << endl; + } else { + out << endl; + } + } + out.flush(); + } + } - out.flush(); for(int l = 0; l < nb_lines; l++) { delete[] lines[l]; } - return 0; + delete[] lines; + + exit(0); }