X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=selector.cc;h=d719c1ae2b135952209aeda87a32650bab2d8f67;hb=9073cafb7f527ce4cd460c82bbd49ee78768b566;hp=887b4d04c23b4005ce77927a082d35ae75f296b2;hpb=b34072e0fd639bd0214c3186ca143c04962f51a7;p=selector.git diff --git a/selector.cc b/selector.cc index 887b4d0..d719c1a 100644 --- a/selector.cc +++ b/selector.cc @@ -2,7 +2,7 @@ * selector is a simple shell command for selection of strings with a * dynamic pattern-matching. * - * Copyright (c) 2008 Francois Fleuret + * Copyright (c) 2009 Francois Fleuret * Written by Francois Fleuret * * This file is part of selector. @@ -21,36 +21,31 @@ * */ -/* - - Here is the magical shell script for a smart bash-history. Note that - the line remains in /tmp/selector.out, which may be a scurity concern. - - ./selector -f ~/.bash_history - OLD_SETTINGS=`stty -g` - stty -echo raw - writevt `tty` "`cat /tmp/selector.out`" - stty ${OLD_SETTINGS} +// Here is how to use it as a super-history-search +// ./selector -v -f ${HISTFILE} -*/ +#include +#include #include -#include -#include -#include -#include #include -#include -#include +#include +#include #include +#include +#include using namespace std; +// Yeah, global variables! + int buffer_size = 1024; int nb_lines_max = 1000; char pattern_separator = ';'; int output_to_vt_buffer = 0; +////////////////////////////////////////////////////////////////////// + int match(char *string, int nb_patterns, char **patterns) { for(int n = 0; n < nb_patterns; n++) { if(strstr(string, patterns[n]) == 0) return 0; @@ -58,17 +53,20 @@ 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] - << ". Expecting " - << help - << "." << endl; + cerr << "Missing argument for " << argv[n_opt] << "." + << " " + << "Expecting " << help << "." + << endl; exit(1); } } +////////////////////////////////////////////////////////////////////// + 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--; @@ -88,7 +86,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 noblink) { + int no_blink) { char buffer[buffer_size]; @@ -141,24 +139,26 @@ void update_screen(int *current_line, int *temporary_line, int motion, if(new_line >= 0 && motion != 0) { int l = new_line; - l += motion; - if(motion > 0) { // We want to go down, let's find the first visible line below - l = next_visible(new_line, nb_lines, lines, nb_patterns, patterns); - if(l >= 0) { - new_line = l; + for(int m = 0; l >= 0 && m < motion; m++) { + l = next_visible(l, nb_lines, lines, nb_patterns, patterns); + if(l >= 0) { + new_line = l; + } } } else { // We want to go up, let's find the first visible line above - l = previous_visible(new_line, nb_lines, lines, nb_patterns, patterns); - if(l >= 0) { - new_line = l; + for(int m = 0; l >= 0 && m < -motion; m++) { + l = previous_visible(l, nb_lines, lines, nb_patterns, patterns); + if(l >= 0) { + new_line = l; + } } } } - if(!noblink) { + if(!no_blink) { clear(); } @@ -210,7 +210,10 @@ void update_screen(int *current_line, int *temporary_line, int motion, k++; } - if(noblink || 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(no_blink || l == new_line) { while(k < console_width) { buffer[k++] = ' '; } @@ -219,6 +222,8 @@ 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); @@ -237,7 +242,12 @@ void update_screen(int *current_line, int *temporary_line, int motion, } } - if(noblink) { // Erase the rest of the window. That's slightly ugly. + if(nb_printed_lines == 1) { + addnstr("[no selection]\n", console_width); + 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++] = ' '; @@ -264,7 +274,9 @@ void update_screen(int *current_line, int *temporary_line, int motion, addnstr(buffer, console_width); attroff(COLOR_PAIR(1)); - refresh(); // After doing something on the display, we refresh it + // We are done + + refresh(); } ////////////////////////////////////////////////////////////////////// @@ -272,10 +284,10 @@ 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 noblink = 0; + int no_blink = 0; char input_filename[buffer_size], output_filename[buffer_size]; - strcpy(input_filename, "/dev/stdin"); + strcpy(input_filename, ""); strcpy(output_filename, "/tmp/selector.out"); int i = 1; @@ -304,7 +316,7 @@ int main(int argc, char **argv) { } else if(strcmp(argv[i], "-b") == 0) { - noblink = 1; + no_blink = 1; i++; } @@ -315,7 +327,15 @@ int main(int argc, char **argv) { } else { - cerr << argv[0] << " [-h] [-o ] [-b] [-l ] [-s ] [-v]" << endl; + cerr << argv[0] + << " [-h]" + << " [-b]" + << " [-v]" + << " [-o ]" + << " [-s ]" + << " [-l ]" + << " -f " + << endl; if(strcmp(argv[i], "-h") == 0) { exit(0); } else { @@ -324,6 +344,11 @@ int main(int argc, char **argv) { } } + if(!input_filename[0]) { + cerr << "You must specify a input file with -f." << endl; + exit(1); + } + ifstream file(input_filename); if(file.fail()) { @@ -364,7 +389,7 @@ int main(int argc, char **argv) { int current_line = 0, temporary_line = 0; - update_screen(¤t_line, &temporary_line, 0, nb_lines, lines, patterns, noblink); + update_screen(¤t_line, &temporary_line, 0, nb_lines, lines, patterns, no_blink); do { @@ -384,6 +409,22 @@ int main(int argc, char **argv) { } } + else if(key == KEY_HOME) { + current_line = 0; + } + + else if(key == KEY_END) { + current_line = nb_lines - 1; + } + + else if(key == KEY_NPAGE) { + motion = 10; + } + + else if(key == KEY_PPAGE) { + motion = -10; + } + else if(key == KEY_UP || key == '') { motion = -1; } @@ -393,7 +434,7 @@ int main(int argc, char **argv) { } update_screen(¤t_line, &temporary_line, motion, - nb_lines, lines, patterns, noblink); + nb_lines, lines, patterns, no_blink); } while(key != '\n' && key != KEY_ENTER && key != ''); echo(); @@ -404,11 +445,29 @@ int main(int argc, char **argv) { 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); + + 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); + } } } else { - ofstream out(output_filename); if(out.fail()) { cerr << "Can not open " << output_filename << " for writing." << endl;