X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.cc;h=2dadb5df8b342a63d737c3021a92105eecb3820b;hb=c84d5d59dd658f46089a3877b0195f67e19d65cd;hp=7488bfd991ec6a3690663e670fa88e235235adc7;hpb=2166d4e6b12465e6fed37eafbf4692ecbf99d824;p=selector.git diff --git a/selector.cc b/selector.cc index 7488bfd..2dadb5d 100644 --- a/selector.cc +++ b/selector.cc @@ -23,13 +23,14 @@ */ // 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 @@ -60,10 +61,6 @@ int case_sensitive = 0; char *title = 0; int error_flash = 0; -#define COLOR_MODELINE 1 -#define COLOR_FOCUS_LINE 2 -#define COLOR_ERROR 3 - int attr_modeline, attr_focus_line, attr_error; ////////////////////////////////////////////////////////////////////// @@ -130,7 +127,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. @@ -148,7 +145,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; @@ -333,7 +331,21 @@ int next_visible(int current_line, int nb_lines, char **lines, matcher_t *matche ////////////////////////////////////////////////////////////////////// -void update_screen(int *current_focus_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) { @@ -343,17 +355,15 @@ void update_screen(int *current_focus_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) { @@ -394,7 +404,7 @@ void update_screen(int *current_focus_line, int *temporary_line, int motion, } } - // Here new_focus_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_focus_line >= 0) { @@ -466,12 +476,15 @@ void update_screen(int *current_focus_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_focus_line = new_focus_line; } } - *temporary_line = new_focus_line; + *displayed_focus_line = new_focus_line; if(nb_printed_lines == 0) { attron(attr_error); @@ -778,7 +791,7 @@ int main(int argc, char **argv) { << " -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 + << " -a start in case sensitive mode" << endl << " -m monochrome mode" << endl << " -q make a flash instead of a beep on an edition error" << endl << " -- all following arguments are filenames" << endl @@ -877,8 +890,10 @@ 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); @@ -901,20 +916,22 @@ int main(int argc, char **argv) { exit(1); } - init_pair(COLOR_MODELINE, color_fg_modeline, color_bg_modeline); - init_pair(COLOR_FOCUS_LINE, color_fg_highlight, color_bg_highlight); - init_pair(COLOR_ERROR, COLOR_WHITE, COLOR_RED); + 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); - attr_modeline = COLOR_PAIR(COLOR_MODELINE); - attr_focus_line = COLOR_PAIR(COLOR_FOCUS_LINE); - attr_error = COLOR_PAIR(COLOR_ERROR); + init_pair(3, COLOR_WHITE, COLOR_RED); + attr_error = COLOR_PAIR(3); } int key; - int current_focus_line = 0, temporary_line = 0; + int current_focus_line = 0, displayed_focus_line = 0; - update_screen(¤t_focus_line, &temporary_line, 0, + update_screen(¤t_focus_line, &displayed_focus_line, + 0, nb_lines, labels, cursor_position, pattern); do { @@ -1005,7 +1022,8 @@ int main(int argc, char **argv) { clear(); } - update_screen(¤t_focus_line, &temporary_line, motion, + update_screen(¤t_focus_line, &displayed_focus_line, + motion, nb_lines, labels, cursor_position, pattern); } while(key != '\007' && // ^G @@ -1021,10 +1039,20 @@ 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]) { @@ -1033,14 +1061,15 @@ int main(int argc, char **argv) { 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; + if(t) { + out << t << endl; } else { out << endl; } } out.flush(); } + } else { cout << "Aborted." << endl; }