From: Francois Fleuret Date: Fri, 20 Feb 2009 21:24:02 +0000 (+0100) Subject: Automatic commit X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=commitdiff_plain;h=f2e1e79d32d18ac0c82f3c5c656c29c7e430c31a;p=selector.git Automatic commit --- diff --git a/Makefile b/Makefile index 3136365..f3918de 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,36 @@ -all: selector.cc - g++ -lncurses -o selector selector.cc +######################################################################### +# 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 # +######################################################################### + +LDFLAGS=-lcurses + +ifeq ($(DEBUG),yes) + OPTIMIZE_FLAG = -ggdb3 -DDEBUG +else + OPTIMIZE_FLAG = -ggdb3 -O3 +endif + +CXXFLAGS = -Wall $(OPTIMIZE_FLAG) $(PROFILE_FLAG) $(CXXGLPK) + +all: selector + +selector: selector.o + $(CXX) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) diff --git a/selector.cc b/selector.cc index d809287..7a79979 100644 --- a/selector.cc +++ b/selector.cc @@ -31,61 +31,93 @@ using namespace std; const int buffer_size = 1024; const int nb_lines_max = 100000; -void build_display(int line, int nb_lines, char **lines, char *regexp) { +void build_display(int *screen_line, int *line, int nb_lines, char **lines, char *regexp) { char buffer[buffer_size]; int maxx = getmaxx(stdscr); - int maxy = getmaxy(stdscr); + int maxy = min(buffer_size-2, getmaxy(stdscr)); - clear(); // Cleaning the window - refresh(); // After doing something on the display, we refresh it + // clear(); // Cleaning the window use_default_colors(); printw("\n"); - printw("\n"); - int nb_printed_lines = 2; - for(int y = 0; nb_printed_lines < maxy && y < nb_lines; y++) { - if(strstr(lines[y], regexp)) { + int nb_printed_lines = 1, last_printer_line = -1; + int y = 0; + + while(nb_printed_lines < maxy && y < nb_lines) { + if(strstr(lines[y], regexp) && + (last_printer_line < 0 || strcmp(lines[y], lines[last_printer_line]))) { int k = 0; - while(lines[y][k] && k < buffer_size - 2 && k < maxx) { + + while(lines[y][k] && k < buffer_size - 2 && k < maxx - 1) { buffer[k] = lines[y][k]; k++; } + + while(k < maxx - 1) { + buffer[k++] = ' '; + } buffer[k++] = '\n'; buffer[k++] = '\0'; - printw(buffer); + + if(nb_printed_lines == *line + 1) { + attron(COLOR_PAIR(2)); + printw(buffer); + attroff(COLOR_PAIR(2)); + } else { + printw(buffer); + } + + last_printer_line = y; nb_printed_lines++; } + y++; + } + + { // Erase the rest of the window. That's slightly ugly. + int k = 0; + while(k < maxx - 1) { + buffer[k++] = ' '; + } + buffer[k++] = '\n'; + buffer[k++] = '\0'; + for(int l = nb_printed_lines; l < maxy; l++) { + printw(buffer); + } } // Draw the modeline move(0, 0); - attron(COLOR_PAIR(1)); // Let's print something in red on black - printw("%d/%d pattern: %s\n", nb_printed_lines, nb_lines - 2, regexp); - attroff(COLOR_PAIR(1)); // Let's get back to default colors! + attron(COLOR_PAIR(1)); + sprintf(buffer, "%d/%d pattern: %s", nb_printed_lines - 1, nb_lines, regexp); + for(int k = strlen(buffer); k < maxx - 1; k++) buffer[k] = ' '; + buffer[maxx-1] = '\0'; + printw(buffer); + attroff(COLOR_PAIR(1)); + + refresh(); // After doing something on the display, we refresh it } int main(int argc, char **argv) { - int dummy, xpos, ypos; - char buffer[buffer_size]; char *lines[nb_lines_max]; - ifstream file(argv[1]); + char *file_name; + char stdin_name[] = "/dev/stdin"; - if(argc != 2) { - cerr << argv[0] << " " << endl; - return 1; + if(argc == 2 && strcmp(argv[1], "-")) { + file_name = argv[1]; + } else { + file_name = stdin_name; } + ifstream file(file_name); + if(file.fail()) { - cerr << "Can not open \"" - << argv[1] - << "\"" - << endl; + cerr << "Can not open \"" << file_name << "\"" << endl; return 1; } @@ -101,44 +133,59 @@ int main(int argc, char **argv) { int regexp_point; regexp_point = 0; - initscr(); // Necessary to start a curses session + initscr(); - if (has_colors()) { - cout << "You can use color on this terminal" << endl; - } else { - cout << "No colors." << endl; + if(!has_colors()) { + cerr << "No colors." << endl; return 1; } - noecho(); // I don't want echo when I press a key - curs_set(0); // I don't want to see the cursor + noecho(); + curs_set(0); keypad(stdscr, TRUE); - start_color(); // We will use colors - init_pair(1, COLOR_WHITE, COLOR_BLACK); // red on black for error messages + start_color(); + init_pair(1, COLOR_WHITE, COLOR_BLACK); + init_pair(2, COLOR_BLACK, COLOR_YELLOW); - printw("Press a key to contine\n"); int key; - build_display(0, nb_lines, lines, regexp); + int line = 0, screen_line = 0; + + build_display(&screen_line, &line, nb_lines, lines, regexp); do { + key = getch(); + if(key >= ' ' && key <= 'z') { regexp[regexp_point++] = key; regexp[regexp_point] = '\0'; - } else if(key == KEY_BACKSPACE || key == KEY_DC) { + } + + else if(key == KEY_BACKSPACE || key == KEY_DC) { if(regexp_point > 0) { regexp_point--; regexp[regexp_point] = '\0'; } } - build_display(0, nb_lines, lines, regexp); - } while(key != '\n' && key != KEY_ENTER); - echo(); // We want to have echo - curs_set(1); // We want to see the cursor again - endwin(); // Back to normal + else if(key == KEY_UP || key == '') { + if(line > 0) { + line--; + } + } + + else if(key == KEY_DOWN || key == '') { + line++; + } + + build_display(&screen_line, &line, nb_lines, lines, regexp); + } while(key != '\n' && key != KEY_ENTER && key != ''); + + echo(); + curs_set(1); + endwin(); for(int l = 0; l < nb_lines; l++) { delete[] lines[l];