X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.cc;h=2990c7214bc881b4f2c81795e28322f03da0d0a3;hb=09b911cc2eb670c0abd47e58017de5d2c03010b7;hp=56b5b2a1eab3fffab057d1089b61f0deaf788b8f;hpb=5bd24e9e4be33163b1c8b1137e2e22005160dd0f;p=selector.git

diff --git a/selector.cc b/selector.cc
index 56b5b2a..2990c72 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
@@ -50,6 +50,7 @@ int nb_lines_max = 10000;
 char pattern_separator = ';';
 int output_to_vt_buffer = 0;
 int with_colors = 1;
+int zsh_history = 0;
 
 //////////////////////////////////////////////////////////////////////
 
@@ -157,8 +158,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 +202,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) {
@@ -335,11 +336,13 @@ 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, "");
 
@@ -382,14 +385,19 @@ int main(int argc, char **argv) {
       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]);
@@ -404,10 +412,10 @@ 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]"
+           << " [-c <fg modeline> <bg modeline> <fg highlight> <bg highlight>]"
            << " [-o <output filename>]"
            << " [-s <pattern separator>]"
            << " [-l <max number of lines>]"
@@ -436,8 +444,13 @@ 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);
+    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++;
   }