X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.cc;h=ecf4e766831d723c931df84895bdcd62b1de9c0b;hb=54d53a58e83dd4b5bb628f888e3ad03bb1b39c8c;hp=0f71d64a5e03cf7af6a9d331dade2c07e338d976;hpb=29ae32b4dcc59b874e8fc0d27bb0ec43673683f2;p=selector.git

diff --git a/selector.cc b/selector.cc
index 0f71d64..ecf4e76 100644
--- a/selector.cc
+++ b/selector.cc
@@ -22,7 +22,7 @@
  *
  */
 
-// Here is how to use it as a super-history-search
+// To use it as a super-history-search:
 // ./selector -v -f ${HISTFILE}
 
 // This software is highly Linux-specific, but I would be glad to get
@@ -157,8 +157,6 @@ void update_screen(int *current_line, int *temporary_line, int motion,
   int console_width = getmaxx(stdscr);
   int console_height = getmaxy(stdscr);
 
-  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.
 
@@ -203,6 +201,8 @@ void update_screen(int *current_line, int *temporary_line, int motion,
 
   addstr("\n");
 
+  int nb_printed_lines = 1;
+
   // Here new_line is either a line number matching the patterns, or -1
 
   if(new_line >= 0) {
@@ -279,12 +279,13 @@ void update_screen(int *current_line, int *temporary_line, int motion,
       }
     }
 
-    *temporary_line = new_line;
     if(motion != 0) {
       *current_line = new_line;
     }
   }
 
+  *temporary_line = new_line;
+
   if(nb_printed_lines == 1) {
     addnstr("[no selection]\n", console_width);
     nb_printed_lines++;
@@ -387,7 +388,7 @@ int main(int argc, char **argv) {
       i += 2;
     }
 
-    else if(strcmp(argv[i], "-t") == 0) {
+    else if(strcmp(argv[i], "-c") == 0) {
       check_opt(argc, argv, i, 4, "<color fg modeline> <color bg modeline> <color fg highlight> <color bg highlight>");
       color_fg_modeline = atoi(argv[i+1]);
       color_bg_modeline = atoi(argv[i+2]);
@@ -406,7 +407,7 @@ int main(int argc, char **argv) {
            << " [-b]"
            << " [-v]"
            << " [-m]"
-           << " [-t <color fg modeline> <color bg modeline> <color fg highlight> <color bg highlight>]"
+           << " [-c <color fg modeline> <color bg modeline> <color fg highlight> <color bg highlight>]"
            << " [-o <output filename>]"
            << " [-s <pattern separator>]"
            << " [-l <max number of lines>]"
@@ -527,16 +528,22 @@ int main(int argc, char **argv) {
   curs_set(1);
   endwin();
 
-  if((key == KEY_ENTER || key == '\n') && temporary_line >= 0 && temporary_line < nb_lines) {
+  if((key == KEY_ENTER || key == '\n')) {
     if(output_to_vt_buffer) {
-      inject_into_tty_buffer(lines[temporary_line]);
+      if(temporary_line >= 0 && temporary_line < nb_lines) {
+        inject_into_tty_buffer(lines[temporary_line]);
+      }
     } else {
       ofstream out(output_filename);
       if(out.fail()) {
         cerr << "Can not open " << output_filename << " for writing." << endl;
         exit(1);
       } else {
-        out << lines[temporary_line] << endl;
+        if(temporary_line >= 0 && temporary_line < nb_lines) {
+          out << lines[temporary_line] << endl;
+        } else {
+          out << endl;
+        }
       }
       out.flush();
     }