X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.cc;h=f89f6b8f0c9991b4dd916377d0d3df12bde2652a;hb=1aa2ab0e57b73a863712019a4c8153d08e088ce1;hp=d719c1ae2b135952209aeda87a32650bab2d8f67;hpb=9073cafb7f527ce4cd460c82bbd49ee78768b566;p=selector.git diff --git a/selector.cc b/selector.cc index d719c1a..f89f6b8 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,9 +22,12 @@ * */ -// Here is how to use it as a super-history-search +// To use it as a super-history-search: // ./selector -v -f ${HISTFILE} +// This software is highly Linux-specific, but I would be glad to get +// patches to make it work on other OS + #include #include @@ -37,12 +41,47 @@ using namespace std; +#define VERSION "1.0" + // Yeah, global variables! int buffer_size = 1024; -int nb_lines_max = 1000; +int nb_lines_max = 10000; char pattern_separator = ';'; int output_to_vt_buffer = 0; +int with_colors = 1; +int zsh_history = 0; +int inverse_order = 0; + +////////////////////////////////////////////////////////////////////// + +// This looks severely Linux-only ... + +void inject_into_tty_buffer(char *line) { + char *tty = ttyname(STDIN_FILENO); + int fd = open(tty, O_WRONLY); + + struct termios oldtio, newtio; + + if (fd >= 0) { + // Save current port settings + tcgetattr(fd,&oldtio); + memset(&newtio, 0, sizeof(newtio)); + // Set input mode (non-canonical, *no echo*,...) + tcflush(fd, TCIFLUSH); + tcsetattr(fd,TCSANOW, &newtio); + // Put the selected line in the tty input buffer + for(char *k = line; *k; k++) { + ioctl(fd, TIOCSTI, k); + } + // Restore the old settings + tcsetattr(fd,TCSANOW, &oldtio); + close(fd); + } else { + cerr << "Can not open " << tty << "." << endl; + exit(1); + } +} ////////////////////////////////////////////////////////////////////// @@ -120,8 +159,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. @@ -166,6 +203,8 @@ void update_screen(int *current_line, int *temporary_line, int motion, addstr("\n"); + int nb_printed_lines = 1; + // Here new_line is either a line number matching the patterns, or -1 if(new_line >= 0) { @@ -225,9 +264,15 @@ void update_screen(int *current_line, int *temporary_line, int motion, // 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); } @@ -236,12 +281,13 @@ void update_screen(int *current_line, int *temporary_line, int motion, } } - *temporary_line = new_line; if(motion != 0) { *current_line = new_line; } } + *temporary_line = new_line; + if(nb_printed_lines == 1) { addnstr("[no selection]\n", console_width); nb_printed_lines++; @@ -270,9 +316,15 @@ 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); + } // We are done @@ -285,6 +337,15 @@ 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, ""); @@ -309,6 +370,11 @@ 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); @@ -320,17 +386,43 @@ int main(int argc, char **argv) { i++; } + 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], "-l") == 0) { check_opt(argc, argv, i, 1, ""); nb_lines_max = atoi(argv[i+1]); 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] + cerr << "Selector version " << VERSION + << endl + << "Written by Francois Fleuret " + << endl + << argv[0] << " [-h]" - << " [-b]" << " [-v]" + << " [-m]" + << " [-z]" + << " [-i]" + << " [-c ]" << " [-o ]" << " [-s ]" << " [-l ]" @@ -352,16 +444,31 @@ int main(int argc, char **argv) { 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++; + } + 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]; @@ -371,22 +478,31 @@ 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); @@ -397,7 +513,7 @@ int main(int argc, char **argv) { int motion = 0; - if(key >= ' ' && key <= 'z') { + if(key >= ' ' && key <= '~') { patterns[patterns_point++] = key; patterns[patterns_point] = '\0'; } @@ -435,48 +551,29 @@ int main(int argc, char **argv) { update_screen(¤t_line, &temporary_line, motion, nb_lines, lines, patterns, no_blink); + } 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); - - struct termios oldtio, newtio; - - if (fd >= 0) { - // Save current port settings - tcgetattr(fd,&oldtio); - bzero(&newtio, sizeof(newtio)); - // Set input mode (non-canonical, *no echo*,...) - tcflush(fd, TCIFLUSH); - tcsetattr(fd,TCSANOW, &newtio); - // Put the selected line in the tty input buffer - for(char *k = lines[temporary_line]; *k; k++) { - ioctl(fd, TIOCSTI, k); - } - // Restore the old settings - tcsetattr(fd,TCSANOW, &oldtio); - close(fd); - } else { - cerr << "Can not open " << tty << "." << endl; - exit(1); + 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; + 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(); }