X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.cc;h=f4d79303b68634175f00eb64db4a5e6973793f07;hb=ef2a722e9da6dc7486797d1324da95e0a88138cf;hp=eb44a61c891cef6d4d006652d6363d967796ef8c;hpb=f096f32710e8de97b870b7728746d442f0cce4ab;p=selector.git diff --git a/selector.cc b/selector.cc index eb44a61..f4d7930 100644 --- a/selector.cc +++ b/selector.cc @@ -1,9 +1,10 @@ + /* * selector is a simple shell command for selection of strings with a * dynamic pattern-matching. * * Copyright (c) 2009 Francois Fleuret - * Written by Francois Fleuret + * Written by Francois Fleuret * * This file is part of selector. * @@ -21,36 +22,76 @@ * */ -/* - - Here is the magical shell script for a smart bash-history. Note that - the line remains in /tmp/selector.out, which may be a security - concern. +// To use it as a super-history-search for bash: +// +// alias h='./selector -i -b -v -f <(history)' - ./selector -f ~/.bash_history - OLD_SETTINGS=`stty -g` - stty -echo raw - writevt `tty` "`cat /tmp/selector.out`" - stty ${OLD_SETTINGS} +// This software is highly Linux-specific, but I would be glad to get +// patches to make it work on other OS -*/ +#include +#include #include -#include -#include -#include -#include #include -#include -#include +#include +#include #include +#include +#include using namespace std; -int buffer_size = 1024; +#define VERSION "1.0" + +const int buffer_size = 1024; + +// Yeah, global variables! + int nb_lines_max = 1000; char pattern_separator = ';'; int output_to_vt_buffer = 0; +int with_colors = 1; +int zsh_history = 0, bash_history = 0; +int inverse_order = 0; +int remove_duplicates = 0; + +////////////////////////////////////////////////////////////////////// + +// int test_and_set_hash(char *s, char **hashed, int hash_size) { + // uint32_t code = 0, mask; + // int result; + + // for(int k = 0; s[k]; k++) { + // code += ((uint32_t) (s[k])) << (8 * k%4); + // } + + // code = code%hash_table_size; + + // if(hashed[code]) { + // } else { + // } +// } + +////////////////////////////////////////////////////////////////////// + +// This looks severely Linux-only ... + +void inject_into_tty_buffer(char *line) { + struct termios oldtio, newtio; + tcgetattr(STDIN_FILENO,&oldtio); + memset(&newtio, 0, sizeof(newtio)); + // Set input mode (non-canonical, *no echo*,...) + tcsetattr(STDIN_FILENO,TCSANOW, &newtio); + // Put the selected line in the tty input buffer + for(char *k = line; *k; k++) { + ioctl(STDIN_FILENO, TIOCSTI, k); + } + // Restore the old settings + tcsetattr(STDIN_FILENO,TCSANOW, &oldtio); +} + +////////////////////////////////////////////////////////////////////// int match(char *string, int nb_patterns, char **patterns) { for(int n = 0; n < nb_patterns; n++) { @@ -59,6 +100,8 @@ int match(char *string, int nb_patterns, char **patterns) { return 1; } +////////////////////////////////////////////////////////////////////// + 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] << "." @@ -69,6 +112,8 @@ void check_opt(int argc, char **argv, int n_opt, int n, const char *help) { } } +////////////////////////////////////////////////////////////////////// + int previous_visible(int current_line, int nb_lines, char **lines, int nb_patterns, char **patterns) { int line = current_line - 1; while(line >= 0 && !match(lines[line], nb_patterns, patterns)) line--; @@ -87,8 +132,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]; @@ -122,8 +166,6 @@ void update_screen(int *current_line, int *temporary_line, int motion, int console_width = getmaxx(stdscr); int console_height = getmaxy(stdscr); - int nb_printed_lines = 1; - // First, we find a visible line. In priority: The current, or the // first visible after it, or the first visible before it. @@ -160,14 +202,14 @@ void update_screen(int *current_line, int *temporary_line, int motion, } } - if(!no_blink) { - clear(); - } + clear(); use_default_colors(); addstr("\n"); + int nb_printed_lines = 0; + // Here new_line is either a line number matching the patterns, or -1 if(new_line >= 0) { @@ -212,7 +254,10 @@ void update_screen(int *current_line, int *temporary_line, int motion, k++; } - if(no_blink || l == new_line) { + // We fill the rest of the line with blanks if either we did + // not clear() or if this is the highlighted line + + if(l == new_line) { while(k < console_width) { buffer[k++] = ' '; } @@ -221,10 +266,18 @@ void update_screen(int *current_line, int *temporary_line, int motion, buffer[k++] = '\n'; buffer[k++] = '\0'; + // Highlight the highlighted line ... + if(l == new_line) { - attron(COLOR_PAIR(2)); - addnstr(buffer, console_width); - attroff(COLOR_PAIR(2)); + if(with_colors) { + attron(COLOR_PAIR(2)); + addnstr(buffer, console_width); + attroff(COLOR_PAIR(2)); + } else { + attron(A_STANDOUT); + addnstr(buffer, console_width); + attroff(A_STANDOUT); + } } else { addnstr(buffer, console_width); } @@ -233,33 +286,21 @@ void update_screen(int *current_line, int *temporary_line, int motion, } } - *temporary_line = new_line; if(motion != 0) { *current_line = new_line; } } - // if(nb_printed_lines == 1) { - // addnstr("[no selection]\n", console_width); - // nb_printed_lines++; - // } + *temporary_line = new_line; - 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); - } + if(nb_printed_lines == 0) { + addnstr("[no selection]\n", console_width); } // Draw the modeline sprintf(buffer, "%d/%d pattern: %s", - nb_printed_lines - 1, + nb_printed_lines, nb_lines, pattern_list); @@ -267,26 +308,43 @@ void update_screen(int *current_line, int *temporary_line, int motion, buffer[console_width] = '\0'; move(0, 0); - attron(COLOR_PAIR(1)); - addnstr(buffer, console_width); - attroff(COLOR_PAIR(1)); + if(with_colors) { + attron(COLOR_PAIR(1)); + addnstr(buffer, console_width); + attroff(COLOR_PAIR(1)); + } else { + attron(A_REVERSE); + addnstr(buffer, console_width); + attroff(A_REVERSE); + } - refresh(); // After doing something on the display, we refresh it + // We are done + + refresh(); } ////////////////////////////////////////////////////////////////////// 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_highlight = COLOR_BLACK; + color_bg_highlight = COLOR_YELLOW; + + setlocale(LC_ALL, ""); char input_filename[buffer_size], output_filename[buffer_size]; - strcpy(input_filename, "/dev/stdin"); - strcpy(output_filename, "/tmp/selector.out"); + + strcpy(input_filename, ""); + 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); @@ -304,14 +362,34 @@ int main(int argc, char **argv) { i++; } + else if(strcmp(argv[i], "-m") == 0) { + with_colors = 0; + i++; + } + else if(strcmp(argv[i], "-f") == 0) { check_opt(argc, argv, i, 1, ""); strncpy(input_filename, argv[i+1], buffer_size); i += 2; } + else if(strcmp(argv[i], "-i") == 0) { + inverse_order = 1; + i++; + } + + else if(strcmp(argv[i], "-z") == 0) { + zsh_history = 1; + i++; + } + else if(strcmp(argv[i], "-b") == 0) { - no_blink = 1; + bash_history = 1; + i++; + } + + else if(strcmp(argv[i], "-r") == 0) { + remove_duplicates = 1; i++; } @@ -321,8 +399,33 @@ int main(int argc, char **argv) { 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]); + i += 5; + } + else { - cerr << argv[0] << " [-h] [-o ] [-b] [-l ] [-s ] [-v]" << endl; + cerr << "Selector version " << VERSION + << endl + << "Written by Francois Fleuret " + << endl + << argv[0] + << " [-h]" + << " [-v]" + << " [-m]" + << " [-r]" + << " [-z]" + << " [-i]" + << " [-c ]" + << " [-o ]" + << " [-s ]" + << " [-l ]" + << " -f " + << endl; if(strcmp(argv[i], "-h") == 0) { exit(0); } else { @@ -331,19 +434,49 @@ 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; + cerr << "Can not open " << input_filename << endl; return 1; } - int nb_lines = 0; while(nb_lines < nb_lines_max && !file.eof()) { file.getline(buffer, buffer_size); - lines[nb_lines] = new char[strlen(buffer) + 1]; - strcpy(lines[nb_lines], buffer); - nb_lines++; + if(strcmp(buffer, "") != 0) { + char *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++; + } + + 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++; + } + } + } + + if(inverse_order) { + for(int i = 0; i < nb_lines/2; i++) { + char *s = lines[nb_lines - 1 - i]; + lines[nb_lines - 1 - i] = lines[i]; + lines[i] = s; + } } char patterns[buffer_size]; @@ -353,25 +486,34 @@ int main(int argc, char **argv) { initscr(); - if(!has_colors()) { - cerr << "No colors." << endl; - return 1; + 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); + } else { + with_colors = 0; + } } noecho(); - curs_set(0); - keypad(stdscr, TRUE); - - start_color(); - // init_pair(1, COLOR_WHITE, COLOR_BLACK); - init_pair(1, COLOR_WHITE, COLOR_GREEN); - init_pair(2, COLOR_BLACK, COLOR_YELLOW); + curs_set(0); // Hide the cursor + keypad(stdscr, TRUE); // So that the arrow keys work 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 { @@ -379,12 +521,13 @@ int main(int argc, char **argv) { int motion = 0; - if(key >= ' ' && key <= 'z') { + if(key >= ' ' && key <= '~') { patterns[patterns_point++] = key; patterns[patterns_point] = '\0'; } - else if(key == KEY_BACKSPACE || key == KEY_DC || key == '') { + else if(key == KEY_BACKSPACE || key == '' || key == '' || + key == KEY_DC || key == '') { if(patterns_point > 0) { patterns_point--; patterns[patterns_point] = '\0'; @@ -416,39 +559,43 @@ 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 != ''); echo(); curs_set(1); endwin(); - if(output_to_vt_buffer) { - if((key == KEY_ENTER || key == '\n') && temporary_line >= 0 && temporary_line < nb_lines) { - char *tty = ttyname (STDIN_FILENO); - int fd = open(tty, O_WRONLY); - write(fd, lines[temporary_line], strlen(lines[temporary_line])); - close(fd); + 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 { - ofstream out(output_filename); - if(out.fail()) { - cerr << "Can not open " << output_filename << " for writing." << endl; - exit(1); - } else { - if((key == KEY_ENTER || key == '\n') && temporary_line >= 0 && temporary_line < nb_lines) { - out << lines[temporary_line] << endl; + if(output_filename[0]) { + ofstream out(output_filename); + if(out.fail()) { + cerr << "Can not open " << output_filename << " for writing." << endl; + exit(1); } else { - out << endl; + if(temporary_line >= 0 && temporary_line < nb_lines) { + out << lines[temporary_line] << endl; + } else { + out << endl; + } } out.flush(); } + } for(int l = 0; l < nb_lines; l++) { delete[] lines[l]; } + delete[] lines; exit(0); }