X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.cc;h=a3d54dd1a3acd15b81097e4c3279883e8bc5c62b;hb=6761db2af5b3df278745de6342f74a6a4c206ea1;hp=cf9df599dd01e03c4fa7d82e20dedced589922a6;hpb=0030dc908abe01705612bd157a64cfc8b62bd1d1;p=selector.git

diff --git a/selector.cc b/selector.cc
index cf9df59..a3d54dd 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>
@@ -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;
@@ -55,6 +57,10 @@ 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
 
 //////////////////////////////////////////////////////////////////////
 
@@ -64,8 +70,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);
+  char control_q = '\021';
   // Put the selected string in the tty input buffer
   for(char *k = string; *k; k++) {
+    if(add_control_qs) {
+      // Add ^Q to quote control characters
+      ioctl(STDIN_FILENO, TIOCSTI, &control_q);
+    }
     ioctl(STDIN_FILENO, TIOCSTI, k);
   }
   // Restore the old settings
@@ -84,6 +95,34 @@ 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
 
@@ -106,6 +145,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
@@ -168,11 +208,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);
   }
 }
 
@@ -210,6 +250,65 @@ void initialize_matcher(int use_regexp, int case_sensitive,
   }
 }
 
+//////////////////////////////////////////////////////////////////////
+// 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) {
@@ -297,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)) {
 
@@ -334,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) {
@@ -350,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);
@@ -383,8 +482,9 @@ void update_screen(int *current_line, int *temporary_line, int motion,
   // Draw the modeline
 
   move(0, 0);
+
   if(with_colors) {
-    attron(COLOR_PAIR(1));
+    attron(COLOR_PAIR(COLOR_MODELINE));
   } else {
     attron(A_REVERSE);
   }
@@ -395,50 +495,49 @@ void update_screen(int *current_line, int *temporary_line, int motion,
 
   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;
   }
 
-  printw("%d/%d ", nb_printed_lines, nb_lines);
+  sprintf(buffer, "%d/%d ", nb_printed_lines, nb_lines);
+  addstr(buffer);
+  cursor_x += strlen(buffer);
 
   addnstr(pattern, cursor_position);
-
-  // Now we print the cursor. All that mess to have reverse video with
-  // and without color.
-
-  if(with_colors) {
-    attroff(COLOR_PAIR(1));
-    attron(COLOR_PAIR(3));
-  } else {
-    attroff(A_REVERSE);
-  }
+  cursor_x += cursor_position;
 
   if(pattern[cursor_position]) {
-    addnstr(&pattern[cursor_position], 1);
+    addstr(pattern + cursor_position);
   } else {
     addstr(" ");
   }
 
-  if(with_colors) {
-    attroff(COLOR_PAIR(3));
-    attron(COLOR_PAIR(1));
-  } else {
-    attron(A_REVERSE);
-  }
+  if(use_regexp || case_sensitive) {
+    addstr(" [");
+    if(use_regexp) {
+      addstr("regexp");
+    }
 
-  if(pattern[cursor_position]) {
-    addstr(pattern + cursor_position + 1);
+    if(case_sensitive) {
+      if(use_regexp) {
+        addstr(",");
+      }
+      addstr("case");
+    }
+    addstr("]");
   }
 
-  // Finished printing the cursor
-
-  if(use_regexp) {
-    addstr(" [regexp]");
-  }
+  move(0, cursor_x);
 
   if(with_colors) {
-    attroff(COLOR_PAIR(1));
+    attroff(COLOR_PAIR(COLOR_MODELINE));
   } else {
     attroff(A_REVERSE);
   }
@@ -451,6 +550,78 @@ 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) {
 
   if(!ttyname(STDIN_FILENO)) {
@@ -458,7 +629,6 @@ int main(int argc, char **argv) {
     exit(1);
   }
 
-  char buffer[buffer_size], raw_line[buffer_size];;
   int color_fg_modeline, color_bg_modeline;
   int color_fg_highlight, color_bg_highlight;
 
@@ -476,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>");
@@ -491,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);
@@ -547,26 +734,31 @@ int main(int argc, char **argv) {
 
     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;
     }
   }
@@ -577,7 +769,7 @@ int main(int argc, char **argv) {
          << "Written by Francois Fleuret <francois@fleuret.org>."
          << endl
          << endl
-         << "Usage: " << argv[0] << " [options] -f <file>" << endl
+         << "Usage: " << argv[0] << " [options] [<filename1> [<filename2> ...]]" << endl
          << endl
          << " -h      show this help" << endl
          << " -v      inject the selected line in the tty" << endl
@@ -588,6 +780,8 @@ int main(int argc, char **argv) {
          << " -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
@@ -596,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;
@@ -605,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;
 
@@ -626,60 +809,17 @@ int main(int argc, char **argv) {
     hash_table = new_hash_table(hash_table_size);
   }
 
-  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 *s, *t;
-      const char *u;
-
-      s = buffer;
-      t = raw_line;
-      while(*t) {
-        u = unctrl(*t++);
-        while(*u) { *s++ = *u++; }
-      }
-      *s = '\0';
-
-      s = buffer;
-
-      if(zsh_history && *s == ':') {
-        while(*s && *s != ';') s++;
-        if(*s == ';') s++;
-      }
-
-      if(bash_history && (*s == ' ' || (*s >= '0' && *s <= '9'))) {
-        while(*s == ' ' || (*s >= '0' && *s <= '9')) s++;
-      }
-
-      int dup;
-
-      if(hash_table) {
-        dup = test_and_add(s, 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);
-      } 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;
-      }
+  if(input_filename[0]) {
+    read_file(input_filename,
+              nb_lines_max, &nb_lines, lines,
+              hash_table_size, hash_table);
+  }
 
-      nb_lines++;
-    }
+  while(i < argc) {
+    read_file(argv[i],
+              nb_lines_max, &nb_lines, lines,
+              hash_table_size, hash_table);
+    i++;
   }
 
   delete[] hash_table;
@@ -692,16 +832,41 @@ int main(int argc, char **argv) {
       lines[n++] = lines[k];
     }
   }
