From 49a8d9563a444aeaa5e732ef658e8ddd900d4294 Mon Sep 17 00:00:00 2001 From: Francois Fleuret Date: Wed, 11 Mar 2009 20:54:21 +0100 Subject: [PATCH] Automatic commit --- selector.cc | 131 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 81 insertions(+), 50 deletions(-) diff --git a/selector.cc b/selector.cc index 4b41d07..50620b6 100644 --- a/selector.cc +++ b/selector.cc @@ -28,15 +28,38 @@ using namespace std; -ostream *log; - -const int buffer_size = 1024; -const int nb_lines_max = 100000; +int buffer_size = 1024; +int nb_lines_max = 100000; int match(char *string, char *regexp) { return strstr(string, regexp) != 0; } +void check(int condition, const char *message) { + if(!condition) { + echo(); + curs_set(1); + endwin(); + cout << message << endl; + } +} + +int previous_visible(int current_line, int nb_lines, char **lines, char *regexp) { + int line = current_line - 1; + while(line >= 0 && !match(lines[line], regexp)) line--; + return line; +} + +int next_visible(int current_line, int nb_lines, char **lines, char *regexp) { + int line = current_line + 1; + while(line < nb_lines && !match(lines[line], regexp)) line++; + + if(line < nb_lines) + return line; + else + return -1; +} + void update_screen(int *current_line, int motion, int nb_lines, char **lines, char *regexp, int noblink) { @@ -46,52 +69,59 @@ void update_screen(int *current_line, int motion, int console_width = getmaxx(stdscr); int console_height = getmaxy(stdscr); - if(!noblink) { - clear(); - } - - use_default_colors(); - - printw("\n"); - int nb_printed_lines = 1, last_printer_line = -1; + // First, we find a visible line. In priority: The current, or the + // first visible after it, or the first visible before it. + int new_line; - if(motion >= 0) { - new_line = *current_line + motion; - while(new_line < nb_lines && !match(lines[new_line], regexp)) { - new_line++; - } - if(new_line == nb_lines) { - new_line = *current_line; - while(new_line >= 0 && ! match(lines[new_line], regexp)) { - new_line--; - } - } + if(match(lines[*current_line], regexp)) { + new_line = *current_line; } else { - - new_line = *current_line - 1; - while(new_line >= 0 && ! match(lines[new_line], regexp)) { - new_line--; + new_line = next_visible(*current_line, nb_lines, lines, regexp); + if(new_line < 0) { + new_line = previous_visible(*current_line, nb_lines, lines, regexp); } + } - if(new_line < 0) { - new_line = *current_line; - while(new_line < nb_lines && !match(lines[new_line], regexp)) { - new_line++; + // If we found a visible line and we should move, let's move + + 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, regexp); + if(l >= 0) { + new_line = l; } - if(new_line == nb_lines) { - new_line = -1; + } else { + // We want to go up, let's find the first visible line above + l = previous_visible(new_line, nb_lines, lines, regexp); + if(l >= 0) { + new_line = l; } } } + if(!noblink) { + clear(); + } + + use_default_colors(); + + addstr("\n"); + + check(new_line < nb_lines, "Ouch!"); + // Here new_line is either a line number matching the regexp, or -1 if(new_line >= 0) { + int first_line = new_line, last_line = new_line, nb_match = 1; - while(nb_match < console_height && (first_line > 0 || last_line < nb_lines - 1)) { + while(nb_match < console_height-1 && (first_line > 0 || last_line < nb_lines - 1)) { if(first_line > 0) { first_line--; @@ -115,6 +145,8 @@ void update_screen(int *current_line, int motion, } } + check(first_line >= 0 && last_line < nb_lines, "ouch2"); + for(int l = first_line; l <= last_line; l++) { if(match(lines[l], regexp)) { int k = 0; @@ -129,15 +161,16 @@ void update_screen(int *current_line, int motion, buffer[k++] = ' '; } } + buffer[k++] = '\n'; buffer[k++] = '\0'; if(l == new_line) { attron(COLOR_PAIR(2)); - printw(buffer); + addstr(buffer); attroff(COLOR_PAIR(2)); } else { - printw(buffer); + addstr(buffer); } last_printer_line = l; @@ -145,7 +178,11 @@ void update_screen(int *current_line, int motion, } } - *current_line = new_line; + check(nb_printed_lines != nb_match, "ouch3"); + + if(motion != 0) { + *current_line = new_line; + } } if(noblink) { // Erase the rest of the window. That's slightly ugly. @@ -156,7 +193,7 @@ void update_screen(int *current_line, int motion, buffer[k++] = '\n'; buffer[k++] = '\0'; for(int l = nb_printed_lines; l < console_height; l++) { - printw(buffer); + addstr(buffer); } } @@ -167,7 +204,7 @@ void update_screen(int *current_line, int motion, sprintf(buffer, "%d/%d pattern: %s", nb_printed_lines - 1, nb_lines, regexp); for(int k = strlen(buffer); k < console_width - 1; k++) buffer[k] = ' '; buffer[console_width-1] = '\0'; - printw(buffer); + addstr(buffer); attroff(COLOR_PAIR(1)); refresh(); // After doing something on the display, we refresh it @@ -176,9 +213,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; - - log = new fstream("/tmp/selector.log"); + int noblink = 1; char *file_name; char stdin_name[] = "/dev/stdin"; @@ -204,7 +239,8 @@ int main(int argc, char **argv) { nb_lines++; } - char regexp[buffer_size]=""; + char regexp[buffer_size]; + regexp[0] = '\0'; int regexp_point; regexp_point = 0; @@ -227,9 +263,7 @@ int main(int argc, char **argv) { int line = 0; - update_screen(&line, 0, - nb_lines, lines, - regexp, noblink); + update_screen(&line, 0, nb_lines, lines, regexp, noblink); do { @@ -242,7 +276,7 @@ int main(int argc, char **argv) { regexp[regexp_point] = '\0'; } - else if(key == KEY_BACKSPACE || key == KEY_DC) { + else if(key == KEY_BACKSPACE || key == KEY_DC || key == '') { if(regexp_point > 0) { regexp_point--; regexp[regexp_point] = '\0'; @@ -276,8 +310,5 @@ int main(int argc, char **argv) { delete[] lines[l]; } - log->flush(); - delete log; - return 0; } -- 2.20.1