X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.cc;h=e119fc6db121bd36f3c9a44812b753c7be7e1f4a;hb=7b78746dc81a4654942ae17a4604d7443fbde929;hp=f89f6b8f0c9991b4dd916377d0d3df12bde2652a;hpb=1aa2ab0e57b73a863712019a4c8153d08e088ce1;p=selector.git diff --git a/selector.cc b/selector.cc index f89f6b8..e119fc6 100644 --- a/selector.cc +++ b/selector.cc @@ -22,8 +22,9 @@ * */ -// To use it as a super-history-search: -// ./selector -v -f ${HISTFILE} +// To use it as a super-history-search for bash: +// +// alias h='./selector -i -b -v -f <(history)' // This software is highly Linux-specific, but I would be glad to get // patches to make it work on other OS @@ -43,15 +44,17 @@ using namespace std; #define VERSION "1.0" +const int buffer_size = 1024; + // Yeah, global variables! -int buffer_size = 1024; -int nb_lines_max = 10000; +int nb_lines_max = 1000; char pattern_separator = ';'; int output_to_vt_buffer = 0; int with_colors = 1; -int zsh_history = 0; +int zsh_history = 0, bash_history = 0; int inverse_order = 0; +int remove_duplicates = 0; ////////////////////////////////////////////////////////////////////// @@ -59,7 +62,7 @@ int inverse_order = 0; void inject_into_tty_buffer(char *line) { char *tty = ttyname(STDIN_FILENO); - int fd = open(tty, O_WRONLY); + int fd = open(tty, O_RDWR); struct termios oldtio, newtio; @@ -124,8 +127,7 @@ int next_visible(int current_line, int nb_lines, char **lines, int nb_patterns, void update_screen(int *current_line, int *temporary_line, int motion, int nb_lines, char **lines, - char *pattern_list, - int no_blink) { + char *pattern_list) { char buffer[buffer_size]; @@ -195,9 +197,7 @@ void update_screen(int *current_line, int *temporary_line, int motion, } } - if(!no_blink) { - clear(); - } + clear(); use_default_colors(); @@ -252,7 +252,7 @@ void update_screen(int *current_line, int *temporary_line, int motion, // We fill the rest of the line with blanks if either we did // not clear() or if this is the highlighted line - if(no_blink || l == new_line) { + if(l == new_line) { while(k < console_width) { buffer[k++] = ' '; } @@ -293,18 +293,6 @@ void update_screen(int *current_line, int *temporary_line, int motion, nb_printed_lines++; } - if(no_blink) { // Erase the rest of the window. That's slightly ugly. - int k = 0; - while(k < console_width) { - buffer[k++] = ' '; - } - buffer[k++] = '\n'; - buffer[k++] = '\0'; - for(int l = nb_printed_lines; l < console_height; l++) { - addnstr(buffer, console_width); - } - } - // Draw the modeline sprintf(buffer, "%d/%d pattern: %s", @@ -335,24 +323,24 @@ void update_screen(int *current_line, int *temporary_line, int motion, int main(int argc, char **argv) { char buffer[buffer_size]; - char *lines[nb_lines_max]; - int no_blink = 0; int color_fg_modeline, color_bg_modeline; int color_fg_highlight, color_bg_highlight; - color_fg_modeline = COLOR_WHITE; - color_bg_modeline = COLOR_BLACK; + color_fg_modeline = COLOR_WHITE; + color_bg_modeline = COLOR_BLACK; color_fg_highlight = COLOR_BLACK; color_bg_highlight = COLOR_YELLOW; setlocale(LC_ALL, ""); char input_filename[buffer_size], output_filename[buffer_size]; + strcpy(input_filename, ""); - strcpy(output_filename, "/tmp/selector.out"); + strcpy(output_filename, ""); int i = 1; while(i < argc) { + if(strcmp(argv[i], "-o") == 0) { check_opt(argc, argv, i, 1, ""); strncpy(output_filename, argv[i+1], buffer_size); @@ -381,11 +369,6 @@ int main(int argc, char **argv) { i += 2; } - else if(strcmp(argv[i], "-b") == 0) { - no_blink = 1; - i++; - } - else if(strcmp(argv[i], "-i") == 0) { inverse_order = 1; i++; @@ -396,6 +379,16 @@ int main(int argc, char **argv) { i++; } + else if(strcmp(argv[i], "-b") == 0) { + bash_history = 1; + i++; + } + + else if(strcmp(argv[i], "-r") == 0) { + remove_duplicates = 1; + i++; + } + else if(strcmp(argv[i], "-l") == 0) { check_opt(argc, argv, i, 1, ""); nb_lines_max = atoi(argv[i+1]); @@ -420,6 +413,7 @@ int main(int argc, char **argv) { << " [-h]" << " [-v]" << " [-m]" + << " [-r]" << " [-z]" << " [-i]" << " [-c ]" @@ -436,11 +430,15 @@ 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()) { @@ -448,7 +446,6 @@ int main(int argc, char **argv) { return 1; } - int nb_lines = 0; while(nb_lines < nb_lines_max && !file.eof()) { file.getline(buffer, buffer_size); if(strcmp(buffer, "") != 0) { @@ -457,9 +454,38 @@ int main(int argc, char **argv) { while(*s && *s != ';') s++; if(*s == ';') s++; } - lines[nb_lines] = new char[strlen(s) + 1]; - strcpy(lines[nb_lines], s); - nb_lines++; + + if(bash_history && (*s == ' ' || (*s >= '0' && *s <= '9'))) { + while(*s == ' ' || (*s >= '0' && *s <= '9')) s++; + } + + /* + + // This is supposed to remove any duplicates, not only + // successive ones. However, it is O(N^2), we should use + // hash-codes + + int keep = 1; + + if(remove_duplicates) { + for(int k = 0; keep && k < nb_lines; k++) { + keep &= strcmp(lines[k], s); + } + } + + if(keep) { + lines[nb_lines] = new char[strlen(s) + 1]; + strcpy(lines[nb_lines], s); + nb_lines++; + } + + */ + + if(!remove_duplicates || nb_lines == 0 || strcmp(lines[nb_lines - 1], s)) { + lines[nb_lines] = new char[strlen(s) + 1]; + strcpy(lines[nb_lines], s); + nb_lines++; + } } } @@ -505,7 +531,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, patterns, no_blink); + update_screen(¤t_line, &temporary_line, 0, nb_lines, lines, patterns); do { @@ -518,7 +544,8 @@ int main(int argc, char **argv) { patterns[patterns_point] = '\0'; } - else if(key == KEY_BACKSPACE || key == KEY_DC || key == '') { + else if(key == KEY_BACKSPACE || key == '' || + key == KEY_DC || key == '') { if(patterns_point > 0) { patterns_point--; patterns[patterns_point] = '\0'; @@ -550,7 +577,7 @@ int main(int argc, char **argv) { } update_screen(¤t_line, &temporary_line, motion, - nb_lines, lines, patterns, no_blink); + nb_lines, lines, patterns); } while(key != '\n' && key != KEY_ENTER && key != ''); @@ -559,11 +586,14 @@ int main(int argc, char **argv) { endwin(); 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]); } - } else { + } + + if(output_filename[0]) { ofstream out(output_filename); if(out.fail()) { cerr << "Can not open " << output_filename << " for writing." << endl; @@ -577,11 +607,13 @@ int main(int argc, char **argv) { } out.flush(); } + } for(int l = 0; l < nb_lines; l++) { delete[] lines[l]; } + delete[] lines; exit(0); }