X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.cc;h=739f6f8bfb1b7c6064b3294f06862098938ea0d3;hb=9ab9a82ad64fc9728d898217f6e661166f5632ed;hp=a3d54dd1a3acd15b81097e4c3279883e8bc5c62b;hpb=6761db2af5b3df278745de6342f74a6a4c206ea1;p=selector.git diff --git a/selector.cc b/selector.cc index a3d54dd..739f6f8 100644 --- a/selector.cc +++ b/selector.cc @@ -23,13 +23,14 @@ */ // To use it as a super-history-search for bash: -// alias h='selector -d -i -b -v -f <(history)' +// selector -q -b -i -d -v -w -l ${HISTSIZE} <(history) #include #include #include #include +#include #include #include #include @@ -51,7 +52,8 @@ char label_separator = '\0'; int output_to_vt_buffer = 0; int add_control_qs = 0; int with_colors = 1; -int zsh_history = 0, bash_history = 0; +int zsh_history = 0; +int bash_history = 0; int inverse_order = 0; int remove_duplicates = 0; int use_regexp = 0; @@ -59,8 +61,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; ////////////////////////////////////////////////////////////////////// @@ -70,10 +71,10 @@ void inject_into_tty_buffer(char *string) { memset(&newtio, 0, sizeof(newtio)); // Set input mode (non-canonical, *no echo*,...) tcsetattr(STDIN_FILENO, TCSANOW, &newtio); - char control_q = '\021'; + const char control_q = '\021'; // Put the selected string in the tty input buffer - for(char *k = string; *k; k++) { - if(add_control_qs) { + for(const char *k = string; *k; k++) { + if(add_control_qs && !(*k >= ' ' && *k <= '~')) { // Add ^Q to quote control characters ioctl(STDIN_FILENO, TIOCSTI, &control_q); } @@ -126,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. @@ -144,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; @@ -329,7 +331,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) { @@ -339,43 +355,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; - clear(); 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 +398,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 +451,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++] = ' '; } @@ -445,18 +460,14 @@ void update_screen(int *current_line, int *temporary_line, int motion, buffer[k++] = '\n'; buffer[k++] = '\0'; + clrtoeol(); + // 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); } @@ -465,29 +476,34 @@ 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(); + // Draw the modeline 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'; @@ -536,11 +552,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 @@ -773,6 +785,7 @@ int main(int argc, char **argv) { << endl << " -h show this help" << endl << " -v inject the selected line in the tty" << endl + << " -w quote control characters with ^Qs when using -v" << endl << " -d remove duplicated lines" << endl << " -b remove the bash history line prefix" << endl << " -z remove the zsh history line prefix" << endl @@ -781,7 +794,7 @@ int main(int argc, char **argv) { << " -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 + << " -- all following arguments are filenames" << endl << " -t " << endl << " add a title in the modeline" << endl << " -c <fg modeline> <bg modeline> <fg highlight> <bg highlight>" << endl @@ -869,6 +882,7 @@ int main(int argc, char **argv) { char pattern[buffer_size]; pattern[0] = '\0'; + int cursor_position; cursor_position = 0; @@ -876,40 +890,49 @@ 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(); + 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); + 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, nb_lines, labels, cursor_position, pattern); + update_screen(¤t_focus_line, &displayed_focus_line, + 0, + nb_lines, labels, cursor_position, pattern); do { @@ -933,11 +956,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) { @@ -994,7 +1017,13 @@ int main(int argc, char **argv) { kill_after_cursor(pattern, &cursor_position); } - update_screen(¤t_line, &temporary_line, motion, + else if(key == '\014') { // ^L + // I suspect that we may sometime mess up the display + clear(); + } + + update_screen(¤t_focus_line, &displayed_focus_line, + motion, nb_lines, labels, cursor_position, pattern); } while(key != '\007' && // ^G @@ -1010,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]) { @@ -1022,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; }