X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=selector.cc;h=42a54d64ac24455b7a20bde5a5a654d43a2fa928;hb=c4f59cde9021b072b04c072ca6148e0593841587;hp=5b62ca884433060439662ca480d44da63c48f487;hpb=6041f7db9bee3bf4bbc49f028faaf791a962966a;p=selector.git diff --git a/selector.cc b/selector.cc index 5b62ca8..42a54d6 100644 --- a/selector.cc +++ b/selector.cc @@ -1,50 +1,51 @@ - -/////////////////////////////////////////////////////////////////////////// -// START_IP_HEADER // -// // -// This program is free software: you can redistribute it and/or modify // -// it under the terms of the version 3 of the GNU General Public License // -// as published by the Free Software Foundation. // -// // -// This program is distributed in the hope that it will be useful, but // -// WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // -// General Public License for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with this program. If not, see . // -// // -// Written by and Copyright (C) Francois Fleuret // -// Contact for comments & bug reports // -// // -// END_IP_HEADER // -/////////////////////////////////////////////////////////////////////////// - /* + * selector is a simple shell command for selection of strings with a + * dynamic pattern-matching. + * + * Copyright (c) 2009 Francois Fleuret + * Written by Francois Fleuret + * + * This file is part of selector. + * + * selector is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 3 as + * published by the Free Software Foundation. + * + * selector is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with selector. If not, see . + * + */ + +// Here is how to use it as a super-history-search in bash +// +// ./selector -v -f ${HISTFILE} - 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} - -*/ +#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 = 100000; +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++) { @@ -53,13 +54,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--; @@ -76,10 +84,10 @@ int next_visible(int current_line, int nb_lines, char **lines, int nb_patterns, return -1; } -void update_screen(int *current_line, int motion, +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]; @@ -113,7 +121,7 @@ void update_screen(int *current_line, int motion, int console_width = getmaxx(stdscr); int console_height = getmaxy(stdscr); - int nb_printed_lines = 1, last_printer_line = -1; + 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. @@ -132,24 +140,26 @@ void update_screen(int *current_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(); } @@ -201,7 +211,10 @@ void update_screen(int *current_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++] = ' '; } @@ -210,6 +223,8 @@ void update_screen(int *current_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); @@ -218,17 +233,22 @@ void update_screen(int *current_line, int motion, addnstr(buffer, console_width); } - last_printer_line = l; nb_printed_lines++; } } + *temporary_line = new_line; if(motion != 0) { *current_line = new_line; } } - 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++] = ' '; @@ -255,7 +275,9 @@ void update_screen(int *current_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(); } ////////////////////////////////////////////////////////////////////// @@ -263,7 +285,7 @@ void update_screen(int *current_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"); @@ -283,6 +305,11 @@ int main(int argc, char **argv) { i += 2; } + else if(strcmp(argv[i], "-v") == 0) { + output_to_vt_buffer = 1; + i++; + } + else if(strcmp(argv[i], "-f") == 0) { check_opt(argc, argv, i, 1, ""); strncpy(input_filename, argv[i+1], buffer_size); @@ -290,7 +317,7 @@ int main(int argc, char **argv) { } else if(strcmp(argv[i], "-b") == 0) { - noblink = 1; + no_blink = 1; i++; } @@ -301,7 +328,7 @@ int main(int argc, char **argv) { } else { - cerr << argv[0] << " [-h] [-o ] [-b] [-l ] [-s ]" << endl; + cerr << argv[0] << " [-h] [-o ] [-b] [-l ] [-s ] [-v]" << endl; if(strcmp(argv[i], "-h") == 0) { exit(0); } else { @@ -348,9 +375,9 @@ int main(int argc, char **argv) { int key; - int line = 0; + int current_line = 0, temporary_line = 0; - update_screen(&line, 0, nb_lines, lines, patterns, noblink); + update_screen(¤t_line, &temporary_line, 0, nb_lines, lines, patterns, no_blink); do { @@ -370,6 +397,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; } @@ -378,24 +421,57 @@ int main(int argc, char **argv) { motion = 1; } - update_screen(&line, motion, nb_lines, lines, patterns, noblink); + 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(); - ofstream out(output_filename); - if(out.fail()) { - cerr << "Can not open " << output_filename << " for writing." << endl; - exit(1); + 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)); + newtio.c_cflag = 0; + newtio.c_iflag = 0; + newtio.c_oflag = 0; + // Set input mode (non-canonical, *no echo*,...) + newtio.c_lflag = 0; + tcflush(fd, TCIFLUSH); + tcsetattr(fd,TCSANOW, &newtio); + 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 { - if((key == KEY_ENTER || key == '\n') && line >= 0 && line < nb_lines) { - out << lines[line] << endl; + + ofstream out(output_filename); + if(out.fail()) { + cerr << "Can not open " << output_filename << " for writing." << endl; + exit(1); } else { - out << endl; + if((key == KEY_ENTER || key == '\n') && temporary_line >= 0 && temporary_line < nb_lines) { + out << lines[temporary_line] << endl; + } else { + out << endl; + } + out.flush(); } - out.flush(); } for(int l = 0; l < nb_lines; l++) {