X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.cc;h=fb08373138ba3697830f3963bdfb277afaf42ad4;hb=38928273eaf85df985dd2b905ae93eb345230daf;hp=cd60eea2c9d22ae413ffcac66411def6edc7fcd4;hpb=45fd07db2a2574d9d1e24a842ea0dc546fd27776;p=selector.git diff --git a/selector.cc b/selector.cc index cd60eea..fb08373 100644 --- a/selector.cc +++ b/selector.cc @@ -23,19 +23,21 @@ */ // To use it as a super-history-search for bash: -// selector -q -b -i -d -v -w -l 10000 <(history) +// selector -q -b -i -d -v -w -l ${HISTSIZE} <(history) -#include -#include +// #include +// #include #include #include +#include #include #include #include #include #include #include +#include using namespace std; @@ -60,8 +62,7 @@ int case_sensitive = 0; char *title = 0; int error_flash = 0; -#define COLOR_MODELINE 1 -#define COLOR_HIGHLIGHTED_LINE 2 +int attr_modeline, attr_focus_line, attr_error; ////////////////////////////////////////////////////////////////////// @@ -88,10 +89,8 @@ void inject_into_tty_buffer(char *string) { 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; + fprintf(stderr, "Missing argument for %s, expecting %s.\n", + argv[n_opt], help); exit(1); } } @@ -109,7 +108,7 @@ int string_to_positive_integer(char *string) { } else error = 1; if(error) { - cerr << "Value `" << string << "' is not a positive integer." << endl; + fprintf(stderr, "Value `%s' is not a positive integer.\n", string); exit(1); } @@ -127,7 +126,7 @@ void error_feedback() { ////////////////////////////////////////////////////////////////////// // A quick and dirty hash table -// The table itself stores index of the strings in a char +// The table itself stores indexes of the strings taken in a char // **table. When a string is added, if it was already in the table, // the new index replaces the previous one. @@ -145,7 +144,8 @@ int *new_hash_table(int hash_table_size) { // the previous index it had. int test_and_add(char *new_string, int new_index, - char **strings, int *hash_table, int hash_table_size) { + char **strings, + int *hash_table, int hash_table_size) { unsigned int code = 0; @@ -330,7 +330,21 @@ 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, +// The value passed to this routine in current_focus_line is the index +// of the line we should have highlited if there was no motion and if +// it matched the matcher. So, the line actually highlighted is the +// first one matching the matcher in that order: (1) +// current_focus_line after motion, (2) the first with a greater +// index, (3) the first with a lesser index. + +// The index of the line actually shown highlighted is written in +// displayed_focus_line (it can be -1) + +// If there is a motion and a line is actually shown highlighted, its +// value is written in current_focus_line. + +void update_screen(int *current_focus_line, int *displayed_focus_line, + int motion, int nb_lines, char **lines, int cursor_position, char *pattern) { @@ -340,42 +354,42 @@ void update_screen(int *current_line, int *temporary_line, int motion, initialize_matcher(use_regexp, case_sensitive, &matcher, pattern); - // We now take care of printing the lines per se - 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. + // First, we find a visible line. int nb_printed_lines = 0; use_default_colors(); + addstr("\n"); if(matcher.regexp_error) { - addstr("[regexp error]"); + attron(attr_error); + addnstr("Regexp syntax error", console_width); + attroff(attr_error); } else if(nb_lines > 0) { - int new_line; - if(match(lines[*current_line], &matcher)) { - new_line = *current_line; + int new_focus_line; + if(match(lines[*current_focus_line], &matcher)) { + new_focus_line = *current_focus_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); + new_focus_line = next_visible(*current_focus_line, nb_lines, lines, &matcher); + if(new_focus_line < 0) { + new_focus_line = previous_visible(*current_focus_line, nb_lines, lines, &matcher); } } // If we found a visible line and we should move, let's move - if(new_line >= 0 && motion != 0) { - int l = new_line; + if(new_focus_line >= 0 && motion != 0) { + int l = new_focus_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; + new_focus_line = l; } } } else { @@ -383,17 +397,17 @@ void update_screen(int *current_line, int *temporary_line, int motion, for(int m = 0; l >= 0 && m < -motion; m++) { l = previous_visible(l, nb_lines, lines, &matcher); if(l >= 0) { - new_line = l; + new_focus_line = l; } } } } - // Here new_line is either a line number matching the patterns, or -1 + // Here new_focus_line is either a line number matching the pattern, or -1 - if(new_line >= 0) { + if(new_focus_line >= 0) { - int first_line = new_line, last_line = new_line, nb_match = 1; + int first_line = new_focus_line, last_line = new_focus_line, nb_match = 1; // We find the first and last line to show, so that the total of // visible lines between them (them included) is console_height-1 @@ -436,7 +450,7 @@ void update_screen(int *current_line, int *temporary_line, int motion, // We fill the rest of the line with blanks if this is the // highlighted line - if(l == new_line) { + if(l == new_focus_line) { while(k < console_width) { buffer[k++] = ' '; } @@ -449,16 +463,10 @@ void update_screen(int *current_line, int *temporary_line, int motion, // 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); - } + if(l == new_focus_line) { + attron(attr_focus_line); + addnstr(buffer, console_width); + attroff(attr_focus_line); } else { addnstr(buffer, console_width); } @@ -467,18 +475,25 @@ void update_screen(int *current_line, int *temporary_line, int motion, } } + // If we are on a focused line and we moved, this become the new + // focus line + if(motion != 0) { - *current_line = new_line; + *current_focus_line = new_focus_line; } } - *temporary_line = new_line; + *displayed_focus_line = new_focus_line; if(nb_printed_lines == 0) { - addnstr("[no selection]\n", console_width); + attron(attr_error); + addnstr("No selection", console_width); + attroff(attr_error); } } else { - addnstr("[empty choice]\n", console_width); + attron(attr_error); + addnstr("Empty choice", console_width); + attroff(attr_error); } clrtobot(); @@ -487,11 +502,7 @@ void update_screen(int *current_line, int *temporary_line, int motion, move(0, 0); - if(with_colors) { - attron(COLOR_PAIR(COLOR_MODELINE)); - } else { - attron(A_REVERSE); - } + attron(attr_modeline); for(int k = 0; k < console_width; k++) buffer[k] = ' '; buffer[console_width] = '\0'; @@ -540,11 +551,7 @@ void update_screen(int *current_line, int *temporary_line, int motion, move(0, cursor_x); - if(with_colors) { - attroff(COLOR_PAIR(COLOR_MODELINE)); - } else { - attroff(A_REVERSE); - } + attroff(attr_modeline); // We are done @@ -558,69 +565,83 @@ void read_file(const char *input_filename, int nb_lines_max, int *nb_lines, char **lines, int hash_table_size, int *hash_table) { - char raw_line[buffer_size];; + char raw_line[buffer_size]; - ifstream file(input_filename); + FILE *file = fopen(input_filename, "r"); - if(file.fail()) { - cerr << "Can not open " << input_filename << endl; + if(!file) { + fprintf(stderr, "Can not open `%s'.\n", input_filename); exit(1); } - while(*nb_lines < nb_lines_max && !file.eof()) { + int start = 0, end = 0; - file.getline(raw_line, buffer_size); + while(*nb_lines < nb_lines_max && (end > start || !feof(file))) { + int eol = start; + while(eol < end && raw_line[eol] != '\n') eol++; - if(raw_line[0]) { - - if(file.fail()) { - cerr << "Line too long:" << endl; - cerr << raw_line << endl; - exit(1); + if(eol == end) { + for(int k = 0; k < end - start; k++) { + raw_line[k] = raw_line[k + start]; } + end -= start; + eol -= start; + start = 0; + end += fread(raw_line + end, sizeof(char), buffer_size - end, file); + while(eol < end && raw_line[eol] != '\n') eol++; + } - char *t; + if(eol == buffer_size) { + raw_line[buffer_size - 1] = '\0'; + fprintf(stderr, "Line too long:\n"); + fprintf(stderr, raw_line); + fprintf(stderr, "\n"); + exit(1); + } - t = raw_line; + raw_line[eol] = '\0'; - // Remove the zsh history prefix + char *t = raw_line + start; - if(zsh_history && *t == ':') { - while(*t && *t != ';') t++; - if(*t == ';') t++; - } + // Remove the zsh history prefix - // Remove the bash history prefix + if(zsh_history && *t == ':') { + while(*t && *t != ';') t++; + if(*t == ';') t++; + } - if(bash_history) { - while(*t == ' ') t++; - while(*t >= '0' && *t <= '9') t++; - while(*t == ' ') t++; - } + // Remove the bash history prefix - // Check for duplicates with the hash table and insert the line - // in the list if necessary + if(bash_history) { + while(*t == ' ') t++; + while(*t >= '0' && *t <= '9') t++; + while(*t == ' ') t++; + } - int dup; + // Check for duplicates with the hash table and insert the line + // in the list if necessary - if(hash_table) { - dup = test_and_add(t, *nb_lines, lines, hash_table, hash_table_size); - } else { - dup = -1; - } + int dup; - if(dup < 0) { - lines[*nb_lines] = new char[strlen(t) + 1]; - strcpy(lines[*nb_lines], t); - } 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(hash_table) { + dup = test_and_add(t, *nb_lines, lines, hash_table, hash_table_size); + } else { + dup = -1; + } - (*nb_lines)++; + if(dup < 0) { + lines[*nb_lines] = new char[strlen(t) + 1]; + strcpy(lines[*nb_lines], t); + } 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)++; + + start = eol + 1; } } @@ -629,7 +650,7 @@ void read_file(const char *input_filename, int main(int argc, char **argv) { if(!ttyname(STDIN_FILENO)) { - cerr << "The standard input is not a tty." << endl; + fprintf(stderr, "The standard input is not a tty.\n"); exit(1); } @@ -762,45 +783,41 @@ int main(int argc, char **argv) { } else { - cerr << "Unknown option " << argv[i] << "." << endl; + fprintf(stderr, "Unknown option %s.\n", argv[i]); error = 1; } } if(show_help || error) { - cerr << "Selector version " << VERSION << "-R" << REVISION_NUMBER - << endl - << "Written by Francois Fleuret ." - << endl - << endl - << "Usage: " << argv[0] << " [options] [ [ ...]]" << endl - << endl - << " -h show this help" << endl - << " -v inject the selected line in the tty" << endl - << " -w quotes control characters with ^Qs" << 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 - << " -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 - << " 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 - << " -x <label separator>" << endl - << " set the symbol to terminate the label" << endl - << " -l <max number of lines>" << endl - << " set the maximum number of lines to take into account" << endl - << endl; - + fprintf(stderr, "Selector version %s-R%s\n", VERSION, REVISION_NUMBER); + fprintf(stderr, "Written by Francois Fleuret <francois@fleuret.org>.\n"); + fprintf(stderr, "Usage: %s [options] [<filename1> [<filename2> ...]]\n", argv[0]); + fprintf(stderr, "\n"); + fprintf(stderr, " -h show this help\n"); + fprintf(stderr, " -v inject the selected line in the tty\n"); + fprintf(stderr, " -w quote control characters with ^Qs when using -v\n"); + fprintf(stderr, " -d remove duplicated lines\n"); + fprintf(stderr, " -b remove the bash history line prefix\n"); + fprintf(stderr, " -z remove the zsh history line prefix\n"); + fprintf(stderr, " -i invert the order of lines\n"); + fprintf(stderr, " -e start in regexp mode\n"); + fprintf(stderr, " -a start in case sensitive mode\n"); + fprintf(stderr, " -m monochrome mode\n"); + fprintf(stderr, " -q make a flash instead of a beep on an edition error\n"); + fprintf(stderr, " -- all following arguments are filenames\n"); + fprintf(stderr, " -t <title>\n"); + fprintf(stderr, " add a title in the modeline\n"); + fprintf(stderr, " -c <fg modeline> <bg modeline> <fg highlight> <bg highlight>\n"); + fprintf(stderr, " set the display colors\n"); + fprintf(stderr, " -o <output filename>\n"); + fprintf(stderr, " set a file to write the selected line to\n"); + fprintf(stderr, " -s <pattern separator>\n"); + fprintf(stderr, " set the symbol to separate substrings in the pattern\n"); + fprintf(stderr, " -x <label separator>\n"); + fprintf(stderr, " set the symbol to terminate the label\n"); + fprintf(stderr, " -l <max number of lines>\n"); + fprintf(stderr, " set the maximum number of lines to take into account\n"); + fprintf(stderr, "\n"); exit(error); } @@ -882,40 +899,48 @@ int main(int argc, char **argv) { // Here we start to display with curse initscr(); - + cbreak(); noecho(); + // nonl(); + intrflush(stdscr, FALSE); // So that the arrow keys work keypad(stdscr, TRUE); - if(with_colors) { + attr_error = A_STANDOUT; + attr_modeline = A_REVERSE; + attr_focus_line = A_STANDOUT; - if(has_colors()) { + if(with_colors && has_colors()) { - start_color(); + 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(); - endwin(); - cerr << "Color numbers have to be between 0 and " << COLORS - 1 << "." << endl; - exit(1); - } + 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(); + endwin(); + fprintf(stderr, "Color numbers have to be between 0 and %d.\n", COLORS - 1); + exit(1); + } - init_pair(COLOR_MODELINE, color_fg_modeline, color_bg_modeline); - init_pair(COLOR_HIGHLIGHTED_LINE, color_fg_highlight, color_bg_highlight); + init_pair(1, color_fg_modeline, color_bg_modeline); + attr_modeline = COLOR_PAIR(1); + + init_pair(2, color_fg_highlight, color_bg_highlight); + attr_focus_line = COLOR_PAIR(2); + + init_pair(3, COLOR_WHITE, COLOR_RED); + attr_error = COLOR_PAIR(3); - } else { - with_colors = 0; - } } int key; - int current_line = 0, temporary_line = 0; + int current_focus_line = 0, displayed_focus_line = 0; - update_screen(¤t_line, &temporary_line, 0, + update_screen(¤t_focus_line, &displayed_focus_line, + 0, nb_lines, labels, cursor_position, pattern); do { @@ -940,11 +965,11 @@ int main(int argc, char **argv) { } else if(key == KEY_HOME) { - current_line = 0; + current_focus_line = 0; } else if(key == KEY_END) { - current_line = nb_lines - 1; + current_focus_line = nb_lines - 1; } else if(key == KEY_NPAGE) { @@ -1006,7 +1031,8 @@ int main(int argc, char **argv) { clear(); } - update_screen(¤t_line, &temporary_line, motion, + update_screen(¤t_focus_line, &displayed_focus_line, + motion, nb_lines, labels, cursor_position, pattern); } while(key != '\007' && // ^G @@ -1022,28 +1048,38 @@ int main(int argc, char **argv) { 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]); + char *t; + + if(displayed_focus_line >= 0 && displayed_focus_line < nb_lines) { + t = lines[displayed_focus_line]; + if(label_separator) { + while(*t && *t != label_separator) t++; + if(*t) t++; } + } else { + t = 0; + } + + if(output_to_vt_buffer && t) { + inject_into_tty_buffer(t); } 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; + FILE *out = fopen(output_filename, "w"); + if(out) { + if(t) { + fprintf(out, t); } + fprintf(out, "\n"); + } else { + fprintf(stderr, "Can not open %s for writing.\n", output_filename); + exit(1); } - out.flush(); + fclose(out); } + } else { - cout << "Aborted." << endl; + printf("Aborted.\n"); } for(int l = 0; l < nb_lines; l++) {