X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.cc;h=637ae7432910875c85a93d3feffb1b9f30a77fc0;hb=18c1fd808e3e513c07279edf0473240df19700ce;hp=a58e2bba8c66c5a117e7620baf643fb4356cd4d9;hpb=b68638f97027607253ed4d2b5a1a1b40436a61ad;p=selector.git diff --git a/selector.cc b/selector.cc index a58e2bb..637ae74 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,6 +88,34 @@ 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 @@ -168,11 +200,11 @@ 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); } } @@ -220,7 +252,7 @@ void delete_char(char *buffer, int *position) { buffer[c] = buffer[c+1]; c++; } - } + } else error_feedback(); } void backspace_char(char *buffer, int *position) { @@ -236,7 +268,7 @@ void backspace_char(char *buffer, int *position) { } (*position)--; - } + } else error_feedback(); } void insert_char(char *buffer, int *position, char character) { @@ -252,7 +284,7 @@ void insert_char(char *buffer, int *position, char character) { c++; buffer[c] = '\0'; buffer[(*position)++] = character; - } + } else error_feedback(); } void kill_before_cursor(char *buffer, int *position) { @@ -356,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)) { @@ -393,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) { @@ -409,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); @@ -444,7 +476,7 @@ void update_screen(int *current_line, int *temporary_line, int motion, move(0, 0); if(with_colors) { - attron(COLOR_PAIR(1)); + attron(COLOR_PAIR(COLOR_MODELINE)); } else { attron(A_REVERSE); } @@ -479,14 +511,25 @@ void update_screen(int *current_line, int *temporary_line, int motion, addstr(" "); } - if(use_regexp) { - addstr(" [regexp]"); + 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(1)); + attroff(COLOR_PAIR(COLOR_MODELINE)); } else { attroff(A_REVERSE); } @@ -499,6 +542,78 @@ 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; + + 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) { if(!ttyname(STDIN_FILENO)) { @@ -506,7 +621,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; @@ -524,8 +638,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, ""); @@ -549,6 +664,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); @@ -581,8 +701,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) { @@ -595,26 +713,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; } } @@ -625,7 +748,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 @@ -636,6 +759,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 @@ -653,20 +778,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; @@ -674,60 +786,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 { - // 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; - } + 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; @@ -763,28 +832,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(3, color_bg_modeline, color_fg_modeline); + + 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; } @@ -845,11 +914,13 @@ int main(int argc, char **argv) { 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 @@ -864,6 +935,10 @@ int main(int argc, char **argv) { use_regexp = !use_regexp; } + else if(key == '\011') { // ^I + case_sensitive = !case_sensitive; + } + else if(key == '\025') { // ^U kill_before_cursor(pattern, &cursor_position); } @@ -878,7 +953,6 @@ int main(int argc, char **argv) { } while(key != '\n' && key != KEY_ENTER && key != '\007'); // ^G echo(); - // curs_set(1); endwin(); ////////////////////////////////////////////////////////////////////// @@ -906,7 +980,8 @@ int main(int argc, char **argv) { } out.flush(); } - + } else { + cout << "Aborted." << endl; } for(int l = 0; l < nb_lines; l++) {