Added a label separator. Only the part of the line before it is shown.

Fixed the control character bug (the returned line is not transformed
to printable characters) and added two options: -x to specify the
character to define the end of the label, and -w to add ^Q in between
characters when doing tty injection.

diff --git a/REVISION_NUMBER b/REVISION_NUMBER
index c748b56..0d667b5 100644 (file)
--- a/REVISION_NUMBER
+++ b/REVISION_NUMBER
@@ -1 +1 @@
-147
+148

diff --git a/selector.1 b/selector.1
index 7df18a4..7c31364 100644 (file)
--- a/selector.1
+++ b/selector.1
@@ -67,10 +67,14 @@ add a title in the modeline
 select the modeline and highlight color numbers
 .IP "\fB-v\fP" 10
 inject the selected line into the tty input buffer
+.IP "\fB-w\fP" 10
+add ^Q between characters during tty injection to quote control characters
 .IP "\fB-o <output filename>\fP" 10
 write the selected line into the specified file
 .IP "\fB-s <pattern separator>\fP" 10
 specify the symbol to separate the substrings in the search pattern
+.IP "\fB-x <label separator>\fP" 10
+specify the symbol to separate the label from the rest of the line
 .IP "\fB-l <max number of lines>\fP" 10
 specify the maximum number of lines to take into account
 .IP "\fB-f <input filename>\fP" 10

diff --git a/selector.cc b/selector.cc
index bd50899..fbd2d3d 100644 (file)
--- a/selector.cc
+++ b/selector.cc
@@ -47,7 +47,9 @@ 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 inverse_order = 0;
@@ -69,7 +71,11 @@ void inject_into_tty_buffer(char *string) {
   // Set input mode (non-canonical, *no echo*,...)
   tcsetattr(STDIN_FILENO, TCSANOW, &newtio);
   // Put the selected string in the tty input buffer
+  char control_q = '\021';
   for(char *k = string; *k; k++) {
+    if(add_control_qs) {
+      ioctl(STDIN_FILENO, TIOCSTI, &control_q);
+    }
     ioctl(STDIN_FILENO, TIOCSTI, k);
   }
   // Restore the old settings
@@ -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++;
@@ -784,6 +789,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;
@@ -835,6 +842,30 @@ 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;
@@ -877,7 +908,7 @@ 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 {
 
@@ -963,7 +994,7 @@ int main(int argc, char **argv) {
     }
 
     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)
@@ -1004,8 +1035,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;