X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.cc;h=e1ecf98ad080ff2f80589342dba30202e7be32ce;hb=287c4f215525607851ea65c0c5887cabac16b43f;hp=b8011b8bebc83213157a5236b5783a1ccce2d7eb;hpb=7479503f1466d84f72376aa26f43a801c2eaf7f8;p=selector.git diff --git a/selector.cc b/selector.cc index b8011b8..e1ecf98 100644 --- a/selector.cc +++ b/selector.cc @@ -1,7 +1,7 @@ /* - * selector is a simple shell command for selection of strings with a - * dynamic pattern-matching. + * selector is a simple command line utility for selection of strings + * with a dynamic pattern-matching. * * Copyright (c) 2009 Francois Fleuret * Written by Francois Fleuret @@ -22,11 +22,8 @@ * */ -// Here is how to use it as a super-history-search -// ./selector -v -f ${HISTFILE} - -// This software is highly Linux-specific, but I would be glad to get -// patches to make it work on other OS +// To use it as a super-history-search for bash: +// alias h='selector -d -i -b -v -f <(history)' #include #include @@ -38,25 +35,44 @@ #include #include #include +#include using namespace std; #define VERSION "1.0" +const int buffer_size = 4096; + // Yeah, global variables! -int buffer_size = 1024; -int nb_lines_max = 10000; +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; +int case_sensitive = 0; +char *title = 0; + +#define COLOR_MODELINE 1 +#define COLOR_HIGHLIGHTED_LINE 2 ////////////////////////////////////////////////////////////////////// -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 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); } - return 1; + // Restore the old settings + tcsetattr(STDIN_FILENO, TCSANOW, &oldtio); } ////////////////////////////////////////////////////////////////////// @@ -71,234 +87,552 @@ void check_opt(int argc, char **argv, int n_opt, int n, const char *help) { } } -////////////////////////////////////////////////////////////////////// +int string_to_positive_integer(char *string) { + int error = 0; + int result = 0; -int previous_visible(int current_line, int nb_lines, char **lines, int nb_patterns, char **patterns) { - int line = current_line - 1; - while(line >= 0 && !match(lines[line], nb_patterns, patterns)) line--; - return line; + if(*string) { + for(char *s = string; *s; s++) { + if(*s >= '0' && *s <= '9') { + result = result * 10 + int(*s - '0'); + } else error = 1; + } + } else error = 1; + + if(error) { + cerr << "Value `" << string << "' is not a positive integer." << endl; + exit(1); + } + + return result; } -int next_visible(int current_line, int nb_lines, char **lines, int nb_patterns, char **patterns) { - int line = current_line + 1; - while(line < nb_lines && !match(lines[line], nb_patterns, patterns)) line++; +////////////////////////////////////////////////////////////////////// +// A quick and dirty hash table - if(line < nb_lines) - return line; - else - return -1; +// 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]; + for(int k = 0; k < hash_table_size; k++) { + result[k] = -1; + } + return result; } -void update_screen(int *current_line, int *temporary_line, int motion, - int nb_lines, char **lines, - char *pattern_list, - int no_blink) { +// 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. - char buffer[buffer_size]; +int test_and_add(char *new_string, int new_index, + char **strings, int *hash_table, int hash_table_size) { + unsigned int code = 0; - // We split the pattern list into individual patterns + // 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) - int nb_patterns = 1; + for(int k = 0; new_string[k]; k++) { + code = code * 387433 + (unsigned int) (new_string[k]); + } - for(char *s = pattern_list; *s; s++) { - if(*s == pattern_separator) { - nb_patterns++; + 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; } - char splitted_patterns[strlen(pattern_list) + 1]; - char *patterns[nb_patterns]; - - strcpy(splitted_patterns, pattern_list); + // This string was not already in there, store the index in the + // table and return -1 + hash_table[code] = new_index; + return -1; +} - 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; +////////////////////////////////////////////////////////////////////// +// 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; } +} - // We now take care of printing the lines per se +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 console_width = getmaxx(stdscr); - int console_height = getmaxy(stdscr); +void initialize_matcher(int use_regexp, int case_sensitive, + matcher_t *matcher, const char *pattern) { - int nb_printed_lines = 1; + 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; - // First, we find a visible line. In priority: The current, or the - // first visible after it, or the first visible before it. + for(const char *s = pattern; *s; s++) { + if(*s == pattern_separator) { + matcher->nb_patterns++; + } + } - 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); + 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; + } } } +} - // If we found a visible line and we should move, let's move +////////////////////////////////////////////////////////////////////// +// Buffer edition + +void delete_char(char *buffer, int *position) { + if(buffer[*position]) { + int c = *position; + while(c < buffer_size && buffer[c]) { + buffer[c] = buffer[c+1]; + c++; + } + } +} - 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; - } +void backspace_char(char *buffer, int *position) { + if(*position > 0) { + if(buffer[*position]) { + int c = *position - 1; + while(buffer[c]) { + buffer[c] = buffer[c+1]; + c++; } } 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; - } - } + buffer[*position - 1] = '\0'; } + + (*position)--; } +} - if(!no_blink) { - clear(); +void insert_char(char *buffer, int *position, char character) { + if(strlen(buffer) < buffer_size - 1) { + int c = *position; + char t = buffer[c], u; + while(t) { + c++; + u = buffer[c]; + buffer[c] = t; + t = u; + } + c++; + buffer[c] = '\0'; + buffer[(*position)++] = character; } +} - use_default_colors(); +void kill_before_cursor(char *buffer, int *position) { + int s = 0; + while(buffer[*position + s]) { + buffer[s] = buffer[*position + s]; + s++; + } + buffer[s] = '\0'; + *position = 0; +} - addstr("\n"); +void kill_after_cursor(char *buffer, int *position) { + buffer[*position] = '\0'; +} + +////////////////////////////////////////////////////////////////////// + +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], matcher)) line--; + return line; +} + +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], matcher)) line++; + + if(line < nb_lines) + return line; + else + return -1; +} - // Here new_line is either a line number matching the patterns, or -1 +////////////////////////////////////////////////////////////////////// - if(new_line >= 0) { +void update_screen(int *current_line, int *temporary_line, int motion, + int nb_lines, char **lines, + int cursor_position, + char *pattern) { - int first_line = new_line, last_line = new_line, nb_match = 1; + char buffer[buffer_size]; + matcher_t matcher; - // We find the first and last line to show, so that the total of - // visible lines between them (them include) is console_height - 1 + initialize_matcher(use_regexp, case_sensitive, &matcher, pattern); - while(nb_match < console_height-1 && (first_line > 0 || last_line < nb_lines - 1)) { + // We now take care of printing the lines per se - if(first_line > 0) { - first_line--; - while(first_line > 0 && !match(lines[first_line], nb_patterns, patterns)) { - first_line--; - } - if(match(lines[first_line], nb_patterns, patterns)) { - nb_match++; - } + int console_width = getmaxx(stdscr); + int console_height = getmaxy(stdscr); + + // First, we find a visible line. In priority: The current, or the + // first visible after it, or the first visible before it. + + int nb_printed_lines = 0; + + clear(); + use_default_colors(); + addstr("\n"); + + 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 { + 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(last_line < nb_lines - 1) { - last_line++; - while(last_line < nb_lines - 1 && !match(lines[last_line], nb_patterns, patterns)) { - last_line++; - } + // If we found a visible line and we should move, let's move - if(match(lines[last_line], nb_patterns, patterns)) { - nb_match++; + 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; + } } } } - // Now we display them + // Here new_line is either a line number matching the patterns, or -1 + + if(new_line >= 0) { + + int first_line = new_line, last_line = new_line, nb_match = 1; - for(int l = first_line; l <= last_line; l++) { - if(match(lines[l], nb_patterns, patterns)) { - int k = 0; + // 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(lines[l][k] && k < buffer_size - 2 && k < console_width - 2) { - buffer[k] = lines[l][k]; - k++; + 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], &matcher)) { + first_line--; + } + if(match(lines[first_line], &matcher)) { + nb_match++; + } } - // We fill the rest of the line with blanks if either we did - // not clear() or if this is the highlighted line + 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(no_blink || l == new_line) { - while(k < console_width) { - buffer[k++] = ' '; + if(match(lines[last_line], &matcher)) { + nb_match++; } } + } - buffer[k++] = '\n'; - buffer[k++] = '\0'; + // Now we display them - // Highlight the highlighted line ... + for(int l = first_line; l <= last_line; l++) { + if(match(lines[l], &matcher)) { + int k = 0; - if(l == new_line) { - attron(COLOR_PAIR(2)); - addnstr(buffer, console_width); - attroff(COLOR_PAIR(2)); - } else { - addnstr(buffer, console_width); + while(lines[l][k] && k < buffer_size - 2 && k < console_width - 2) { + buffer[k] = lines[l][k]; + 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'; + + // Highlight the highlighted line ... + + if(l == new_line) { + if(with_colors) { + attron(COLOR_PAIR(COLOR_HIGHLIGHTED_LINE)); + addnstr(buffer, console_width); + attroff(COLOR_PAIR(COLOR_HIGHLIGHTED_LINE)); + } 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; } } *temporary_line = new_line; - if(motion != 0) { - *current_line = new_line; - } - } - if(nb_printed_lines == 1) { - addnstr("[no selection]\n", console_width); - nb_printed_lines++; - } - - if(no_blink) { // Erase the rest of the window. That's slightly ugly. - int k = 0; - while(k < console_width) { - buffer[k++] = ' '; - } - buffer[k++] = '\n'; - buffer[k++] = '\0'; - for(int l = nb_printed_lines; l < console_height; l++) { - addnstr(buffer, console_width); + 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, - nb_lines, - pattern_list); + move(0, 0); + + if(with_colors) { + attron(COLOR_PAIR(COLOR_MODELINE)); + } 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); - attron(COLOR_PAIR(1)); - addnstr(buffer, console_width); - attroff(COLOR_PAIR(1)); + + // There must be a more elegant way of moving the cursor at a + // location met during display + + int cursor_x = 0; + + if(title) { + addstr(title); + addstr(" "); + cursor_x += strlen(title) + 1; + } + + sprintf(buffer, "%d/%d ", nb_printed_lines, nb_lines); + addstr(buffer); + cursor_x += strlen(buffer); + + addnstr(pattern, cursor_position); + cursor_x += cursor_position; + + if(pattern[cursor_position]) { + addstr(pattern + cursor_position); + } else { + addstr(" "); + } + + if(use_regexp || case_sensitive) { + addstr("["); + if(use_regexp) { + addstr("regexp"); + } + + if(case_sensitive) { + if(use_regexp) { + addstr(","); + } + addstr("case"); + } + addstr("]"); + } + + move(0, cursor_x); + + if(with_colors) { + attroff(COLOR_PAIR(COLOR_MODELINE)); + } else { + attroff(A_REVERSE); + } // We are done refresh(); + free_matcher(&matcher); +} + +////////////////////////////////////////////////////////////////////// + +void read_file(const char *input_filename, + int nb_lines_max, int *nb_lines, char **lines, + int hash_table_size, int *hash_table) { + + char buffer[buffer_size], raw_line[buffer_size];; + + ifstream file(input_filename); + + if(file.fail()) { + cerr << "Can not open " << input_filename << endl; + exit(1); + } + + while(*nb_lines < nb_lines_max && !file.eof()) { + + 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++; + } + + if(bash_history && (*s == ' ' || (*s >= '0' && *s <= '9'))) { + while(*s == ' ' || (*s >= '0' && *s <= '9')) 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); + } else { + // 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; + } + + (*nb_lines)++; + } + } } ////////////////////////////////////////////////////////////////////// int main(int argc, char **argv) { - char buffer[buffer_size]; - char *lines[nb_lines_max]; - int no_blink = 0; - int theme = 0; + + if(!ttyname(STDIN_FILENO)) { + cerr << "The standard input is not a tty." << endl; + exit(1); + } + + int color_fg_modeline, color_bg_modeline; + int color_fg_highlight, color_bg_highlight; + + color_fg_modeline = COLOR_WHITE; + color_bg_modeline = COLOR_BLACK; + color_fg_highlight = COLOR_BLACK; + color_bg_highlight = COLOR_YELLOW; + + setlocale(LC_ALL, ""); char input_filename[buffer_size], output_filename[buffer_size]; + strcpy(input_filename, ""); - strcpy(output_filename, "/tmp/selector.out"); + strcpy(output_filename, ""); int i = 1; - while(i < argc) { + int error = 0, show_help = 0; + int rest_are_files = 0; + + while(!error && !show_help && i < argc && argv[i][0] == '-' && !rest_are_files) { + if(strcmp(argv[i], "-o") == 0) { check_opt(argc, argv, i, 1, ""); strncpy(output_filename, argv[i+1], buffer_size); @@ -316,107 +650,210 @@ int main(int argc, char **argv) { 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], "-b") == 0) { - no_blink = 1; + bash_history = 1; i++; } + else if(strcmp(argv[i], "-z") == 0) { + zsh_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], "-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]); + nb_lines_max = string_to_positive_integer(argv[i+1]); i += 2; } - else if(strcmp(argv[i], "-t") == 0) { - check_opt(argc, argv, i, 1, "<color theme number>"); - theme = atoi(argv[i+1]); - i += 2; + else if(strcmp(argv[i], "-c") == 0) { + check_opt(argc, argv, i, 4, "<fg modeline> <bg modeline> <fg highlight> <bg highlight>"); + color_fg_modeline = string_to_positive_integer(argv[i + 1]); + color_bg_modeline = string_to_positive_integer(argv[i + 2]); + color_fg_highlight = string_to_positive_integer(argv[i + 3]); + color_bg_highlight = string_to_positive_integer(argv[i + 4]); + i += 5; + } + + else if(strcmp(argv[i], "--") == 0) { + rest_are_files = 1; + i++; + } + + else if(strcmp(argv[i], "-h") == 0) { + show_help = 1; + i++; } else { - cerr << "Selector version " << VERSION - << endl - << "Written by Francois Fleuret <francois@fleuret.org>" - << endl - << argv[0] - << " [-h]" - << " [-b]" - << " [-v]" - << " [-t <color theme number>]" - << " [-o <output filename>]" - << " [-s <pattern separator>]" - << " [-l <max number of lines>]" - << " -f <input filename>" - << endl; - if(strcmp(argv[i], "-h") == 0) { - exit(0); - } else { - exit(1); - } + cerr << "Unknown option " << argv[i] << "." << endl; + error = 1; } } - if(!input_filename[0]) { - cerr << "You must specify a input file with -f." << endl; - exit(1); + if(show_help || error) { + cerr << "Selector version " << VERSION << "-R" << REVISION_NUMBER + << endl + << "Written by Francois Fleuret <francois@fleuret.org>." + << endl + << endl + << "Usage: " << argv[0] << " [options] [<filename1> [<filename2> ...]]" << 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 + << " -- rest of the arguments are filenames" << 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 + << " set a file to write the selected line to" << endl + << " -s <pattern separator>" << endl + << " set the symbol to separate substrings in the pattern" << endl + << " -l <max number of lines>" << endl + << " set the maximum number of lines to take into account" << endl + << endl; + + exit(error); } - ifstream file(input_filename); + char **lines = new char *[nb_lines_max]; - if(file.fail()) { - 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); } - int nb_lines = 0; - 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(i == argc && !input_filename[0]) { + // cerr << "You must provide a filename." << endl; + // exit(1); + // } + + if(input_filename[0]) { + read_file(input_filename, + nb_lines_max, &nb_lines, lines, + hash_table_size, hash_table); } - char patterns[buffer_size]; - patterns[0] = '\0'; - int patterns_point; - patterns_point = 0; + while(i < argc) { + read_file(argv[i], + nb_lines_max, &nb_lines, lines, + hash_table_size, hash_table); + i++; + } - initscr(); + delete[] hash_table; - if(!has_colors()) { - cerr << "No colors." << endl; - return 1; + // 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++) { + char *s = lines[nb_lines - 1 - i]; + lines[nb_lines - 1 - i] = lines[i]; + lines[i] = s; + } + } + + char pattern[buffer_size]; + pattern[0] = '\0'; + int cursor_position; + cursor_position = 0; + + ////////////////////////////////////////////////////////////////////// + // Here we start to display with curse + + initscr(); + noecho(); - curs_set(0); - keypad(stdscr, TRUE); - start_color(); + // Hide the cursor + // curs_set(0); + + // So that the arrow keys work + keypad(stdscr, TRUE); - switch(theme) { - default: - case 0: - init_pair(1, COLOR_WHITE, COLOR_GREEN); - init_pair(2, COLOR_BLACK, COLOR_YELLOW); - break; - case 1: - init_pair(1, COLOR_BLACK, COLOR_GREEN); - init_pair(2, COLOR_BLACK, COLOR_YELLOW); - break; + 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(COLOR_MODELINE , color_fg_modeline, color_bg_modeline); + init_pair(COLOR_HIGHLIGHTED_LINE, color_fg_highlight, color_bg_highlight); + } else { + with_colors = 0; + } } int key; - int current_line = 0, temporary_line = 0; - update_screen(¤t_line, &temporary_line, 0, nb_lines, lines, patterns, no_blink); + update_screen(¤t_line, &temporary_line, 0, nb_lines, lines, cursor_position, pattern); do { @@ -424,16 +861,19 @@ int main(int argc, char **argv) { int motion = 0; - if(key >= ' ' && key <= 'z') { - patterns[patterns_point++] = key; - patterns[patterns_point] = '\0'; + if(key >= ' ' && key <= '~') { // Insert character + insert_char(pattern, &cursor_position, key); } - else if(key == KEY_BACKSPACE || key == KEY_DC || key == '') { - if(patterns_point > 0) { - patterns_point--; - patterns[patterns_point] = '\0'; - } + else if(key == KEY_BACKSPACE || + key == '\010' || // ^H + key == '\177') { // ^? + backspace_char(pattern, &cursor_position); + } + + else if(key == KEY_DC || + key == '\004') { // ^D + delete_char(pattern, &cursor_position); } else if(key == KEY_HOME) { @@ -452,62 +892,94 @@ int main(int argc, char **argv) { motion = -10; } - else if(key == KEY_UP || key == '') { + else if(key == KEY_DOWN || + key == '\016') { // ^N + motion = 1; + } + + else if(key == KEY_UP || + key == '\020') { // ^P motion = -1; } - else if(key == KEY_DOWN || key == '') { - motion = 1; + else if(key == KEY_LEFT || + key == '\002') { // ^B + if(cursor_position > 0) cursor_position--; + } + + else if(key == KEY_RIGHT || + key == '\006') { // ^F + if(pattern[cursor_position]) cursor_position++; + } + + else if(key == '\001') { // ^A + cursor_position = 0; + } + + else if(key == '\005') { // ^E + cursor_position = strlen(pattern); + } + + else if(key == '\022') { // ^R + use_regexp = !use_regexp; + } + + else if(key == '\011') { // ^I + case_sensitive = !case_sensitive; + } + + else if(key == '\025') { // ^U + kill_before_cursor(pattern, &cursor_position); + } + + else if(key == '\013') { // ^K + kill_after_cursor(pattern, &cursor_position); } update_screen(¤t_line, &temporary_line, motion, - nb_lines, lines, patterns, no_blink); - } while(key != '\n' && key != KEY_ENTER && key != ''); + nb_lines, lines, cursor_position, pattern); + + } while(key != '\n' && key != KEY_ENTER && key != '\007'); // ^G echo(); - curs_set(1); + // curs_set(1); endwin(); - if((key == KEY_ENTER || key == '\n') && temporary_line >= 0 && temporary_line < nb_lines) { + ////////////////////////////////////////////////////////////////////// + // Here we come back to standard display + + if((key == KEY_ENTER || key == '\n')) { + if(output_to_vt_buffer) { - char *tty = ttyname(STDIN_FILENO); - int fd = open(tty, O_WRONLY); - - struct termios oldtio, newtio; - - if (fd >= 0) { - // Save current port settings - tcgetattr(fd,&oldtio); - bzero(&newtio, 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 = lines[temporary_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); + if(temporary_line >= 0 && temporary_line < nb_lines) { + inject_into_tty_buffer(lines[temporary_line]); } - } else { + } + + if(output_filename[0]) { ofstream out(output_filename); if(out.fail()) { cerr << "Can not open " << output_filename << " for writing." << endl; exit(1); } else { - out << lines[temporary_line] << endl; + if(temporary_line >= 0 && temporary_line < nb_lines) { + out << lines[temporary_line] << endl; + } else { + out << endl; + } } out.flush(); } + } else { + cout << "Aborted." << endl; } for(int l = 0; l < nb_lines; l++) { delete[] lines[l]; } + delete[] lines; + delete[] title; + exit(0); }