Automatic commit

[selector.git] / selector.cc

diff --git a/selector.cc b/selector.cc
index f15154f..eb44a61 100644 (file)
--- a/selector.cc
+++ b/selector.cc
@@ -2,7 +2,7 @@
  *  selector is a simple shell command for selection of strings with a
  *  dynamic pattern-matching.
  *
- *  Copyright (c) 2008 Francois Fleuret
+ *  Copyright (c) 2009 Francois Fleuret
  *  Written by Francois Fleuret <francois.fleuret@idiap.ch>
  *
  *  This file is part of selector.
@@ -24,7 +24,8 @@
 /*
 
   Here is the magical shell script for a smart bash-history. Note that
-  the line remains in /tmp/selector.out, which may be a scurity concern.
+  the line remains in /tmp/selector.out, which may be a security
+  concern.
 
   ./selector -f ~/.bash_history
   OLD_SETTINGS=`stty -g`
@@ -40,12 +41,16 @@
 #include <fstream>
 #include <string.h>
 #include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 
 using namespace std;
 
 int buffer_size = 1024;
-int nb_lines_max = 100000;
+int nb_lines_max = 1000;
 char pattern_separator = ';';
+int output_to_vt_buffer = 0;
 
 int match(char *string, int nb_patterns, char **patterns) {
   for(int n = 0; n < nb_patterns; n++) {
@@ -56,7 +61,10 @@ int match(char *string, int nb_patterns, char **patterns) {
 
 void check_opt(int argc, char **argv, int n_opt, int n, const char *help) {
   if(n_opt + n >= argc) {
-    cerr << "Missing argument for " << argv[n_opt] << ". Expecting " << help << "." << endl;
+    cerr << "Missing argument for " << argv[n_opt] << "."
+         << " "
+         << "Expecting " << help << "."
+         << endl;
     exit(1);
   }
 }
@@ -80,7 +88,7 @@ int next_visible(int current_line, int nb_lines, char **lines, int nb_patterns,
 void update_screen(int *current_line, int *temporary_line, int motion,
                    int nb_lines, char **lines,
                    char *pattern_list,
-                   int noblink) {
+                   int no_blink) {
 
   char buffer[buffer_size];
 
@@ -133,24 +141,26 @@ void update_screen(int *current_line, int *temporary_line, int motion,
 
   if(new_line >= 0 && motion != 0) {
     int l = new_line;
-    l += motion;
-
     if(motion > 0) {
       // We want to go down, let's find the first visible line below
-      l = next_visible(new_line, nb_lines, lines, nb_patterns, patterns);
-      if(l >= 0) {
-        new_line = l;
+      for(int m = 0; l >= 0 && m < motion; m++) {
+        l = next_visible(l, nb_lines, lines, nb_patterns, patterns);
+        if(l >= 0) {
+          new_line = l;
+        }
       }
     } else {
       // We want to go up, let's find the first visible line above
-      l = previous_visible(new_line, nb_lines, lines, nb_patterns, patterns);
-      if(l >= 0) {
-        new_line = l;
+      for(int m = 0; l >= 0 && m < -motion; m++) {
+        l = previous_visible(l, nb_lines, lines, nb_patterns, patterns);
+        if(l >= 0) {
+          new_line = l;
+        }
       }
     }
   }
 
-  if(!noblink) {
+  if(!no_blink) {
     clear();
   }
 
@@ -202,7 +212,7 @@ void update_screen(int *current_line, int *temporary_line, int motion,
           k++;
         }
 
-        if(noblink || l == new_line) {
+        if(no_blink || l == new_line) {
           while(k < console_width) {
             buffer[k++] = ' ';
           }
@@ -229,7 +239,12 @@ void update_screen(int *current_line, int *temporary_line, int motion,
     }
   }
 
-  if(noblink) { // Erase the rest of the window. That's slightly ugly.
+  // if(nb_printed_lines == 1) {
+  // addnstr("[no selection]\n", console_width);
+  // nb_printed_lines++;
+  // }
+
+  if(no_blink) { // Erase the rest of the window. That's slightly ugly.
     int k = 0;
     while(k < console_width) {
       buffer[k++] = ' ';
@@ -264,7 +279,7 @@ void update_screen(int *current_line, int *temporary_line, int motion,
 int main(int argc, char **argv) {
   char buffer[buffer_size];
   char *lines[nb_lines_max];
-  int noblink = 0;
+  int no_blink = 0;
 
   char input_filename[buffer_size], output_filename[buffer_size];
   strcpy(input_filename, "/dev/stdin");
@@ -284,6 +299,11 @@ int main(int argc, char **argv) {
       i += 2;
     }
 
+    else if(strcmp(argv[i], "-v") == 0) {
+      output_to_vt_buffer = 1;
+      i++;
+    }
+
     else if(strcmp(argv[i], "-f") == 0) {
       check_opt(argc, argv, i, 1, "<input filename>");
       strncpy(input_filename, argv[i+1], buffer_size);
@@ -291,7 +311,7 @@ int main(int argc, char **argv) {
     }
 
     else if(strcmp(argv[i], "-b") == 0) {
-      noblink = 1;
+      no_blink = 1;
       i++;
     }
 
@@ -302,7 +322,7 @@ int main(int argc, char **argv) {
     }
 
     else {
-      cerr << argv[0] << " [-h] [-o <output filename>] [-b] [-l <max number of lines>] [-s <pattern separator>]" << endl;
+      cerr << argv[0] << " [-h] [-o <output filename>] [-b] [-l <max number of lines>] [-s <pattern separator>] [-v]" << endl;
       if(strcmp(argv[i], "-h") == 0) {
         exit(0);
       } else {
@@ -351,7 +371,7 @@ int main(int argc, char **argv) {
 
   int current_line = 0, temporary_line = 0;
 
-  update_screen(&current_line, &temporary_line, 0, nb_lines, lines, patterns, noblink);
+  update_screen(&current_line, &temporary_line, 0, nb_lines, lines, patterns, no_blink);
 
   do {
 
@@ -371,6 +391,22 @@ int main(int argc, char **argv) {
       }
     }
 
+    else if(key == KEY_HOME) {
+      current_line = 0;
+    }
+
+    else if(key == KEY_END) {
+      current_line = nb_lines - 1;
+    }
+
+    else if(key == KEY_NPAGE) {
+      motion = 10;
+    }
+
+    else if(key == KEY_PPAGE) {
+      motion = -10;
+    }
+
     else if(key == KEY_UP || key == '\10') {
       motion = -1;
     }
@@ -380,24 +416,34 @@ int main(int argc, char **argv) {
     }
 
     update_screen(&current_line, &temporary_line, motion,
-                  nb_lines, lines, patterns, noblink);
+                  nb_lines, lines, patterns, no_blink);
   } while(key != '\n' && key != KEY_ENTER && key != '\a');
 
   echo();
   curs_set(1);
   endwin();
 
-  ofstream out(output_filename);
-  if(out.fail()) {
-    cerr << "Can not open " << output_filename << " for writing." << endl;
-    exit(1);
-  } else {
+  if(output_to_vt_buffer) {
     if((key == KEY_ENTER || key == '\n') && temporary_line >= 0 && temporary_line < nb_lines) {
-      out << lines[temporary_line] << endl;
+      char *tty = ttyname (STDIN_FILENO);
+      int fd = open(tty, O_WRONLY);
+      write(fd, lines[temporary_line], strlen(lines[temporary_line]));
+      close(fd);
+    }
+  } else {
+
+    ofstream out(output_filename);
+    if(out.fail()) {
+      cerr << "Can not open " << output_filename << " for writing." << endl;
+      exit(1);
     } else {
-      out << endl;
+      if((key == KEY_ENTER || key == '\n') && temporary_line >= 0 && temporary_line < nb_lines) {
+        out << lines[temporary_line] << endl;
+      } else {
+        out << endl;
+      }
+      out.flush();
     }
-    out.flush();
   }
 
   for(int l = 0; l < nb_lines; l++) {