Automatic commit

[selector.git] / selector.cc

diff --git a/selector.cc b/selector.cc
index 5b62ca8..f15154f 100644 (file)
--- a/selector.cc
+++ b/selector.cc
@@ -1,24 +1,25 @@
-
-///////////////////////////////////////////////////////////////////////////
-// 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 <http://www.gnu.org/licenses/>.  //
-//                                                                       //
-// Written by and Copyright (C) Francois Fleuret                         //
-// Contact <francois.fleuret@idiap.ch> for comments & bug reports        //
-//                                                                       //
-// END_IP_HEADER                                                         //
-///////////////////////////////////////////////////////////////////////////
+/*
+ *  selector is a simple shell command for selection of strings with a
+ *  dynamic pattern-matching.
+ *
+ *  Copyright (c) 2008 Francois Fleuret
+ *  Written by Francois Fleuret <francois.fleuret@idiap.ch>
+ *
+ *  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 <http://www.gnu.org/licenses/>.
+ *
+ */
 
 /*
 
@@ -76,7 +77,7 @@ int next_visible(int current_line, int nb_lines, char **lines, int nb_patterns,
     return -1;
 }
 
-void update_screen(int *current_line, int motion,
+void update_screen(int *current_line, int *temporary_line, int motion,
                    int nb_lines, char **lines,
                    char *pattern_list,
                    int noblink) {
@@ -113,7 +114,7 @@ void update_screen(int *current_line, int motion,
   int console_width = getmaxx(stdscr);
   int console_height = getmaxy(stdscr);
 
-  int nb_printed_lines = 1, last_printer_line = -1;
+  int nb_printed_lines = 1;
 
   // First, we find a visible line. In priority: The current, or the
   // first visible after it, or the first visible before it.
@@ -218,11 +219,11 @@ void update_screen(int *current_line, int motion,
           addnstr(buffer, console_width);
         }
 
-        last_printer_line = l;
         nb_printed_lines++;
       }
     }
 
+    *temporary_line = new_line;
     if(motion != 0) {
       *current_line = new_line;
     }
@@ -348,9 +349,9 @@ int main(int argc, char **argv) {
 
   int key;
 
-  int line = 0;
+  int current_line = 0, temporary_line = 0;
 
-  update_screen(&line, 0, nb_lines, lines, patterns, noblink);
+  update_screen(&current_line, &temporary_line, 0, nb_lines, lines, patterns, noblink);
 
   do {
 
@@ -378,7 +379,8 @@ int main(int argc, char **argv) {
       motion = 1;
     }
 
-    update_screen(&line, motion, nb_lines, lines, patterns, noblink);
+    update_screen(&current_line, &temporary_line, motion,
+                  nb_lines, lines, patterns, noblink);
   } while(key != '\n' && key != KEY_ENTER && key != '\a');
 
   echo();
@@ -390,8 +392,8 @@ int main(int argc, char **argv) {
     cerr << "Can not open " << output_filename << " for writing." << endl;
     exit(1);
   } else {
-    if((key == KEY_ENTER || key == '\n') && line >= 0 && line < nb_lines) {
-      out << lines[line] << endl;
+    if((key == KEY_ENTER || key == '\n') && temporary_line >= 0 && temporary_line < nb_lines) {
+      out << lines[temporary_line] << endl;
     } else {
       out << endl;
     }