X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=selector.cc;h=f909ba03120653458ba5df5282c3e592d6fbb1da;hb=afff78731674c6eabce11d31aa2200cbf82d189d;hp=f1e60c01ceb0e07c3169193a3be45f8f589894b8;hpb=08270e13387994e72b20e123fed9e8b913fc6a0c;p=selector.git

diff --git a/selector.cc b/selector.cc
index f1e60c0..f909ba0 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
@@ -53,7 +53,7 @@ int with_colors = 1;
 
 //////////////////////////////////////////////////////////////////////
 
-// This looks severly Linux-only ...
+// This looks severely Linux-only ...
 
 void inject_into_tty_buffer(char *line) {
   char *tty = ttyname(STDIN_FILENO);
@@ -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++;
@@ -334,11 +335,13 @@ int main(int argc, char **argv) {
   char buffer[buffer_size];
   char *lines[nb_lines_max];
   int no_blink = 0;
+  int color_fg_modeline, color_bg_modeline;
+  int color_fg_highlight, color_bg_highlight;
 
-  int color_fg_modeline = COLOR_WHITE;
-  int color_bg_modeline = COLOR_BLACK;
-  int color_fg_highlight = COLOR_BLACK;
-  int color_bg_highlight = COLOR_YELLOW;
+  color_fg_modeline = COLOR_WHITE;
+  color_bg_modeline = COLOR_BLACK;
+  color_fg_highlight = COLOR_BLACK;
+  color_bg_highlight = COLOR_YELLOW;
 
   setlocale(LC_ALL, "");
 
@@ -387,8 +390,8 @@ int main(int argc, char **argv) {
       i += 2;
     }
 
-    else if(strcmp(argv[i], "-t") == 0) {
-      check_opt(argc, argv, i, 4, "<color fg modeline> <color bg modeline> <color fg highlight> <color bg highlight>");
+    else if(strcmp(argv[i], "-c") == 0) {
+      check_opt(argc, argv, i, 4, "<fg modeline> <bg modeline> <fg highlight> <bg highlight>");
       color_fg_modeline = atoi(argv[i+1]);
       color_bg_modeline = atoi(argv[i+2]);
       color_fg_highlight = atoi(argv[i+3]);
@@ -403,10 +406,9 @@ int main(int argc, char **argv) {
            << endl
            << argv[0]
            << " [-h]"
-           << " [-b]"
            << " [-v]"
            << " [-m]"
-           << " [-t <color fg modeline> <color bg modeline> <color fg highlight> <color bg highlight>]"
+           << " [-c <fg modeline> <bg modeline> <fg highlight> <bg highlight>]"
            << " [-o <output filename>]"
            << " [-s <pattern separator>]"
            << " [-l <max number of lines>]"
@@ -527,16 +529,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();
     }