X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.cc;h=eb44a61c891cef6d4d006652d6363d967796ef8c;hb=f096f32710e8de97b870b7728746d442f0cce4ab;hp=7d12606325eef1c1f98e796b000f0cb219fb34cc;hpb=38bc30a889d71f9520aebd772240a06e93f626a5;p=selector.git diff --git a/selector.cc b/selector.cc index 7d12606..eb44a61 100644 --- a/selector.cc +++ b/selector.cc @@ -1,29 +1,31 @@ - -/////////////////////////////////////////////////////////////////////////// -// 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 the magical shell script for a smart bash-history. Note that - the line remains in /tmp/selector.out, which may be a scurity concern. + the line remains in /tmp/selector.out, which may be a security + concern. ./selector -f ~/.bash_history OLD_SETTINGS=`stty -g` @@ -39,12 +41,16 @@ #include #include #include +#include +#include +#include using namespace std; 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++) { @@ -55,7 +61,10 @@ int match(char *string, int nb_patterns, char **patterns) { 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); } } @@ -79,7 +88,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]; @@ -132,24 +141,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(); } @@ -201,7 +212,7 @@ void update_screen(int *current_line, int *temporary_line, int motion, k++; } - if(noblink || l == new_line) { + if(no_blink || l == new_line) { while(k < console_width) { buffer[k++] = ' '; } @@ -228,7 +239,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++] = ' '; @@ -263,7 +279,7 @@ 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"); @@ -283,6 +299,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 +311,7 @@ int main(int argc, char **argv) { } else if(strcmp(argv[i], "-b") == 0) { - noblink = 1; + no_blink = 1; i++; } @@ -301,7 +322,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 { @@ -350,7 +371,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 { @@ -370,6 +391,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; } @@ -379,24 +416,34 @@ 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(); curs_set(1); endwin(); - ofstream out(output_filename); - if(out.fail()) { - cerr << "Can not open " << output_filename << " for writing." << endl; - exit(1); - } else { + if(output_to_vt_buffer) { if((key == KEY_ENTER || key == '\n') && temporary_line >= 0 && temporary_line < nb_lines) { - out << lines[temporary_line] << endl; + char *tty = ttyname (STDIN_FILENO); + int fd = open(tty, O_WRONLY); + write(fd, lines[temporary_line], strlen(lines[temporary_line])); + close(fd); + } + } else { + + 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++) {