X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.cc;h=e119fc6db121bd36f3c9a44812b753c7be7e1f4a;hb=7b78746dc81a4654942ae17a4604d7443fbde929;hp=f1e60c01ceb0e07c3169193a3be45f8f589894b8;hpb=08270e13387994e72b20e123fed9e8b913fc6a0c;p=selector.git

diff --git a/selector.cc b/selector.cc
index f1e60c0..e119fc6 100644
--- a/selector.cc
+++ b/selector.cc
@@ -22,8 +22,9 @@
  *
  */
 
-// Here is how to use it as a super-history-search
-// ./selector -v -f ${HISTFILE}
+// To use it as a super-history-search for bash:
+//
+// alias h='./selector -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
@@ -43,21 +44,25 @@ using namespace std;
 
 #define VERSION "1.0"
 
+const int buffer_size = 1024;
+
 // Yeah, global variables!
 
-int buffer_size = 1024;
-int nb_lines_max = 10000;
+int nb_lines_max = 1000;
 char pattern_separator = ';';
 int output_to_vt_buffer = 0;
 int with_colors = 1;
+int zsh_history = 0, bash_history = 0;
+int inverse_order = 0;
+int remove_duplicates = 0;
 
 //////////////////////////////////////////////////////////////////////
 
-// This looks severly Linux-only ...
+// This looks severely Linux-only ...
 
 void inject_into_tty_buffer(char *line) {
   char *tty = ttyname(STDIN_FILENO);
-  int fd = open(tty, O_WRONLY);
+  int fd = open(tty, O_RDWR);
 
   struct termios oldtio, newtio;
 
@@ -122,8 +127,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 no_blink) {
+                   char *pattern_list) {
 
   char buffer[buffer_size];
 
@@ -157,8 +161,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.
 
@@ -195,14 +197,14 @@ void update_screen(int *current_line, int *temporary_line, int motion,
     }
   }
 
-  if(!no_blink) {
-    clear();
-  }
+  clear();
 
   use_default_colors();
 
   addstr("\n");
 
