X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.cc;h=f909ba03120653458ba5df5282c3e592d6fbb1da;hb=18b5fa3a68a27a487b77923604e9de05d6263bf7;hp=7d12606325eef1c1f98e796b000f0cb219fb34cc;hpb=38bc30a889d71f9520aebd772240a06e93f626a5;p=selector.git

diff --git a/selector.cc b/selector.cc
index 7d12606..f909ba0 100644
--- a/selector.cc
+++ b/selector.cc
@@ -1,50 +1,87 @@
 
-///////////////////////////////////////////////////////////////////////////
-// 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) 2009 Francois Fleuret
+ *  Written by Francois Fleuret <francois@fleuret.org>
+ *
+ *  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/>.
+ *
+ */
+
+// 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
+// patches to make it work on other OS
 
-  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.
-
-  ./selector -f ~/.bash_history
-  OLD_SETTINGS=`stty -g`
-  stty -echo raw
-  writevt `tty` "`cat /tmp/selector.out`"
-  stty ${OLD_SETTINGS}
-
-*/
+#include <fstream>
+#include <iostream>
 
 #include <stdio.h>
-#include <ncurses.h>
-#include <iostream>
-#include <fstream>
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
+#include <ncurses.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <termios.h>
 
 using namespace std;
 
+#define VERSION "1.0"
+
+// Yeah, global variables!
+
 int buffer_size = 1024;
-int nb_lines_max = 100000;
+int nb_lines_max = 10000;
 char pattern_separator = ';';
+int output_to_vt_buffer = 0;
+int with_colors = 1;
+
+//////////////////////////////////////////////////////////////////////
+
+// This looks severely Linux-only ...
+
+void inject_into_tty_buffer(char *line) {
+  char *tty = ttyname(STDIN_FILENO);
+  int fd = open(tty, O_WRONLY);
+
+  struct termios oldtio, newtio;
+
+  if (fd >= 0) {
+    // Save current port settings
+    tcgetattr(fd,&oldtio);
+    memset(&newtio, 0, 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 = 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);
+  }
+}
+
+//////////////////////////////////////////////////////////////////////
 
 int match(char *string, int nb_patterns, char **patterns) {
   for(int n = 0; n < nb_patterns; n++) {
@@ -53,13 +90,20 @@ int match(char *string, int nb_patterns, char **patterns) {
   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] << ". Expecting " << help << "." << endl;
+    cerr << "Missing argument for " << argv[n_opt] << "."
+         << " "
+         << "Expecting " << help << "."
+         << endl;
     exit(1);
   }
 }
 
+//////////////////////////////////////////////////////////////////////
+
 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--;
@@ -79,7 +123,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];
 
@@ -113,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.
 
@@ -132,24 +174,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();
   }
 
@@ -157,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) {
@@ -201,7 +247,10 @@ void update_screen(int *current_line, int *temporary_line, int motion,
           k++;
         }
 
-        if(noblink || l == new_line) {
+        // 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++] = ' ';
           }
@@ -210,10 +259,18 @@ void update_screen(int *current_line, int *temporary_line, int motion,
         buffer[k++] = '\n';
         buffer[k++] = '\0';
 
+        // Highlight the highlighted line ...
+
         if(l == new_line) {
-          attron(COLOR_PAIR(2));
-          addnstr(buffer, console_width);
-          attroff(COLOR_PAIR(2));
+          if(with_colors) {
+            attron(COLOR_PAIR(2));
+            addnstr(buffer, console_width);
+            attroff(COLOR_PAIR(2));
+          } else {
+            attron(A_STANDOUT);
+            addnstr(buffer, console_width);
+            attroff(A_STANDOUT);
+          }
         } else {
           addnstr(buffer, console_width);
         }
@@ -222,13 +279,19 @@ void update_screen(int *current_line, int *temporary_line, int motion,
       }
     }
 
-    *temporary_line = new_line;
     if(motion != 0) {
       *current_line = new_line;
     }
   }
 