+
   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 cursor_position;
@@ -714,28 +879,28 @@ int main(int argc, char **argv) {
 
   noecho();
 
-  // Hide the cursor
-  curs_set(0);
-
   // 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(3, color_bg_modeline, color_fg_modeline);
+
+      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;
     }
@@ -744,18 +909,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);
-
-  // \000 ^@
-  // \001 ^A
-  // ...
-  // \032 ^Z
-  // \033 ^[
-  // \034 ^\
-  // \035 ^]
-  // \036 ^^
-  // \037 ^_
-  // \177 ^?
+  update_screen(&current_line, &temporary_line, 0, nb_lines, labels, cursor_position, pattern);
 
   do {
 
@@ -764,42 +918,18 @@ int main(int argc, char **argv) {
     int motion = 0;
 
     if(key >= ' ' && key <= '~') { // Insert character
-      int c = cursor_position;
-      char t = pattern[c], u;
-      while(t) {
-        c++;
-        u = pattern[c];
-        pattern[c] = t;
-        t = u;
-      }
-      c++;
-      pattern[c] = '\0';
-      pattern[cursor_position++] = key;
+      insert_char(pattern, &cursor_position, key);
     }
 
-    else if(key == KEY_BACKSPACE || key == '\010' || key == '\177') {
-      if(cursor_position > 0) {
-        if(pattern[cursor_position]) {
-          int c = cursor_position-1;
-          while(pattern[c]) {
-            pattern[c] = pattern[c+1];
-            c++;
-          }
-        } else {
-          pattern[cursor_position - 1] = '\0';
-        }
-        cursor_position--;
-      }
+    else if(key == KEY_BACKSPACE ||
+            key == '\010' || // ^H
+            key == '\177') { // ^?
+      backspace_char(pattern, &cursor_position);
     }
 
-    else if(key == KEY_DC || key == '\004') {
-      if(pattern[cursor_position]) {
-        int c = cursor_position;
-        while(pattern[c]) {
-          pattern[c] = pattern[c+1];
-          c++;
-        }
-      }
+    else if(key == KEY_DC ||
+            key == '\004') { // ^D
+      delete_char(pattern, &cursor_position);
     }
 
     else if(key == KEY_HOME) {
@@ -818,55 +948,61 @@ int main(int argc, char **argv) {
       motion = -10;
     }
 
-    else if(key == KEY_DOWN || key == '\014') {
+    else if(key == KEY_DOWN ||
+            key == '\016') { // ^N
       motion = 1;
     }
 
-    else if(key == KEY_UP || key == '\016') {
+    else if(key == KEY_UP ||
+            key == '\020') { // ^P
       motion = -1;
     }
 
-    else if(key == KEY_LEFT || key == '\002') {
+    else if(key == KEY_LEFT ||
+            key == '\002') { // ^B
       if(cursor_position > 0) cursor_position--;
+      else error_feedback();
     }
 
-    else if(key == KEY_RIGHT || key == '\006') {
+    else if(key == KEY_RIGHT ||
+            key == '\006') { // ^F
       if(pattern[cursor_position]) cursor_position++;
+      else error_feedback();
     }
 
-    else if(key == '\001') {
+    else if(key == '\001') { // ^A
       cursor_position = 0;
     }
 
-    else if(key == '\005') {
+    else if(key == '\005') { // ^E
       cursor_position = strlen(pattern);
     }
 
-    else if(key == '\022') {
+    else if(key == '\022') { // ^R
       use_regexp = !use_regexp;
     }
 
-    else if(key == '\025') {
-      int s = 0;
-      while(pattern[cursor_position + s]) {
-        pattern[s] = pattern[cursor_position + s];
-        s++;
-      }
-      pattern[s] = '\0';
-      cursor_position = 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') {
-      pattern[cursor_position] = '\0';
+    else if(key == '\013') { // ^K
+      kill_after_cursor(pattern, &cursor_position);
     }
 
     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');
+  } while(key != '\007' && // ^G
+          key != '\033' && // ^[ (escape)
+          key != '\n' &&
+          key != KEY_ENTER);
 
   echo();
-  curs_set(1);
   endwin();
 
   //////////////////////////////////////////////////////////////////////
@@ -894,13 +1030,16 @@ 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;