X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.cc;h=a62d352c4ded91577cf44b53fa31176b53093c6a;hb=500ce91131229a35000fb770f79a50ed994dd804;hp=ebe528e315e5b07200cd61589d2725d32ceaf518;hpb=bf323e43f1f63a67f6b8bf9ad4ec90057891320b;p=selector.git

diff --git a/selector.cc b/selector.cc
index ebe528e..a62d352 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,17 +47,22 @@ 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;
 int case_sensitive = 0;
 char *title = 0;
+int error_flash = 0;
 
 #define COLOR_MODELINE 1
 #define COLOR_HIGHLIGHTED_LINE 2
+#define COLOR_ERROR 3
 
 //////////////////////////////////////////////////////////////////////
 
@@ -67,8 +72,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
@@ -108,7 +118,23 @@ int string_to_positive_integer(char *string) {
 }
 
 void error_feedback() {
-  flash();
+  if(error_flash) {
+    flash();
+  } else {
+    beep();
+  }
+}
+
+void print_error_message(const char *message, int width) {
+  if(with_colors) {
+    attron(COLOR_PAIR(COLOR_ERROR));
+    addnstr(message, width);
+    attroff(COLOR_PAIR(COLOR_ERROR));
+  } else {
+    attron(A_STANDOUT);
+    addnstr(message, width);
+    attroff(A_STANDOUT);
+  }
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -133,6 +159,7 @@ int *new_hash_table(int hash_table_size) {
 
 int test_and_add(char *new_string, int new_index,
                  char **strings, int *hash_table, int hash_table_size) {
+
   unsigned int code = 0;
 
   // This is my recipe. I checked, it seems to work (as long as
@@ -195,11 +222,11 @@ int match(char *string, matcher_t *matcher) {
 }
 
 void free_matcher(matcher_t *matcher) {
-  if(matcher->nb_patterns >= 0) {
+  if(matcher->nb_patterns < 0) {
+    if(!matcher->regexp_error) regfree(&matcher->preg);
+  } else {
     delete[] matcher->splitted_patterns;
     delete[] matcher->patterns;
-  } else {
-    if(!matcher->regexp_error) regfree(&matcher->preg);
   }
 }
 
@@ -336,12 +363,11 @@ 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]");
+    print_error_message("[regexp error]", console_width);
   } else if(nb_lines > 0) {
     int new_line;
     if(match(lines[*current_line], &matcher)) {
@@ -383,7 +409,7 @@ void update_screen(int *current_line, int *temporary_line, int motion,
       int first_line = new_line, last_line = new_line, nb_match = 1;
 
       // We find the first and last line to show, so that the total of
-      // visible lines between them (them include) is console_height - 1
+      // visible lines between them (them included) is console_height-1
 
       while(nb_match < console_height-1 && (first_line > 0 || last_line < nb_lines - 1)) {
 
@@ -420,8 +446,8 @@ void update_screen(int *current_line, int *temporary_line, int motion,
             k++;
           }
 
-          // We fill the rest of the line with blanks if either we did
-          // not clear() or if this is the highlighted line
+          // We fill the rest of the line with blanks if this is the
+          // highlighted line
 
           if(l == new_line) {
             while(k < console_width) {
@@ -432,6 +458,8 @@ 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) {
@@ -460,12 +488,14 @@ 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);
+      print_error_message("[no selection]\n", console_width);
     }
   } else {
-    addnstr("[empty choice]\n", console_width);
+    print_error_message("[empty choice]\n", console_width);
   }
 
+  clrtobot();
+
   // Draw the modeline
 
   move(0, 0);
@@ -507,7 +537,7 @@ void update_screen(int *current_line, int *temporary_line, int motion,
   }
 
   if(use_regexp || case_sensitive) {
-    addstr("[");
+    addstr(" [");
     if(use_regexp) {
       addstr("regexp");
     }
@@ -541,7 +571,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);
 
@@ -562,39 +592,39 @@ void read_file(const char *input_filename,
         exit(1);
       }
 
-      char *s, *t;
-      const char *u;
+      char *t;
 
-      s = buffer;
       t = raw_line;
-      while(*t) {
-        u = unctrl(*t++);
-        while(*u) { *s++ = *u++; }
-      }
-      *s = '\0';
 
-      s = buffer;
+      // Remove the zsh history prefix
 
-      if(zsh_history && *s == ':') {
-        while(*s && *s != ';') s++;
-        if(*s == ';') s++;
+      if(zsh_history && *t == ':') {
+        while(*t && *t != ';') t++;
+        if(*t == ';') t++;
       }
 
-      if(bash_history && (*s == ' ' || (*s >= '0' && *s <= '9'))) {
-        while(*s == ' ' || (*s >= '0' && *s <= '9')) s++;
+      // Remove the bash history prefix
+
+      if(bash_history) {
+        while(*t == ' ') t++;
+        while(*t >= '0' && *t <= '9') t++;
+        while(*t == ' ') t++;
       }
 
+      // 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(s, *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(s) + 1];
-        strcpy(lines[*nb_lines], s);
+        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
@@ -649,16 +679,32 @@ 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++;
     }
 
+    else if(strcmp(argv[i], "-q") == 0) {
+      error_flash = 1;
+      i++;
+    }
+
     else if(strcmp(argv[i], "-f") == 0) {
       check_opt(argc, argv, i, 1, "<input filename>");
       strncpy(input_filename, argv[i+1], buffer_size);
@@ -744,6 +790,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
@@ -751,7 +798,8 @@ int main(int argc, char **argv) {
          << " -e      start in regexp mode" << endl
          << " -a      case sensitive" << endl
          << " -m      monochrome mode" << endl
-         << " --      rest of the arguments are filenames" << endl
+         << " -q      make a flash instead of a beep on an edition error" << 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
@@ -760,6 +808,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;
@@ -811,8 +861,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;
 
@@ -827,8 +902,11 @@ int main(int argc, char **argv) {
   keypad(stdscr, TRUE);
 
   if(with_colors) {
+
     if(has_colors()) {
+
       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 ||
@@ -838,8 +916,11 @@ int main(int argc, char **argv) {
         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_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);
+
     } else {
       with_colors = 0;
     }
@@ -848,7 +929,8 @@ 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, cursor_position, pattern);
+  update_screen(&current_line, &temporary_line, 0,
+                nb_lines, labels, cursor_position, pattern);
 
   do {
 
@@ -933,10 +1015,18 @@ 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 != '\n' && key != KEY_ENTER && key != '\007'); // ^G
+  } while(key != '\007' && // ^G
+          key != '\033' && // ^[ (escape)
+          key != '\n' &&
+          key != KEY_ENTER);
 
   echo();
   endwin();
@@ -972,8 +1062,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;