X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.cc;h=887b4d04c23b4005ce77927a082d35ae75f296b2;hb=b34072e0fd639bd0214c3186ca143c04962f51a7;hp=5b62ca884433060439662ca480d44da63c48f487;hpb=6041f7db9bee3bf4bbc49f028faaf791a962966a;p=selector.git

diff --git a/selector.cc b/selector.cc
index 5b62ca8..887b4d0 100644
--- 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/>.
+ *
+ */
 
 /*
 
@@ -39,12 +40,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++) {
@@ -55,7 +60,11 @@ 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);
   }
 }
@@ -76,7 +85,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 +122,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 +227,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;
     }
@@ -283,6 +292,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);
@@ -301,7 +315,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 {
@@ -348,9 +362,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,24 +392,35 @@ 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 != '');
 
   echo();
   curs_set(1);
   endwin();
 
-  ofstream out(output_filename);
-  if(out.fail()) {
-    cerr << "Can not open " << output_filename << " for writing." << endl;
-    exit(1);
+  if(output_to_vt_buffer) {
+    if((key == KEY_ENTER || key == '\n') && temporary_line >= 0 && temporary_line < nb_lines) {
+      char *tty = ttyname (STDIN_FILENO);
+      int fd = open(tty, O_WRONLY);
+      write(fd, lines[temporary_line], strlen(lines[temporary_line]));
+      close(fd);
+    }
   } else {
-    if((key == KEY_ENTER || key == '\n') && line >= 0 && line < nb_lines) {
-      out << lines[line] << endl;
+
+    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++) {