From: Francois Fleuret Date: Thu, 12 Mar 2009 13:48:22 +0000 (+0100) Subject: Automatic commit X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=commitdiff_plain;h=c4f59cde9021b072b04c072ca6148e0593841587;p=selector.git Automatic commit --- diff --git a/selector.cc b/selector.cc index c63a1d3..42a54d6 100644 --- a/selector.cc +++ b/selector.cc @@ -21,41 +21,32 @@ * */ -/* - - 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. - - ./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 in bash +// +// ./selector -v -f ${HISTFILE} -*/ +#include +#include #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; @@ -63,6 +54,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] << "." @@ -73,6 +66,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--; @@ -216,6 +211,9 @@ void update_screen(int *current_line, int *temporary_line, int motion, k++; } + // 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++] = ' '; @@ -225,6 +223,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); @@ -243,10 +243,10 @@ void update_screen(int *current_line, int *temporary_line, int motion, } } - // if(nb_printed_lines == 1) { - // addnstr("[no selection]\n", console_width); - // nb_printed_lines++; - // } + 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; @@ -275,7 +275,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(); } //////////////////////////////////////////////////////////////////////