Automatic commit

[selector.git] / selector.cc

diff --git a/selector.cc b/selector.cc
index eb44a61..807f1a7 100644 (file)
--- a/selector.cc
+++ b/selector.cc
@@ -1,9 +1,10 @@
+

 /*
  *  selector is a simple shell command for selection of strings with a
  *  dynamic pattern-matching.
  *
  *  Copyright (c) 2009 Francois Fleuret
 /*
  *  selector is a simple shell command for selection of strings with a
  *  dynamic pattern-matching.
  *
  *  Copyright (c) 2009 Francois Fleuret

- *  Written by Francois Fleuret <francois.fleuret@idiap.ch>
+ *  Written by Francois Fleuret <francois@fleuret.org>

  *
  *  This file is part of selector.
  *
  *
  *  This file is part of selector.
  *


@@ -21,37 +22,36 @@
  *
  */
 
  *
  */
 

-/*
-
-  Here is the magical shell script for a smart bash-history. Note that
-  the line remains in /tmp/selector.out, which may be a security
-  concern.
+// Here is how to use it as a super-history-search
+// ./selector -v -f ${HISTFILE}

 
 

-  ./selector -f ~/.bash_history
-  OLD_SETTINGS=`stty -g`
-  stty -echo raw
-  writevt `tty` "`cat /tmp/selector.out`"
-  stty ${OLD_SETTINGS}
+// This software is highly Linux-specific, but I would be glad to get
+// patches to make it work on other OS

 
 

-*/
+#include <fstream>
+#include <iostream>

 
 #include <stdio.h>
 
 #include <stdio.h>

-#include <ncurses.h>
-#include <iostream>
-#include <fstream>
-#include <string.h>

 #include <stdlib.h>
 #include <stdlib.h>

-#include <sys/types.h>
-#include <sys/stat.h>
+#include <string.h>
+#include <ncurses.h>

 #include <fcntl.h>
 #include <fcntl.h>

+#include <sys/ioctl.h>
+#include <termios.h>

 
 using namespace std;
 
 
 using namespace std;
 

+#define VERSION "1.0"
+
+// Yeah, global variables!
+

 int buffer_size = 1024;
 int buffer_size = 1024;

-int nb_lines_max = 1000;
+int nb_lines_max = 10000;

 char pattern_separator = ';';
 int output_to_vt_buffer = 0;
 
 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++) {
     if(strstr(string, patterns[n]) == 0) return 0;
 int match(char *string, int nb_patterns, char **patterns) {
   for(int n = 0; n < nb_patterns; n++) {
     if(strstr(string, patterns[n]) == 0) return 0;


@@ -59,6 +59,8 @@ int match(char *string, int nb_patterns, char **patterns) {
   return 1;
 }
 
   return 1;
 }
 

+//////////////////////////////////////////////////////////////////////
+

 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] << "."
 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] << "."


@@ -69,6 +71,8 @@ void check_opt(int argc, char **argv, int n_opt, int n, const char *help) {
   }
 }
 
   }
 }
 

