Added an option to invert the orders of lines.

[selector.git] / selector.cc

diff --git a/selector.cc b/selector.cc
index ecf4e76..f89f6b8 100644 (file)
--- a/selector.cc
+++ b/selector.cc
@@ -50,6 +50,8 @@ 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;
 
 //////////////////////////////////////////////////////////////////////
 
@@ -335,11 +337,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,6 +386,16 @@ 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]);
@@ -389,7 +403,7 @@ int main(int argc, char **argv) {
     }
 
     else if(strcmp(argv[i], "-c") == 0) {
-      check_opt(argc, argv, i, 4, "<color fg modeline> <color bg modeline> <color fg highlight> <color bg highlight>");
+      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 +418,11 @@ int main(int argc, char **argv) {
            << endl
            << argv[0]
            << " [-h]"
-           << " [-b]"
            << " [-v]"
            << " [-m]"
-           << " [-c <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>]"
@@ -436,9 +451,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];