X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.cc;h=a22329c6e00fcdf4f91a4ea1005f939ed2f4306f;hb=7320103ce09081bd91399522a4eb003c58289679;hp=8c17dc1410627390cbc616ecd25183946fac7e5a;hpb=c95741cdde744c87f121d4ee128d0e42ab37bee2;p=selector.git

diff --git a/selector.cc b/selector.cc
index 8c17dc1..a22329c 100644
--- a/selector.cc
+++ b/selector.cc
@@ -23,7 +23,7 @@
  */
 
 // To use it as a super-history-search for bash:
-// alias h='selector -d -i -b -v -f <(history)'
+// selector -q -b -i -d -v -w -l 10000 <(history)
 
 #include <fstream>
 #include <iostream>
@@ -47,9 +47,12 @@ const int buffer_size = 4096;
 
 int nb_lines_max = 1000;
 char pattern_separator = ';';
+char label_separator = '\0';
 int output_to_vt_buffer = 0;
+int add_control_qs = 0;
 int with_colors = 1;
-int zsh_history = 0, bash_history = 0;
+int zsh_history = 0;
+int bash_history = 0;
 int inverse_order = 0;
 int remove_duplicates = 0;
 int use_regexp = 0;
@@ -59,6 +62,9 @@ int error_flash = 0;
 
 #define COLOR_MODELINE 1
 #define COLOR_HIGHLIGHTED_LINE 2
+#define COLOR_ERROR 3
+
+int attr_modeline, attr_highlighted_line, attr_error;
 
 //////////////////////////////////////////////////////////////////////
 
