X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.cc;h=9c669f78e0dba5f161abf52b49720d7f93c1fd22;hb=8c08e0c2af99b1855d857c29c84b81bef5ef3de5;hp=cfb583e1fb5b408e502032b47227e11bb3feb89c;hpb=951d423cb3aa421a271c287d45702fb0072d4681;p=selector.git

diff --git a/selector.cc b/selector.cc
index cfb583e..9c669f7 100644
--- a/selector.cc
+++ b/selector.cc
@@ -23,12 +23,8 @@
  */
 
 // To use it as a super-history-search for bash:
-//
 // alias h='selector -d -i -b -v -f <(history)'
 
-// 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>
 
@@ -60,16 +56,14 @@ int use_regexp = 0;
 
 //////////////////////////////////////////////////////////////////////
 
-// This looks severely Linux-only ...
-
-void inject_into_tty_buffer(char *line) {
+void inject_into_tty_buffer(char *string) {
   struct termios oldtio, newtio;
-  tcgetattr(STDIN_FILENO,&oldtio);
+  tcgetattr(STDIN_FILENO, &oldtio);
   memset(&newtio, 0, sizeof(newtio));
   // Set input mode (non-canonical, *no echo*,...)
   tcsetattr(STDIN_FILENO, TCSANOW, &newtio);
-  // Put the selected line in the tty input buffer
-  for(char *k = line; *k; k++) {
+  // Put the selected string in the tty input buffer
+  for(char *k = string; *k; k++) {
     ioctl(STDIN_FILENO, TIOCSTI, k);
   }
   // Restore the old settings
@@ -390,11 +384,11 @@ void update_screen(int *current_line, int *temporary_line, int motion,
 int main(int argc, char **argv) {
 
   if(!ttyname(STDIN_FILENO)) {
-    cerr << "Error: the standard input is not a tty." << endl;
+    cerr << "The standard input is not a tty." << endl;
     exit(1);
   }
 
-  char buffer[buffer_size];
+  char buffer[buffer_size], raw_line[buffer_size];;
   int color_fg_modeline, color_bg_modeline;
   int color_fg_highlight, color_bg_highlight;
 
@@ -500,20 +494,24 @@ int main(int argc, char **argv) {
          << "Written by Francois Fleuret <francois@fleuret.org>."
          << endl
          << endl
-         << argv[0]
-         << " [-h]"
-         << " [-v]"
-         << " [-m]"
-         << " [-d]"
-         << " [-e]"
-         << " [-b]"
-         << " [-z]"
-         << " [-i]"
-         << " [-c <fg modeline> <bg modeline> <fg highlight> <bg highlight>]"
-         << " [-o <output filename>]"
-         << " [-s <pattern separator>]"
-         << " [-l <max number of lines>]"
-         << " -f <input filename>"
+         << "Usage: " << argv[0] << " [options] -f <file>" << endl
+         << endl
+         << " -h      show this help" << endl
+         << " -v      inject the selected line in the tty" << endl
+         << " -d      remove duplicated lines" << endl
+         << " -b      remove the bash history line prefix" << endl
+         << " -z      remove the zsh history line prefix" << endl
+         << " -i      invert the order of lines" << endl
+         << " -e      start in regexp mode" << endl
+         << " -m      monochrome mode" << endl
+         << " -c <fg modeline> <bg modeline> <fg highlight> <bg highlight>" << endl
+         << "         set the display colors" << endl
+         << " -o <output filename>" << endl
+         << "         set a file to write the selected line to" << endl
+         << " -s <pattern separator>" << endl
+         << "         set the symbol to separate substrings in the pattern" << endl
+         << " -l <max number of lines>" << endl
+         << "         set the maximum number of lines to take into account" << endl
          << endl;
 
     exit(error);
@@ -543,9 +541,23 @@ int main(int argc, char **argv) {
   }
 
   while(nb_lines < nb_lines_max && !file.eof()) {
-    file.getline(buffer, buffer_size);
-    if(strcmp(buffer, "") != 0) {
-      char *s = buffer;
+
+    file.getline(raw_line, buffer_size);
+
+    if(raw_line[0]) {
+
+      char *s, *t;
+      const char *u;
+
+      s = buffer;
+      t = raw_line;
+      while(*t) {
+        u = unctrl(*t++);
+        while(*u) { *s++ = *u++; }
+      }
+      *s = '\0';
+
+      s = buffer;
 
       if(zsh_history && *s == ':') {
         while(*s && *s != ';') s++;