+//////////////////////////////////////////////////////////////////////
+

 int previous_visible(int current_line, int nb_lines, char **lines, int nb_patterns, char **patterns) {
   int line = current_line - 1;
   while(line >= 0 && !match(lines[line], nb_patterns, patterns)) line--;
 int previous_visible(int current_line, int nb_lines, char **lines, int nb_patterns, char **patterns) {
   int line = current_line - 1;
   while(line >= 0 && !match(lines[line], nb_patterns, patterns)) line--;


@@ -212,6 +216,9 @@ void update_screen(int *current_line, int *temporary_line, int motion,
           k++;
         }
 
           k++;
         }
 

+        // We fill the rest of the line with blanks if either we did
+        // not clear() or if this is the highlighted line
+

         if(no_blink || l == new_line) {
           while(k < console_width) {
             buffer[k++] = ' ';
         if(no_blink || l == new_line) {
           while(k < console_width) {
             buffer[k++] = ' ';


@@ -221,6 +228,8 @@ void update_screen(int *current_line, int *temporary_line, int motion,
         buffer[k++] = '\n';
         buffer[k++] = '\0';
 
         buffer[k++] = '\n';
         buffer[k++] = '\0';
 

+        // Highlight the highlighted line ...
+

         if(l == new_line) {
           attron(COLOR_PAIR(2));
           addnstr(buffer, console_width);
         if(l == new_line) {
           attron(COLOR_PAIR(2));
           addnstr(buffer, console_width);


@@ -239,10 +248,10 @@ void update_screen(int *current_line, int *temporary_line, int motion,
     }
   }
 
     }
   }
 

-  // if(nb_printed_lines == 1) {
-  // addnstr("[no selection]\n", console_width);
-  // nb_printed_lines++;
-  // }
+  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;
 
   if(no_blink) { // Erase the rest of the window. That's slightly ugly.
     int k = 0;


@@ -271,7 +280,9 @@ void update_screen(int *current_line, int *temporary_line, int motion,
   addnstr(buffer, console_width);
   attroff(COLOR_PAIR(1));
 
   addnstr(buffer, console_width);
   attroff(COLOR_PAIR(1));
 

-  refresh();       // After doing something on the display, we refresh it
+  // We are done
+
+  refresh();

 }
 
 //////////////////////////////////////////////////////////////////////
 }
 
 //////////////////////////////////////////////////////////////////////


@@ -280,9 +291,10 @@ int main(int argc, char **argv) {
   char buffer[buffer_size];
   char *lines[nb_lines_max];
   int no_blink = 0;
   char buffer[buffer_size];
   char *lines[nb_lines_max];
   int no_blink = 0;

+  int theme = 0;

 
   char input_filename[buffer_size], output_filename[buffer_size];
 
   char input_filename[buffer_size], output_filename[buffer_size];

-  strcpy(input_filename, "/dev/stdin");
+  strcpy(input_filename, "");

   strcpy(output_filename, "/tmp/selector.out");
 
   int i = 1;
   strcpy(output_filename, "/tmp/selector.out");
 
   int i = 1;


@@ -321,8 +333,27 @@ int main(int argc, char **argv) {
       i += 2;
     }
 
       i += 2;
     }
 

+    else if(strcmp(argv[i], "-t") == 0) {
+      check_opt(argc, argv, i, 1, "<color theme number>");
+      theme = atoi(argv[i+1]);
+      i += 2;
+    }
+

     else {
     else {

-      cerr << argv[0] << " [-h] [-o <output filename>] [-b] [-l <max number of lines>] [-s <pattern separator>] [-v]" << endl;
+      cerr << "Selector version " << VERSION
+           << endl
+           << "Written by Francois Fleuret <francois@fleuret.org>"
+           << endl
+           << argv[0]
+           << " [-h]"
+           << " [-b]"
+           << " [-v]"
+           << " [-t <color theme number>]"
+           << " [-o <output filename>]"
+           << " [-s <pattern separator>]"
+           << " [-l <max number of lines>]"
+           << " -f <input filename>"
+           << endl;

       if(strcmp(argv[i], "-h") == 0) {
         exit(0);
       } else {
       if(strcmp(argv[i], "-h") == 0) {
         exit(0);
       } else {


@@ -331,10 +362,15 @@ int main(int argc, char **argv) {
     }
   }
 
     }
   }
 

+  if(!input_filename[0]) {
+    cerr << "You must specify a input file with -f." << endl;
+    exit(1);
+  }
+

   ifstream file(input_filename);
 
   if(file.fail()) {
   ifstream file(input_filename);
 
   if(file.fail()) {

-    cerr << "Can not open \"" << input_filename << "\"" << endl;
+    cerr << "Can not open " << input_filename << endl;

     return 1;
   }
 
     return 1;
   }
 


@@ -355,7 +391,9 @@ int main(int argc, char **argv) {
 
   if(!has_colors()) {
     cerr << "No colors." << endl;
 
   if(!has_colors()) {
     cerr << "No colors." << endl;

-    return 1;
+    curs_set(1);
+    endwin();
+    exit(1);

   }
 
   noecho();
   }
 
   noecho();


@@ -363,9 +401,18 @@ int main(int argc, char **argv) {
   keypad(stdscr, TRUE);
 
   start_color();
   keypad(stdscr, TRUE);
 
   start_color();

-  // init_pair(1, COLOR_WHITE, COLOR_BLACK);
-  init_pair(1, COLOR_WHITE, COLOR_GREEN);
-  init_pair(2, COLOR_BLACK, COLOR_YELLOW);
+
+  switch(theme) {
+  default:
+  case 0:
+    init_pair(1, COLOR_WHITE, COLOR_GREEN);
+    init_pair(2, COLOR_BLACK, COLOR_YELLOW);
+    break;
+  case 1:
+    init_pair(1, COLOR_BLACK, COLOR_GREEN);
+    init_pair(2, COLOR_BLACK, COLOR_YELLOW);
+    break;
+  }

 
   int key;
 
 
   int key;
 


@@ -423,24 +470,38 @@ int main(int argc, char **argv) {
   curs_set(1);
   endwin();
 
   curs_set(1);
   endwin();
 

-  if(output_to_vt_buffer) {
-    if((key == KEY_ENTER || key == '\n') && temporary_line >= 0 && temporary_line < nb_lines) {
-      char *tty = ttyname (STDIN_FILENO);
+  if((key == KEY_ENTER || key == '\n') && temporary_line >= 0 && temporary_line < nb_lines) {
+    if(output_to_vt_buffer) {
+      char *tty = ttyname(STDIN_FILENO);

       int fd = open(tty, O_WRONLY);
       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);
+      struct termios oldtio, newtio;
+
+      if (fd >= 0) {
+        // Save current port settings
+        tcgetattr(fd,&oldtio);
+        bzero(&newtio, sizeof(newtio));
+        // Set input mode (non-canonical, *no echo*,...)
+        tcflush(fd, TCIFLUSH);
+        tcsetattr(fd,TCSANOW, &newtio);
+        // Put the selected line in the tty input buffer
+        for(char *k = lines[temporary_line]; *k; k++) {
+          ioctl(fd, TIOCSTI, k);
+        }
+        // Restore the old settings
+        tcsetattr(fd,TCSANOW, &oldtio);
+        close(fd);
+      } else {
+        cerr << "Can not open " << tty << "." << endl;
+        exit(1);
+      }

     } else {
     } else {

-      if((key == KEY_ENTER || key == '\n') && temporary_line >= 0 && temporary_line < nb_lines) {
-        out << lines[temporary_line] << endl;
+      ofstream out(output_filename);
+      if(out.fail()) {
+        cerr << "Can not open " << output_filename << " for writing." << endl;
+        exit(1);

       } else {
       } else {

-        out << endl;
+        out << lines[temporary_line] << endl;

       }
       out.flush();
     }
       }
       out.flush();
     }