X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.cc;h=27225b9cec383205e5ffa3808c7f85f12bf8681b;hb=9356c8c8659b8f8b39524901790bd899e9b63709;hp=ebbd0214f7d068926bfc0ef6389ca370dc62b4d1;hpb=f5a9d933f1272364e11c93589903e711b05bcbe5;p=selector.git

diff --git a/selector.cc b/selector.cc
index ebbd021..27225b9 100644
--- a/selector.cc
+++ b/selector.cc
@@ -1,7 +1,7 @@
 
 /*
- *  selector is a simple shell command for selection of strings with a
- *  dynamic pattern-matching.
+ *  selector is a simple command line utility for selection of strings
+ *  with a dynamic pattern-matching.
  *
  *  Copyright (c) 2009 Francois Fleuret
  *  Written by Francois Fleuret <francois@fleuret.org>
@@ -23,12 +23,8 @@
  */
 
 // To use it as a super-history-search for bash:
-//
 // alias h='selector -d -i -b -v -f <(history)'
 
-// This software is highly Linux-specific, but I would be glad to get
-// patches to make it work on other OS
-
 #include <fstream>
 #include <iostream>
 
@@ -45,31 +41,42 @@ using namespace std;
 
 #define VERSION "1.0"
 
-const int buffer_size = 1024;
+const int buffer_size = 4096;
 
 // Yeah, global variables!
 
 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;
 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
 
-// This looks severely Linux-only ...
+//////////////////////////////////////////////////////////////////////
 