@@ -68,8 +74,13 @@ void inject_into_tty_buffer(char *string) {
   memset(&newtio, 0, sizeof(newtio));
   // Set input mode (non-canonical, *no echo*,...)
   tcsetattr(STDIN_FILENO, TCSANOW, &newtio);
+  const char control_q = '\021';
   // Put the selected string in the tty input buffer
-  for(char *k = string; *k; k++) {
+  for(const char *k = string; *k; k++) {
+    if(add_control_qs && !(*k >= ' ' && *k <= '~')) {
+      // Add ^Q to quote control characters
+      ioctl(STDIN_FILENO, TIOCSTI, &control_q);
+    }
     ioctl(STDIN_FILENO, TIOCSTI, k);
   }
   // Restore the old settings
@@ -342,12 +353,13 @@ void update_screen(int *current_line, int *temporary_line, int motion,
 
   int nb_printed_lines = 0;
 
-  clear();
   use_default_colors();
   addstr("\n");
 
   if(matcher.regexp_error) {
-    addstr("[regexp error]");
+    attron(attr_error);
+    addnstr("[regexp error]", console_width);
+    attroff(attr_error);
   } else if(nb_lines > 0) {
     int new_line;
     if(match(lines[*current_line], &matcher)) {
@@ -438,18 +450,14 @@ void update_screen(int *current_line, int *temporary_line, int motion,
           buffer[k++] = '\n';
           buffer[k++] = '\0';
 
+          clrtoeol();
+
           // Highlight the highlighted line ...
 
           if(l == new_line) {
-            if(with_colors) {
-              attron(COLOR_PAIR(COLOR_HIGHLIGHTED_LINE));
-              addnstr(buffer, console_width);
-              attroff(COLOR_PAIR(COLOR_HIGHLIGHTED_LINE));
-            } else {
-              attron(A_STANDOUT);
-              addnstr(buffer, console_width);
-              attroff(A_STANDOUT);
-            }
+            attron(attr_highlighted_line);
+            addnstr(buffer, console_width);
+            attroff(attr_highlighted_line);
           } else {
             addnstr(buffer, console_width);
           }
@@ -466,21 +474,23 @@ void update_screen(int *current_line, int *temporary_line, int motion,
     *temporary_line = new_line;
 
     if(nb_printed_lines == 0) {
-      addnstr("[no selection]\n", console_width);
+      attron(attr_error);
+      addnstr("[no selection]", console_width);
+      attroff(attr_error);
     }
   } else {
-    addnstr("[empty choice]\n", console_width);
+    attron(attr_error);
+    addnstr("[empty choice]", console_width);
+    attroff(attr_error);
   }
 
+  clrtobot();
+
   // Draw the modeline
 
   move(0, 0);
 
-  if(with_colors) {
-    attron(COLOR_PAIR(COLOR_MODELINE));
-  } else {
-    attron(A_REVERSE);
-  }
+  attron(attr_modeline);
 
   for(int k = 0; k < console_width; k++) buffer[k] = ' ';
   buffer[console_width] = '\0';
@@ -529,11 +539,7 @@ void update_screen(int *current_line, int *temporary_line, int motion,
 
   move(0, cursor_x);
 
-  if(with_colors) {
-    attroff(COLOR_PAIR(COLOR_MODELINE));
-  } else {
-    attroff(A_REVERSE);
-  }
+  attroff(attr_modeline);
 
   // We are done
 
@@ -547,7 +553,7 @@ void read_file(const char *input_filename,
                int nb_lines_max, int *nb_lines, char **lines,
                int hash_table_size, int *hash_table) {
 
-  char buffer[buffer_size], raw_line[buffer_size];;
+  char raw_line[buffer_size];;
 
   ifstream file(input_filename);
 
@@ -568,15 +574,14 @@ void read_file(const char *input_filename,
         exit(1);
       }
 
-      char *s, *t;
-      const char *u;
+      char *t;
 
       t = raw_line;
 
       // Remove the zsh history prefix
 
       if(zsh_history && *t == ':') {
-        while(*t && *t != ';') s++;
+        while(*t && *t != ';') t++;
         if(*t == ';') t++;
       }
 
@@ -588,31 +593,20 @@ void read_file(const char *input_filename,
         while(*t == ' ') t++;
       }
 
-      // Copy the string while transforming the ctrl characters into
-      // printable characters
-
-      s = buffer;
-
-      while(*t) {
-        u = unctrl(*t++);
-        while(*u) { *s++ = *u++; }
-      }
-      *s = '\0';
-
       // Check for duplicates with the hash table and insert the line
       // in the list if necessary
 
       int dup;
 
       if(hash_table) {
-        dup = test_and_add(buffer, *nb_lines, lines, hash_table, hash_table_size);
+        dup = test_and_add(t, *nb_lines, lines, hash_table, hash_table_size);
       } else {
         dup = -1;
       }
 
       if(dup < 0) {
-        lines[*nb_lines] = new char[strlen(buffer) + 1];
-        strcpy(lines[*nb_lines], buffer);
+        lines[*nb_lines] = new char[strlen(t) + 1];
+        strcpy(lines[*nb_lines], t);
       } else {
         // The string was already in there, so we do not allocate a
         // new string but use the pointer to the first occurence of it
@@ -667,11 +661,22 @@ int main(int argc, char **argv) {
       i += 2;
     }
 
+    else if(strcmp(argv[i], "-x") == 0) {
+      check_opt(argc, argv, i, 1, "<label separator>");
+      label_separator = argv[i+1][0];
+      i += 2;
+    }
+
     else if(strcmp(argv[i], "-v") == 0) {
       output_to_vt_buffer = 1;
       i++;
     }
 
+    else if(strcmp(argv[i], "-w") == 0) {
+      add_control_qs = 1;
+      i++;
+    }
+
     else if(strcmp(argv[i], "-m") == 0) {
       with_colors = 0;
       i++;
@@ -714,6 +719,8 @@ int main(int argc, char **argv) {
     }
 
     else if(strcmp(argv[i], "-a") == 0) {
+      case_sensitive = 1;
+      i++;
     }
 
     else if(strcmp(argv[i], "-t") == 0) {
@@ -765,6 +772,7 @@ int main(int argc, char **argv) {
          << endl
          << " -h      show this help" << endl
          << " -v      inject the selected line in the tty" << endl
+         << " -w      quote control characters with ^Qs when using -v" << endl
          << " -d      remove duplicated lines" << endl
          << " -b      remove the bash history line prefix" << endl
          << " -z      remove the zsh history line prefix" << endl
@@ -773,7 +781,7 @@ int main(int argc, char **argv) {
          << " -a      case sensitive" << endl
          << " -m      monochrome mode" << endl
          << " -q      make a flash instead of a beep on an edition error" << endl
-         << " --      rest of the arguments are filenames" << endl
+         << " --      all following arguments are filenames" << endl
          << " -t <title>" << endl
          << "         add a title in the modeline" << endl
          << " -c <fg modeline> <bg modeline> <fg highlight> <bg highlight>" << endl
@@ -782,6 +790,8 @@ int main(int argc, char **argv) {
          << "         set a file to write the selected line to" << endl
          << " -s <pattern separator>" << endl
          << "         set the symbol to separate substrings in the pattern" << endl
+         << " -x <label separator>" << endl
+         << "         set the symbol to terminate the label" << endl
          << " -l <max number of lines>" << endl
          << "         set the maximum number of lines to take into account" << endl
          << endl;
@@ -833,8 +843,33 @@ int main(int argc, char **argv) {
     }
   }
 
+  // Build the labels from the strings, take only the part before the
+  // label_separator and transform control characters to printable
+  // ones
+
+  char **labels = new char *[nb_lines];
+  for(int l = 0; l < nb_lines; l++) {
+    char *s, *t;
+    const char *u;
+    t = lines[l];
+    int e = 0;
+    while(*t && *t != label_separator) {
+      u = unctrl(*t++);
+      e += strlen(u);
+    }
+    labels[l] = new char[e + 1];
+    t = lines[l];
+    s = labels[l];
+    while(*t && *t != label_separator) {
+      u = unctrl(*t++);
+      while(*u) { *s++ = *u++; }
+    }
+    *s = '\0';
+  }
+
   char pattern[buffer_size];
   pattern[0] = '\0';
+
   int cursor_position;
   cursor_position = 0;
 
@@ -848,34 +883,39 @@ int main(int argc, char **argv) {
   // So that the arrow keys work
   keypad(stdscr, TRUE);
 
-  if(with_colors) {
+  attr_error = A_STANDOUT;
+  attr_modeline = A_REVERSE;
+  attr_highlighted_line = A_STANDOUT;
 
-    if(has_colors()) {
+  if(with_colors && has_colors()) {
 
-      start_color();
+    start_color();
 
-      if(color_fg_modeline < 0  || color_fg_modeline >= COLORS ||
-         color_bg_modeline < 0  || color_bg_modeline >= COLORS ||
-         color_fg_highlight < 0 || color_bg_highlight >= COLORS ||
-         color_bg_highlight < 0 || color_bg_highlight >= COLORS) {
-        echo();
-        endwin();
-        cerr << "Color numbers have to be between 0 and " << COLORS - 1 << "." << endl;
-        exit(1);
-      }
+    if(color_fg_modeline < 0  || color_fg_modeline >= COLORS ||
+       color_bg_modeline < 0  || color_bg_modeline >= COLORS ||
+       color_fg_highlight < 0 || color_bg_highlight >= COLORS ||
+       color_bg_highlight < 0 || color_bg_highlight >= COLORS) {
+      echo();
+      endwin();
+      cerr << "Color numbers have to be between 0 and " << COLORS - 1 << "." << endl;
+      exit(1);
+    }
 
-      init_pair(COLOR_MODELINE, color_fg_modeline, color_bg_modeline);
-      init_pair(COLOR_HIGHLIGHTED_LINE, color_fg_highlight, color_bg_highlight);
+    init_pair(COLOR_MODELINE, color_fg_modeline, color_bg_modeline);
+    init_pair(COLOR_HIGHLIGHTED_LINE, color_fg_highlight, color_bg_highlight);
+    init_pair(COLOR_ERROR, COLOR_WHITE, COLOR_RED);
+
+    attr_modeline = COLOR_PAIR(COLOR_MODELINE);
+    attr_highlighted_line = COLOR_PAIR(COLOR_HIGHLIGHTED_LINE);
+    attr_error = COLOR_PAIR(COLOR_ERROR);
 
-    } else {
-      with_colors = 0;
-    }
   }
 
   int key;
   int current_line = 0, temporary_line = 0;
 
-  update_screen(&current_line, &temporary_line, 0, nb_lines, lines, cursor_position, pattern);
+  update_screen(&current_line, &temporary_line, 0,
+                nb_lines, labels, cursor_position, pattern);
 
   do {
 
@@ -960,8 +1000,13 @@ int main(int argc, char **argv) {
       kill_after_cursor(pattern, &cursor_position);
     }
 
+    else if(key == '\014') { // ^L
+      // I suspect that we may sometime mess up the display
+      clear();
+    }
+
     update_screen(&current_line, &temporary_line, motion,
-                  nb_lines, lines, cursor_position, pattern);
+                  nb_lines, labels, cursor_position, pattern);
 
   } while(key != '\007' && // ^G
           key != '\033' && // ^[ (escape)
@@ -1002,8 +1047,10 @@ int main(int argc, char **argv) {
 
   for(int l = 0; l < nb_lines; l++) {
     delete[] lines[l];
+    delete[] labels[l];
   }
 
+  delete[] labels;
   delete[] lines;
   delete[] title;