+  int nb_printed_lines = 1;
+
   // Here new_line is either a line number matching the patterns, or -1
 
   if(new_line >= 0) {
@@ -250,7 +252,7 @@ void update_screen(int *current_line, int *temporary_line, int motion,
         // 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) {
+        if(l == new_line) {
           while(k < console_width) {
             buffer[k++] = ' ';
           }
@@ -279,29 +281,18 @@ void update_screen(int *current_line, int *temporary_line, int motion,
       }
     }
 
-    *temporary_line = new_line;
     if(motion != 0) {
       *current_line = new_line;
     }
   }
 
+  *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++] = ' ';
-    }
-    buffer[k++] = '\n';
-    buffer[k++] = '\0';
-    for(int l = nb_printed_lines; l < console_height; l++) {
-      addnstr(buffer, console_width);
-    }
-  }
-
   // Draw the modeline
 
   sprintf(buffer, "%d/%d pattern: %s",
@@ -332,22 +323,24 @@ 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 no_blink = 0;
+  int color_fg_modeline, color_bg_modeline;
+  int color_fg_highlight, color_bg_highlight;
 
-  int color_fg_modeline = COLOR_WHITE;
-  int color_bg_modeline = COLOR_BLACK;
-  int color_fg_highlight = COLOR_BLACK;
-  int color_bg_highlight = COLOR_YELLOW;
+  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, "");
-  strcpy(output_filename, "/tmp/selector.out");
+  strcpy(output_filename, "");
 
   int i = 1;
   while(i < argc) {
+
     if(strcmp(argv[i], "-o") == 0) {
       check_opt(argc, argv, i, 1, "<output filename>");
       strncpy(output_filename, argv[i+1], buffer_size);
@@ -376,8 +369,23 @@ int main(int argc, char **argv) {
       i += 2;
     }
 
+    else if(strcmp(argv[i], "-i") == 0) {
+      inverse_order = 1;
+      i++;
+    }
+
+    else if(strcmp(argv[i], "-z") == 0) {
+      zsh_history = 1;
+      i++;
+    }
+
     else if(strcmp(argv[i], "-b") == 0) {
-      no_blink = 1;
+      bash_history = 1;
+      i++;
+    }
+
+    else if(strcmp(argv[i], "-r") == 0) {
+      remove_duplicates = 1;
       i++;
     }
 
@@ -387,8 +395,8 @@ int main(int argc, char **argv) {
       i += 2;
     }
 
-    else if(strcmp(argv[i], "-t") == 0) {
-      check_opt(argc, argv, i, 4, "<color fg modeline> <color bg modeline> <color fg highlight> <color bg highlight>");
+    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]);
@@ -403,10 +411,12 @@ int main(int argc, char **argv) {
            << endl
            << argv[0]
            << " [-h]"
-           << " [-b]"
            << " [-v]"
            << " [-m]"
-           << " [-t <color fg modeline> <color bg modeline> <color fg highlight> <color bg highlight>]"
+           << " [-r]"
+           << " [-z]"
+           << " [-i]"
+           << " [-c <fg modeline> <bg modeline> <fg highlight> <bg highlight>]"
            << " [-o <output filename>]"
            << " [-s <pattern separator>]"
            << " [-l <max number of lines>]"
@@ -420,11 +430,15 @@ int main(int argc, char **argv) {
     }
   }
 
+  char **lines = new char *[nb_lines_max];
+
   if(!input_filename[0]) {
     cerr << "You must specify a input file with -f." << endl;
     exit(1);
   }
 
+  int nb_lines = 0;
+
   ifstream file(input_filename);
 
   if(file.fail()) {
@@ -432,12 +446,55 @@ int main(int argc, char **argv) {
     return 1;
   }
 
-  int nb_lines = 0;
   while(nb_lines < nb_lines_max && !file.eof()) {
     file.getline(buffer, buffer_size);
-    lines[nb_lines] = new char[strlen(buffer) + 1];
-    strcpy(lines[nb_lines], buffer);
-    nb_lines++;
+    if(strcmp(buffer, "") != 0) {
+      char *s = buffer;
+      if(zsh_history && *s == ':') {
+        while(*s && *s != ';') s++;
+        if(*s == ';') s++;
+      }
+
+      if(bash_history && (*s == ' ' || (*s >= '0' && *s <= '9'))) {
+        while(*s == ' ' || (*s >= '0' && *s <= '9')) s++;
+      }
+
+      /*
+
+      // This is supposed to remove any duplicates, not only
+      // successive ones. However, it is O(N^2), we should use
+      // hash-codes
+
+      int keep = 1;
+
+      if(remove_duplicates) {
+        for(int k = 0; keep && k < nb_lines; k++) {
+          keep &= strcmp(lines[k], s);
+        }
+      }
+
+      if(keep) {
+        lines[nb_lines] = new char[strlen(s) + 1];
+        strcpy(lines[nb_lines], s);
+        nb_lines++;
+      }
+
+      */
+
+      if(!remove_duplicates || nb_lines == 0 || strcmp(lines[nb_lines - 1], s)) {
+        lines[nb_lines] = new char[strlen(s) + 1];
+        strcpy(lines[nb_lines], s);
+        nb_lines++;
+      }
+    }
+  }
+
+  if(inverse_order) {
+    for(int i = 0; i < nb_lines/2; i++) {
+      char *s = lines[nb_lines - 1 - i];
+      lines[nb_lines - 1 - i] = lines[i];
+      lines[i] = s;
+    }
   }
 
   char patterns[buffer_size];
@@ -474,7 +531,7 @@ int main(int argc, char **argv) {
   int key;
   int current_line = 0, temporary_line = 0;
 
-  update_screen(&current_line, &temporary_line, 0, nb_lines, lines, patterns, no_blink);
+  update_screen(&current_line, &temporary_line, 0, nb_lines, lines, patterns);
 
   do {
 
@@ -487,7 +544,8 @@ int main(int argc, char **argv) {
       patterns[patterns_point] = '\0';
     }
 
-    else if(key == KEY_BACKSPACE || key == KEY_DC || key == '') {
+    else if(key == KEY_BACKSPACE || key == '' ||
+            key == KEY_DC || key == '') {
       if(patterns_point > 0) {
         patterns_point--;
         patterns[patterns_point] = '\0';
@@ -519,7 +577,7 @@ int main(int argc, char **argv) {
     }
 
     update_screen(&current_line, &temporary_line, motion,
-                  nb_lines, lines, patterns, no_blink);
+                  nb_lines, lines, patterns);
 
   } while(key != '\n' && key != KEY_ENTER && key != '');
 
@@ -527,24 +585,35 @@ int main(int argc, char **argv) {
   curs_set(1);
   endwin();
 
-  if((key == KEY_ENTER || key == '\n') && temporary_line >= 0 && temporary_line < nb_lines) {
+  if((key == KEY_ENTER || key == '\n')) {
+
     if(output_to_vt_buffer) {
-      inject_into_tty_buffer(lines[temporary_line]);
-    } else {
+      if(temporary_line >= 0 && temporary_line < nb_lines) {
+        inject_into_tty_buffer(lines[temporary_line]);
+      }
+    }
+
+    if(output_filename[0]) {
       ofstream out(output_filename);
       if(out.fail()) {
         cerr << "Can not open " << output_filename << " for writing." << endl;
         exit(1);
       } else {
-        out << lines[temporary_line] << endl;
+        if(temporary_line >= 0 && temporary_line < nb_lines) {
+          out << lines[temporary_line] << endl;
+        } else {
+          out << endl;
+        }
       }
       out.flush();
     }
+
   }
 
   for(int l = 0; l < nb_lines; l++) {
     delete[] lines[l];
   }
+  delete[] lines;
 
   exit(0);
 }