-void inject_into_tty_buffer(char *line) {
+void inject_into_tty_buffer(char *string) {
   struct termios oldtio, newtio;
-  tcgetattr(STDIN_FILENO,&oldtio);
+  tcgetattr(STDIN_FILENO, &oldtio);
   memset(&newtio, 0, sizeof(newtio));
   // Set input mode (non-canonical, *no echo*,...)
   tcsetattr(STDIN_FILENO, TCSANOW, &newtio);
-  // Put the selected line in the tty input buffer
-  for(char *k = line; *k; k++) {
+  const char control_q = '\021';
+  // Put the selected string in the tty input buffer
+  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
@@ -88,9 +95,41 @@ void check_opt(int argc, char **argv, int n_opt, int n, const char *help) {
   }
 }
 
+int string_to_positive_integer(char *string) {
+  int error = 0;
+  int result = 0;
+
+  if(*string) {
+    for(char *s = string; *s; s++) {
+      if(*s >= '0' && *s <= '9') {
+        result = result * 10 + int(*s - '0');
+      } else error = 1;
+    }
+  } else error = 1;
+
+  if(error) {
+    cerr << "Value `" << string << "' is not a positive integer." << endl;
+    exit(1);
+  }
+
+  return result;
+}
+
+void error_feedback() {
+  if(error_flash) {
+    flash();
+  } else {
+    beep();
+  }
+}
+
 //////////////////////////////////////////////////////////////////////
 // A quick and dirty hash table
 
+// The table itself stores index of the strings in a char
+// **table. When a string is added, if it was already in the table,
+// the new index replaces the previous one.
+
 int *new_hash_table(int hash_table_size) {
   int *result;
   result = new int[hash_table_size];
@@ -100,8 +139,13 @@ int *new_hash_table(int hash_table_size) {
   return result;
 }
 
+// Adds new_string in the table, associated to new_index. If this
+// string was not already in the table, returns -1. Otherwise, returns
+// the previous index it had.
+
 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
@@ -114,13 +158,24 @@ int test_and_add(char *new_string, int new_index,
   code = code % hash_table_size;
 
   while(hash_table[code] >= 0) {
-    if(strcmp(new_string, strings[hash_table[code]]) == 0) return 1;
+    // There is a string with that code
+    if(strcmp(new_string, strings[hash_table[code]]) == 0) {
+      // It is the same string, we keep a copy of the stored index
+      int result = hash_table[code];
+      // Put the new one
+      hash_table[code] = new_index;
+      // And return the previous one
+      return result;
+    }
+    // This collision was not the same string, let's move to the next
+    // in the table
     code = (code + 1) % hash_table_size;
   }
 
+  // This string was not already in there, store the index in the
+  // table and return -1
   hash_table[code] = new_index;
-
-  return 0;
+  return -1;
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -131,13 +186,20 @@ struct matcher_t {
   regex_t preg;
   int regexp_error;
   int nb_patterns;
+  int case_sensitive;
   char *splitted_patterns, **patterns;
 };
 
 int match(char *string, matcher_t *matcher) {
   if(matcher->nb_patterns >= 0) {
-    for(int n = 0; n < matcher->nb_patterns; n++) {
-      if(strstr(string, matcher->patterns[n]) == 0) return 0;
+    if(matcher->case_sensitive) {
+      for(int n = 0; n < matcher->nb_patterns; n++) {
+        if(strstr(string, matcher->patterns[n]) == 0) return 0;
+      }
+    } else {
+      for(int n = 0; n < matcher->nb_patterns; n++) {
+        if(strcasestr(string, matcher->patterns[n]) == 0) return 0;
+      }
     }
     return 1;
   } else {
@@ -146,21 +208,24 @@ 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);
   }
 }
 
-void initialize_matcher(int use_regexp, matcher_t *matcher, const char *pattern) {
+void initialize_matcher(int use_regexp, int case_sensitive,
+                        matcher_t *matcher, const char *pattern) {
+
   if(use_regexp) {
     matcher->nb_patterns = -1;
-    matcher->regexp_error = regcomp(&matcher->preg, pattern, REG_ICASE);
+    matcher->regexp_error = regcomp(&matcher->preg, pattern, case_sensitive ? 0 : REG_ICASE);
   } else {
     matcher->regexp_error = 0;
     matcher->nb_patterns = 1;
+    matcher->case_sensitive = case_sensitive;
 
     for(const char *s = pattern; *s; s++) {
       if(*s == pattern_separator) {
@@ -185,6 +250,65 @@ void initialize_matcher(int use_regexp, matcher_t *matcher, const char *pattern)
   }
 }
 
+//////////////////////////////////////////////////////////////////////
+// Buffer edition
+
+void delete_char(char *buffer, int *position) {
+  if(buffer[*position]) {
+    int c = *position;
+    while(c < buffer_size && buffer[c]) {
+      buffer[c] = buffer[c+1];
+      c++;
+    }
+  } else error_feedback();
+}
+
+void backspace_char(char *buffer, int *position) {
+  if(*position > 0) {
+    if(buffer[*position]) {
+      int c = *position - 1;
+      while(buffer[c]) {
+        buffer[c] = buffer[c+1];
+        c++;
+      }
+    } else {
+      buffer[*position - 1] = '\0';
+    }
+
+    (*position)--;
+  } else error_feedback();
+}
+
+void insert_char(char *buffer, int *position, char character) {
+  if(strlen(buffer) < buffer_size - 1) {
+    int c = *position;
+    char t = buffer[c], u;
+    while(t) {
+      c++;
+      u = buffer[c];
+      buffer[c] = t;
+      t = u;
+    }
+    c++;
+    buffer[c] = '\0';
+    buffer[(*position)++] = character;
+  } else error_feedback();
+}
+
+void kill_before_cursor(char *buffer, int *position) {
+  int s = 0;
+  while(buffer[*position + s]) {
+    buffer[s] = buffer[*position + s];
+    s++;
+  }
+  buffer[s] = '\0';
+  *position = 0;
+}
+
+void kill_after_cursor(char *buffer, int *position) {
+  buffer[*position] = '\0';
+}
+
 //////////////////////////////////////////////////////////////////////
 
 int previous_visible(int current_line, int nb_lines, char **lines, matcher_t *matcher) {
@@ -207,12 +331,13 @@ int next_visible(int current_line, int nb_lines, char **lines, matcher_t *matche
 
 void update_screen(int *current_line, int *temporary_line, int motion,
                    int nb_lines, char **lines,
+                   int cursor_position,
                    char *pattern) {
 
   char buffer[buffer_size];
   matcher_t matcher;
 
-  initialize_matcher(use_regexp, &matcher, pattern);
+  initialize_matcher(use_regexp, case_sensitive, &matcher, pattern);
 
   // We now take care of printing the lines per se
 
@@ -230,8 +355,7 @@ void update_screen(int *current_line, int *temporary_line, int motion,
 
   if(matcher.regexp_error) {
     addstr("[regexp error]");
-  } else {
-
+  } else if(nb_lines > 0) {
     int new_line;
     if(match(lines[*current_line], &matcher)) {
       new_line = *current_line;
@@ -272,7 +396,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)) {
 
@@ -309,8 +433,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) {
@@ -325,9 +449,9 @@ void update_screen(int *current_line, int *temporary_line, int motion,
 
           if(l == new_line) {
             if(with_colors) {
-              attron(COLOR_PAIR(2));
+              attron(COLOR_PAIR(COLOR_HIGHLIGHTED_LINE));
               addnstr(buffer, console_width);
-              attroff(COLOR_PAIR(2));
+              attroff(COLOR_PAIR(COLOR_HIGHLIGHTED_LINE));
             } else {
               attron(A_STANDOUT);
               addnstr(buffer, console_width);
@@ -351,27 +475,70 @@ void update_screen(int *current_line, int *temporary_line, int motion,
     if(nb_printed_lines == 0) {
       addnstr("[no selection]\n", console_width);
     }
+  } else {
+    addnstr("[empty choice]\n", console_width);
   }
 
   // Draw the modeline
 
-  sprintf(buffer, "%d/%d pattern: %s%s",
-          nb_printed_lines,
-          nb_lines,
-          pattern,
-          use_regexp ? " [regexp]" : "");
+  move(0, 0);
 
-  for(int k = strlen(buffer); k < console_width; k++) buffer[k] = ' ';
+  if(with_colors) {
+    attron(COLOR_PAIR(COLOR_MODELINE));
+  } else {
+    attron(A_REVERSE);
+  }
+
+  for(int k = 0; k < console_width; k++) buffer[k] = ' ';
   buffer[console_width] = '\0';
+  addnstr(buffer, console_width);
 
   move(0, 0);
+
+  // There must be a more elegant way of moving the cursor at a
+  // location met during display
+
+  int cursor_x = 0;
+
+  if(title) {
+    addstr(title);
+    addstr(" ");
+    cursor_x += strlen(title) + 1;
+  }
+
+  sprintf(buffer, "%d/%d ", nb_printed_lines, nb_lines);
+  addstr(buffer);
+  cursor_x += strlen(buffer);
+
+  addnstr(pattern, cursor_position);
+  cursor_x += cursor_position;
+
+  if(pattern[cursor_position]) {
+    addstr(pattern + cursor_position);
+  } else {
+    addstr(" ");
+  }
+
+  if(use_regexp || case_sensitive) {
+    addstr(" [");
+    if(use_regexp) {
+      addstr("regexp");
+    }
+
+    if(case_sensitive) {
+      if(use_regexp) {
+        addstr(",");
+      }
+      addstr("case");
+    }
+    addstr("]");
+  }
+
+  move(0, cursor_x);
+
   if(with_colors) {
-    attron(COLOR_PAIR(1));
-    addnstr(buffer, console_width);
-    attroff(COLOR_PAIR(1));
+    attroff(COLOR_PAIR(COLOR_MODELINE));
   } else {
-    attron(A_REVERSE);
-    addnstr(buffer, console_width);
     attroff(A_REVERSE);
   }
 
@@ -383,8 +550,85 @@ void update_screen(int *current_line, int *temporary_line, int motion,
 
 //////////////////////////////////////////////////////////////////////
 
+void read_file(const char *input_filename,
+               int nb_lines_max, int *nb_lines, char **lines,
+               int hash_table_size, int *hash_table) {
+
+  char raw_line[buffer_size];;
+
+  ifstream file(input_filename);
+
+  if(file.fail()) {
+    cerr << "Can not open " << input_filename << endl;
+    exit(1);
+  }
+
+  while(*nb_lines < nb_lines_max && !file.eof()) {
+
+    file.getline(raw_line, buffer_size);
+
+    if(raw_line[0]) {
+
+      if(file.fail()) {
+        cerr << "Line too long:" << endl;
+        cerr << raw_line << endl;
+        exit(1);
+      }
+
+      char *t;
+
+      t = raw_line;
+
+      // Remove the zsh history prefix
+
+      if(zsh_history && *t == ':') {
+        while(*t && *t != ';') t++;
+        if(*t == ';') t++;
+      }
+
+      // 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(t, *nb_lines, lines, hash_table, hash_table_size);
+      } else {
+        dup = -1;
+      }
+
+      if(dup < 0) {
+        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
+        lines[*nb_lines] = lines[dup];
+        lines[dup] = 0;
+      }
+
+      (*nb_lines)++;
+    }
+  }
+}
+
+//////////////////////////////////////////////////////////////////////
+
 int main(int argc, char **argv) {
-  char buffer[buffer_size];
+
+  if(!ttyname(STDIN_FILENO)) {
+    cerr << "The standard input is not a tty." << endl;
+    exit(1);
+  }
+
   int color_fg_modeline, color_bg_modeline;
   int color_fg_highlight, color_bg_highlight;
 
@@ -402,8 +646,9 @@ int main(int argc, char **argv) {
 
   int i = 1;
   int error = 0, show_help = 0;
+  int rest_are_files = 0;
 
-  while(!error && !show_help && i < argc) {
+  while(!error && !show_help && i < argc && argv[i][0] == '-' && !rest_are_files) {
 
     if(strcmp(argv[i], "-o") == 0) {
       check_opt(argc, argv, i, 1, "<output filename>");
@@ -417,16 +662,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);
@@ -438,13 +699,13 @@ int main(int argc, char **argv) {
       i++;
     }
 
-    else if(strcmp(argv[i], "-z") == 0) {
-      zsh_history = 1;
+    else if(strcmp(argv[i], "-b") == 0) {
+      bash_history = 1;
       i++;
     }
 
-    else if(strcmp(argv[i], "-b") == 0) {
-      bash_history = 1;
+    else if(strcmp(argv[i], "-z") == 0) {
+      zsh_history = 1;
       i++;
     }
 
@@ -458,28 +719,46 @@ int main(int argc, char **argv) {
       i++;
     }
 
+    else if(strcmp(argv[i], "-a") == 0) {
+      case_sensitive = 1;
+      i++;
+    }
+
+    else if(strcmp(argv[i], "-t") == 0) {
+      check_opt(argc, argv, i, 1, "<title>");
+      delete[] title;
+      title = new char[strlen(argv[i+1]) + 1];
+      strcpy(title, argv[i+1]);
+      i += 2;
+    }
+
     else if(strcmp(argv[i], "-l") == 0) {
       check_opt(argc, argv, i, 1, "<maximum number of lines>");
-      nb_lines_max = atoi(argv[i+1]);
+      nb_lines_max = string_to_positive_integer(argv[i+1]);
       i += 2;
     }
 
     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]);
-      color_bg_highlight = atoi(argv[i+4]);
+      color_fg_modeline = string_to_positive_integer(argv[i + 1]);
+      color_bg_modeline = string_to_positive_integer(argv[i + 2]);
+      color_fg_highlight = string_to_positive_integer(argv[i + 3]);
+      color_bg_highlight = string_to_positive_integer(argv[i + 4]);
       i += 5;
     }
 
+    else if(strcmp(argv[i], "--") == 0) {
+      rest_are_files = 1;
+      i++;
+    }
+
     else if(strcmp(argv[i], "-h") == 0) {
       show_help = 1;
       i++;
     }
 
     else {
-      cerr << "Unknown argument " << argv[i] << "." << endl;
+      cerr << "Unknown option " << argv[i] << "." << endl;
       error = 1;
     }
   }
@@ -490,19 +769,31 @@ int main(int argc, char **argv) {
          << "Written by Francois Fleuret <francois@fleuret.org>."
          << endl
          << endl
-         << argv[0]
-         << " [-h]"
-         << " [-v]"
-         << " [-m]"
-         << " [-d]"
-         << " [-e]"
-         << " [-z]"
-         << " [-i]"
-         << " [-c <fg modeline> <bg modeline> <fg highlight> <bg highlight>]"
-         << " [-o <output filename>]"
-         << " [-s <pattern separator>]"
-         << " [-l <max number of lines>]"
-         << " -f <input filename>"
+         << "Usage: " << argv[0] << " [options] [<filename1> [<filename2> ...]]" << endl
+         << endl
+         << " -h      show this help" << endl
+         << " -v      inject the selected line in the tty" << endl
+         << " -d      remove duplicated lines" << endl
+         << " -b      remove the bash history line prefix" << endl
+         << " -z      remove the zsh history line prefix" << endl
+         << " -i      invert the order of lines" << endl
+         << " -e      start in regexp mode" << endl
+         << " -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
+         << " -t <title>" << endl
+         << "         add a title in the modeline" << endl
+         << " -c <fg modeline> <bg modeline> <fg highlight> <bg highlight>" << endl
+         << "         set the display colors" << endl
+         << " -o <output filename>" << endl
+         << "         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;
 
     exit(error);
@@ -510,20 +801,7 @@ int main(int argc, char **argv) {
 
   char **lines = new char *[nb_lines_max];
 
-  if(!input_filename[0]) {
-    cerr << "You must specify a input file with -f." << endl;
-    exit(1);
-  }
-
   int nb_lines = 0;
-
-  ifstream file(input_filename);
-
-  if(file.fail()) {
-    cerr << "Can not open " << input_filename << endl;
-    return 1;
-  }
-
   int hash_table_size = nb_lines_max * 10;
   int *hash_table = 0;
 
@@ -531,73 +809,109 @@ int main(int argc, char **argv) {
     hash_table = new_hash_table(hash_table_size);
   }
 
-  while(nb_lines < nb_lines_max && !file.eof()) {
-    file.getline(buffer, buffer_size);
-    if(strcmp(buffer, "") != 0) {
-      char *s = buffer;
+  if(input_filename[0]) {
+    read_file(input_filename,
+              nb_lines_max, &nb_lines, lines,
+              hash_table_size, hash_table);
+  }
 
-      if(zsh_history && *s == ':') {
-        while(*s && *s != ';') s++;
-        if(*s == ';') s++;
-      }
+  while(i < argc) {
+    read_file(argv[i],
+              nb_lines_max, &nb_lines, lines,
+              hash_table_size, hash_table);
+    i++;
+  }
 
-      if(bash_history && (*s == ' ' || (*s >= '0' && *s <= '9'))) {
-        while(*s == ' ' || (*s >= '0' && *s <= '9')) s++;
-      }
+  delete[] hash_table;
 
-      if(!hash_table || !test_and_add(s, nb_lines, lines, hash_table, hash_table_size)) {
-        lines[nb_lines] = new char[strlen(s) + 1];
-        strcpy(lines[nb_lines], s);
-        nb_lines++;
-      }
+  // Now remove the null strings
+
+  int n = 0;
+  for(int k = 0; k < nb_lines; k++) {
+    if(lines[k]) {
+      lines[n++] = lines[k];
     }
   }
 
-  delete[] hash_table;
+  nb_lines = n;
 
   if(inverse_order) {
-    for(int i = 0; i < nb_lines/2; i++) {
+    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;
     }
   }
 
+  // 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 pattern_point;
-  pattern_point = 0;
+
+  int cursor_position;
+  cursor_position = 0;
+
+  //////////////////////////////////////////////////////////////////////
+  // Here we start to display with curse
 
   initscr();
 
+  noecho();
+
+  // So that the arrow keys work
+  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 ||
          color_bg_highlight < 0 || color_bg_highlight >= COLORS) {
         echo();
-        curs_set(1);
         endwin();
         cerr << "Color numbers have to be between 0 and " << COLORS - 1 << "." << endl;
         exit(1);
       }
-      init_pair(1, color_fg_modeline, color_bg_modeline);
-      init_pair(2, 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);
+
     } else {
       with_colors = 0;
     }
   }
 
-  noecho();
-  curs_set(0); // Hide the cursor
-  keypad(stdscr, TRUE); // So that the arrow keys work
-
   int key;
   int current_line = 0, temporary_line = 0;
 
-  update_screen(&current_line, &temporary_line, 0, nb_lines, lines, pattern);
+  update_screen(&current_line, &temporary_line, 0,
+                nb_lines, labels, cursor_position, pattern);
 
   do {
 
@@ -605,17 +919,19 @@ int main(int argc, char **argv) {
 
     int motion = 0;
 
-    if(key >= ' ' && key <= '~') {
-      pattern[pattern_point++] = key;
-      pattern[pattern_point] = '\0';
+    if(key >= ' ' && key <= '~') { // Insert character
+      insert_char(pattern, &cursor_position, key);
     }
 
-    else if(key == KEY_BACKSPACE || key == '' || key == '' ||
-            key == KEY_DC || key == '') {
-      if(pattern_point > 0) {
-        pattern_point--;
-        pattern[pattern_point] = '\0';
-      }
+    else if(key == KEY_BACKSPACE ||
+            key == '\010' || // ^H
+            key == '\177') { // ^?
+      backspace_char(pattern, &cursor_position);
+    }
+
+    else if(key == KEY_DC ||
+            key == '\004') { // ^D
+      delete_char(pattern, &cursor_position);
     }
 
     else if(key == KEY_HOME) {
@@ -634,32 +950,66 @@ int main(int argc, char **argv) {
       motion = -10;
     }
 
-    else if(key == KEY_DOWN || key == '') {
+    else if(key == KEY_DOWN ||
+            key == '\016') { // ^N
       motion = 1;
     }
 
-    else if(key == KEY_UP || key == '') {
+    else if(key == KEY_UP ||
+            key == '\020') { // ^P
       motion = -1;
     }
 
-    else if(key == '') {
+    else if(key == KEY_LEFT ||
+            key == '\002') { // ^B
+      if(cursor_position > 0) cursor_position--;
+      else error_feedback();
+    }
+
+    else if(key == KEY_RIGHT ||
+            key == '\006') { // ^F
+      if(pattern[cursor_position]) cursor_position++;
+      else error_feedback();
+    }
+
+    else if(key == '\001') { // ^A
+      cursor_position = 0;
+    }
+
+    else if(key == '\005') { // ^E
+      cursor_position = strlen(pattern);
+    }
+
+    else if(key == '\022') { // ^R
       use_regexp = !use_regexp;
     }
 
-    else if(key == '') {
-      pattern_point = 0;
-      pattern[pattern_point] = '\0';
+    else if(key == '\011') { // ^I
+      case_sensitive = !case_sensitive;
+    }
+
+    else if(key == '\025') { // ^U
+      kill_before_cursor(pattern, &cursor_position);
+    }
+
+    else if(key == '\013') { // ^K
+      kill_after_cursor(pattern, &cursor_position);
     }
 
     update_screen(&current_line, &temporary_line, motion,
-                  nb_lines, lines, pattern);
+                  nb_lines, labels, cursor_position, pattern);
 
-  } while(key != '\n' && key != KEY_ENTER && key != '');
+  } while(key != '\007' && // ^G
+          key != '\033' && // ^[ (escape)
+          key != '\n' &&
+          key != KEY_ENTER);
 
   echo();
-  curs_set(1);
   endwin();
 
+  //////////////////////////////////////////////////////////////////////
+  // Here we come back to standard display
+
   if((key == KEY_ENTER || key == '\n')) {
 
     if(output_to_vt_buffer) {
@@ -682,14 +1032,18 @@ int main(int argc, char **argv) {
       }
       out.flush();
     }
-
+  } else {
+    cout << "Aborted." << endl;
   }
 
   for(int l = 0; l < nb_lines; l++) {
     delete[] lines[l];
+    delete[] labels[l];
   }
 
+  delete[] labels;
   delete[] lines;
+  delete[] title;
 
   exit(0);
 }