X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=selector.cc;h=0878f8252cbfce7af72a85055c18ccb49472a8fb;hb=6d645205fcd54e4b61d1bf62a09aebee0a01dec9;hp=7a79979f92407210e80df4f0255961a97d2658c7;hpb=f2e1e79d32d18ac0c82f3c5c656c29c7e430c31a;p=selector.git

diff --git a/selector.cc b/selector.cc
index 7a79979..0878f82 100644
--- a/selector.cc
+++ b/selector.cc
@@ -31,13 +31,15 @@ using namespace std;
 const int buffer_size = 1024;
 const int nb_lines_max = 100000;
 
-void build_display(int *screen_line, int *line, int nb_lines, char **lines, char *regexp) {
+int refresh_screen(int *screen_line, int *line, int nb_lines, char **lines, char *regexp, int noblink) {
   char buffer[buffer_size];
 
   int maxx = getmaxx(stdscr);
   int maxy = min(buffer_size-2, getmaxy(stdscr));
 
-  // clear();         // Cleaning the window
+  if(!noblink) {
+    clear();
+  }
 
   use_default_colors();
 
@@ -45,6 +47,7 @@ void build_display(int *screen_line, int *line, int nb_lines, char **lines, char
 
   int nb_printed_lines = 1, last_printer_line = -1;
   int y = 0;
+  int current_line = -1;
 
   while(nb_printed_lines < maxy && y < nb_lines) {
     if(strstr(lines[y], regexp) &&
@@ -56,8 +59,10 @@ void build_display(int *screen_line, int *line, int nb_lines, char **lines, char
         k++;
       }
 
-      while(k < maxx - 1) {
-        buffer[k++] = ' ';
+      if(noblink) {
+        while(k < maxx - 1) {
+          buffer[k++] = ' ';
+        }
       }
       buffer[k++] = '\n';
       buffer[k++] = '\0';
@@ -66,6 +71,7 @@ void build_display(int *screen_line, int *line, int nb_lines, char **lines, char
         attron(COLOR_PAIR(2));
         printw(buffer);
         attroff(COLOR_PAIR(2));
+        current_line = y;
       } else {
         printw(buffer);
       }
@@ -76,7 +82,7 @@ void build_display(int *screen_line, int *line, int nb_lines, char **lines, char
     y++;
   }
 
-  { // Erase the rest of the window. That's slightly ugly.
+  if(noblink) { // Erase the rest of the window. That's slightly ugly.
     int k = 0;
     while(k < maxx - 1) {
       buffer[k++] = ' ';
@@ -99,11 +105,14 @@ void build_display(int *screen_line, int *line, int nb_lines, char **lines, char
   attroff(COLOR_PAIR(1));
 
   refresh();       // After doing something on the display, we refresh it
+
+  return current_line;
 }
 
 int main(int argc, char **argv) {
   char buffer[buffer_size];
   char *lines[nb_lines_max];
+  int noblink = 1;
 
   char *file_name;
   char stdin_name[] = "/dev/stdin";
@@ -152,7 +161,9 @@ int main(int argc, char **argv) {
 
   int line = 0, screen_line = 0;
 
-  build_display(&screen_line, &line, nb_lines, lines, regexp);
+  refresh_screen(&screen_line, &line, nb_lines, lines, regexp, noblink);
+
+  int current_line = -1;
 
   do {
 
@@ -180,13 +191,17 @@ int main(int argc, char **argv) {
       line++;
     }
 
-    build_display(&screen_line, &line, nb_lines, lines, regexp);
+    current_line = refresh_screen(&screen_line, &line, nb_lines, lines, regexp, noblink);
   } while(key != '\n' && key != KEY_ENTER && key != '');
 
   echo();
   curs_set(1);
   endwin();
 
+  ofstream out("/tmp/selector.out");
+  out << lines[current_line] << endl;
+  out.flush();
+
   for(int l = 0; l < nb_lines; l++) {
     delete[] lines[l];
   }