X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.cc;h=99a9057cf2a64289cc8f7383e08ee72be6471137;hb=ed0a1fe13a90d9e96145bdcf1a13695e0eeb3a54;hp=71768e72883a49286683128a5790eb6c47af9529;hpb=3ea52eb74365a5388c8b37c716e5281263a4ae85;p=selector.git diff --git a/selector.cc b/selector.cc index 71768e7..99a9057 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 @@ -55,6 +55,10 @@ int remove_duplicates = 0; int use_regexp = 0; int case_sensitive = 0; char *title = 0; +int error_flash = 0; + +#define COLOR_MODELINE 1 +#define COLOR_HIGHLIGHTED_LINE 2 ////////////////////////////////////////////////////////////////////// @@ -84,9 +88,41 @@ 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; + + 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; +} + +void error_feedback() { + if(error_flash) { + flash(); + } else { + beep(); + } +} + ////////////////////////////////////////////////////////////////////// // 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]; @@ -96,6 +132,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; @@ -110,16 +150,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; } @@ -153,15 +200,17 @@ int match(char *string, matcher_t *matcher) { } void free_matcher(matcher_t *matcher) { - if(matcher->nb_patterns >= 0) { + if(matcher->nb_patterns < 0) { + if(!matcher->regexp_error) regfree(&matcher->preg); + } else { delete[] matcher->splitted_patterns; delete[] matcher->patterns; - } else { - if(!matcher->regexp_error) regfree(&matcher->preg); } } -void initialize_matcher(int use_regexp, int case_sensitive, 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, case_sensitive ? 0 : REG_ICASE); @@ -193,6 +242,65 @@ void initialize_matcher(int use_regexp, int case_sensitive, matcher_t *matcher, } } +////////////////////////////////////////////////////////////////////// +// 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++; + } + } else error_feedback(); +} + +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 { + buffer[*position - 1] = '\0'; + } + + (*position)--; + } else error_feedback(); +} + +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; + } else error_feedback(); +} + +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; +} + +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) { @@ -215,6 +323,7 @@ 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]; @@ -279,7 +388,7 @@ void update_screen(int *current_line, int *temporary_line, int motion, 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 + // visible lines between them (them included) is console_height-1 while(nb_match < console_height-1 && (first_line > 0 || last_line < nb_lines - 1)) { @@ -316,8 +425,8 @@ void update_screen(int *current_line, int *temporary_line, int motion, k++; } - // We fill the rest of the line with blanks if either we did - // not clear() or if this is the highlighted line + // We fill the rest of the line with blanks if this is the + // highlighted line if(l == new_line) { while(k < console_width) { @@ -332,9 +441,9 @@ void update_screen(int *current_line, int *temporary_line, int motion, if(l == new_line) { if(with_colors) { - attron(COLOR_PAIR(2)); + attron(COLOR_PAIR(COLOR_HIGHLIGHTED_LINE)); addnstr(buffer, console_width); - attroff(COLOR_PAIR(2)); + attroff(COLOR_PAIR(COLOR_HIGHLIGHTED_LINE)); } else { attron(A_STANDOUT); addnstr(buffer, console_width); @@ -364,32 +473,64 @@ void update_screen(int *current_line, int *temporary_line, int motion, // Draw the modeline - if(title) { - sprintf(buffer, "%s %d/%d pattern: %s%s", - title, - nb_printed_lines, - nb_lines, - pattern, - use_regexp ? " [regexp]" : ""); + move(0, 0); + + if(with_colors) { + attron(COLOR_PAIR(COLOR_MODELINE)); } else { - sprintf(buffer, "%d/%d pattern: %s%s", - nb_printed_lines, - nb_lines, - pattern, - use_regexp ? " [regexp]" : ""); + 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); + + // 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) { - attron(COLOR_PAIR(1)); - addnstr(buffer, console_width); - attroff(COLOR_PAIR(1)); + attroff(COLOR_PAIR(COLOR_MODELINE)); } else { - attron(A_REVERSE); - addnstr(buffer, console_width); attroff(A_REVERSE); } @@ -401,6 +542,88 @@ void update_screen(int *current_line, int *temporary_line, int motion, ////////////////////////////////////////////////////////////////////// +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; + + t = raw_line; + + // Remove the zsh history prefix + + if(zsh_history && *t == ':') { + while(*t && *t != ';') s++; + if(*t == ';') t++; + } + + // Remove the bash history prefix + + if(bash_history && (*t == ' ' || (*t >= '0' && *t <= '9'))) { + while(*t == ' ' || (*t >= '0' && *t <= '9')) t++; + } + + // Copy the string while transforming the ctrl characters into + // printable characters + + s = buffer; + + while(*t) { + u = unctrl(*t++); + while(*u) { *s++ = *u++; } + } + *s = '\0'; + + // Check for duplicates with the hash table and insert the line + // in the list if necessary + + int dup; + + if(hash_table) { + dup = test_and_add(buffer, *nb_lines, lines, hash_table, hash_table_size); + } else { + dup = -1; + } + + if(dup < 0) { + lines[*nb_lines] = new char[strlen(buffer) + 1]; + strcpy(lines[*nb_lines], buffer); + } 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) { if(!ttyname(STDIN_FILENO)) { @@ -408,7 +631,6 @@ int main(int argc, char **argv) { exit(1); } - char buffer[buffer_size], raw_line[buffer_size];; int color_fg_modeline, color_bg_modeline; int color_fg_highlight, color_bg_highlight; @@ -426,8 +648,9 @@ int main(int argc, char **argv) { int i = 1; int error = 0, show_help = 0; + int rest_are_files = 0; - while(!error && !show_help && i < argc) { + while(!error && !show_help && i < argc && argv[i][0] == '-' && !rest_are_files) { if(strcmp(argv[i], "-o") == 0) { check_opt(argc, argv, i, 1, ""); @@ -451,6 +674,11 @@ int main(int argc, char **argv) { i++; } + else if(strcmp(argv[i], "-q") == 0) { + error_flash = 1; + i++; + } + else if(strcmp(argv[i], "-f") == 0) { check_opt(argc, argv, i, 1, ""); strncpy(input_filename, argv[i+1], buffer_size); @@ -483,8 +711,6 @@ int main(int argc, char **argv) { } else if(strcmp(argv[i], "-a") == 0) { - case_sensitive = 1; - i++; } else if(strcmp(argv[i], "-t") == 0) { @@ -497,26 +723,31 @@ int main(int argc, char **argv) { else if(strcmp(argv[i], "-l") == 0) { check_opt(argc, argv, i, 1, ""); - nb_lines_max = atoi(argv[i+1]); + nb_lines_max = string_to_positive_integer(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]); + 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 << "Unknown argument " << argv[i] << "." << endl; + cerr << "Unknown option " << argv[i] << "." << endl; error = 1; } } @@ -527,7 +758,7 @@ int main(int argc, char **argv) { << "Written by Francois Fleuret ." << endl << endl - << "Usage: " << argv[0] << " [options] -f " << endl + << "Usage: " << argv[0] << " [options] [ [ ...]]" << endl << endl << " -h show this help" << endl << " -v inject the selected line in the tty" << endl @@ -538,6 +769,8 @@ int main(int argc, char **argv) { << " -e start in regexp mode" << endl << " -a case sensitive" << endl << " -m monochrome mode" << endl + << " -q make a flash instead of a beep on an edition error" << endl + << " -- rest of the arguments are filenames" << endl << " -t " << endl << " add a title in the modeline" << endl << " -c <fg modeline> <bg modeline> <fg highlight> <bg highlight>" << endl @@ -555,20 +788,7 @@ int main(int argc, char **argv) { char **lines = new char *[nb_lines_max]; - if(!input_filename[0]) { - cerr << "You must specify a input file with -f." << endl; - exit(1); - } - int nb_lines = 0; - - ifstream file(input_filename); - - if(file.fail()) { - cerr << "Can not open " << input_filename << endl; - return 1; - } - int hash_table_size = nb_lines_max * 10; int *hash_table = 0; @@ -576,60 +796,17 @@ int main(int argc, char **argv) { hash_table = new_hash_table(hash_table_size); } - 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 { - // 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; - } + if(input_filename[0]) { + read_file(input_filename, + nb_lines_max, &nb_lines, lines, + hash_table_size, hash_table); + } - nb_lines++; - } + while(i < argc) { + read_file(argv[i], + nb_lines_max, &nb_lines, lines, + hash_table_size, hash_table); + i++; } delete[] hash_table; @@ -642,10 +819,11 @@ int main(int argc, char **argv) { lines[n++] = lines[k]; } } + nb_lines = n; if(inverse_order) { - for(int i = 0; i < nb_lines/2; i++) { + 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; @@ -654,8 +832,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 @@ -664,27 +842,28 @@ int main(int argc, char **argv) { noecho(); - // Hide the cursor - curs_set(0); - // So that the arrow keys work keypad(stdscr, TRUE); 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); + + 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; } @@ -693,7 +872,7 @@ 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); do { @@ -701,17 +880,19 @@ 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 + insert_char(pattern, &cursor_position, key); } - 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_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) { @@ -730,30 +911,58 @@ int main(int argc, char **argv) { motion = -10; } - else if(key == KEY_DOWN || key == '') { + else if(key == KEY_DOWN || + key == '\016') { // ^N motion = 1; } - else if(key == KEY_UP || key == '') { + else if(key == KEY_UP || + key == '\020') { // ^P motion = -1; } - else if(key == '') { + else if(key == KEY_LEFT || + key == '\002') { // ^B + if(cursor_position > 0) cursor_position--; + else error_feedback(); + } + + else if(key == KEY_RIGHT || + key == '\006') { // ^F + if(pattern[cursor_position]) cursor_position++; + else error_feedback(); + } + + 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 == '') { - pattern_point = 0; - pattern[pattern_point] = '\0'; + 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, pattern); + nb_lines, lines, cursor_position, pattern); - } while(key != '\n' && key != KEY_ENTER && key != ''); + } while(key != '\n' && key != KEY_ENTER && key != '\007'); // ^G echo(); - curs_set(1); endwin(); ////////////////////////////////////////////////////////////////////// @@ -781,7 +990,8 @@ int main(int argc, char **argv) { } out.flush(); } - + } else { + cout << "Aborted." << endl; } for(int l = 0; l < nb_lines; l++) {