-  if(noblink) { // Erase the rest of the window. That's slightly ugly.
+  *temporary_line = new_line;
+
+  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++] = ' ';
@@ -251,11 +314,19 @@ void update_screen(int *current_line, int *temporary_line, int motion,
   buffer[console_width] = '\0';
 
   move(0, 0);
-  attron(COLOR_PAIR(1));
-  addnstr(buffer, console_width);
-  attroff(COLOR_PAIR(1));
+  if(with_colors) {
+    attron(COLOR_PAIR(1));
+    addnstr(buffer, console_width);
+    attroff(COLOR_PAIR(1));
+  } else {
+    attron(A_REVERSE);
+    addnstr(buffer, console_width);
+    attroff(A_REVERSE);
+  }
+
+  // We are done
 
-  refresh();       // After doing something on the display, we refresh it
+  refresh();
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -263,10 +334,19 @@ 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;
+  int color_fg_modeline, color_bg_modeline;
+  int color_fg_highlight, color_bg_highlight;
+
+  color_fg_modeline = COLOR_WHITE;
+  color_bg_modeline = COLOR_BLACK;
+  color_fg_highlight = COLOR_BLACK;
+  color_bg_highlight = COLOR_YELLOW;
+
+  setlocale(LC_ALL, "");
 
   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;
@@ -283,6 +363,16 @@ 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], "-m") == 0) {
+      with_colors = 0;
+      i++;
+    }
+
     else if(strcmp(argv[i], "-f") == 0) {
       check_opt(argc, argv, i, 1, "<input filename>");
       strncpy(input_filename, argv[i+1], buffer_size);
@@ -290,7 +380,7 @@ int main(int argc, char **argv) {
     }
 
     else if(strcmp(argv[i], "-b") == 0) {
-      noblink = 1;
+      no_blink = 1;
       i++;
     }
 
@@ -300,8 +390,30 @@ int main(int argc, char **argv) {
       i += 2;
     }
 
+    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]);
+      color_bg_highlight = atoi(argv[i+4]);
+      i += 5;
+    }
+
     else {
-      cerr << argv[0] << " [-h] [-o <output filename>] [-b] [-l <max number of lines>] [-s <pattern separator>]" << endl;
+      cerr << "Selector version " << VERSION
+           << endl
+           << "Written by Francois Fleuret <francois@fleuret.org>"
+           << endl
+           << argv[0]
+           << " [-h]"
+           << " [-v]"
+           << " [-m]"
+           << " [-c <fg modeline> <bg modeline> <fg highlight> <bg highlight>]"
+           << " [-o <output filename>]"
+           << " [-s <pattern separator>]"
+           << " [-l <max number of lines>]"
+           << " -f <input filename>"
+           << endl;
       if(strcmp(argv[i], "-h") == 0) {
         exit(0);
       } else {
@@ -310,10 +422,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()) {
-    cerr << "Can not open \"" << input_filename << "\"" << endl;
+    cerr << "Can not open " << input_filename << endl;
     return 1;
   }
 
@@ -332,25 +449,34 @@ int main(int argc, char **argv) {
 
   initscr();
 
-  if(!has_colors()) {
-    cerr << "No colors." << endl;
-    return 1;
+  if(with_colors) {
+    if(has_colors()) {
+      start_color();
+      if(color_fg_modeline < 0  || color_fg_modeline >= COLORS ||
+         color_bg_modeline < 0  || color_bg_modeline >= COLORS ||
+         color_fg_highlight < 0 || color_bg_highlight >= COLORS ||
+         color_bg_highlight < 0 || color_bg_highlight >= COLORS) {
+        echo();
+        curs_set(1);
+        endwin();
+        cerr << "Color numbers have to be between 0 and " << COLORS - 1 << "." << endl;
+        exit(1);
+      }
+      init_pair(1, color_fg_modeline, color_bg_modeline);
+      init_pair(2, color_fg_highlight, color_bg_highlight);
+    } else {
+      with_colors = 0;
+    }
   }
 
   noecho();
-  curs_set(0);
-  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);
+  curs_set(0); // Hide the cursor
+  keypad(stdscr, TRUE); // So that the arrow keys work
 
   int key;
-
   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 {
 
@@ -358,7 +484,7 @@ int main(int argc, char **argv) {
 
     int motion = 0;
 
-    if(key >= ' ' && key <= 'z') {
+    if(key >= ' ' && key <= '~') {
       patterns[patterns_point++] = key;
       patterns[patterns_point] = '\0';
     }
@@ -370,6 +496,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 == '') {
       motion = -1;
     }
@@ -379,24 +521,33 @@ 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 != '');
 
   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((key == KEY_ENTER || key == '\n') && temporary_line >= 0 && temporary_line < nb_lines) {
-      out << lines[temporary_line] << endl;
+  if((key == KEY_ENTER || key == '\n')) {
+    if(output_to_vt_buffer) {
+      if(temporary_line >= 0 && temporary_line < nb_lines) {
+        inject_into_tty_buffer(lines[temporary_line]);
+      }
     } else {
-      out << endl;
+      ofstream out(output_filename);
+      if(out.fail()) {
+        cerr << "Can not open " << output_filename << " for writing." << endl;
+        exit(1);
+      } else {
+        if(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++) {