X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.cc;h=ae945fd07e48c54acfb55184aa878f52bdb493da;hb=9de58bd4aa7acce6ab64ee5095cae71ed8e00cf9;hp=0f71d64a5e03cf7af6a9d331dade2c07e338d976;hpb=29ae32b4dcc59b874e8fc0d27bb0ec43673683f2;p=selector.git

diff --git a/selector.cc b/selector.cc
index 0f71d64..ae945fd 100644
--- a/selector.cc
+++ b/selector.cc
@@ -22,7 +22,7 @@
  *
  */
 
-// Here is how to use it as a super-history-search
+// 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
@@ -43,13 +43,16 @@ using namespace std;
 
 #define VERSION "1.0"
 
+const int buffer_size = 1024;
+
 // Yeah, global variables!
 
-int buffer_size = 1024;
 int nb_lines_max = 10000;
 char pattern_separator = ';';
 int output_to_vt_buffer = 0;
 int with_colors = 1;
+int zsh_history = 0;
+int inverse_order = 0;
 
 //////////////////////////////////////////////////////////////////////
 
@@ -157,8 +160,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.
 
@@ -203,6 +204,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) {
@@ -279,12 +282,13 @@ 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++;
@@ -334,17 +338,20 @@ 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) {
@@ -381,14 +388,24 @@ int main(int argc, char **argv) {
       i++;
     }
 
+    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], "-l") == 0) {
       check_opt(argc, argv, i, 1, "<maximum number of lines>");
       nb_lines_max = atoi(argv[i+1]);
       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 +420,11 @@ 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>]"
+           << " [-z]"
+           << " [-i]"
+           << " [-c <fg modeline> <bg modeline> <fg highlight> <bg highlight>]"
            << " [-o <output filename>]"
            << " [-s <pattern separator>]"
            << " [-l <max number of lines>]"
@@ -435,9 +453,24 @@ int main(int argc, char **argv) {
   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++;
+      }
+      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];
@@ -527,16 +560,24 @@ 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();
     }