X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.cc;h=637ae7432910875c85a93d3feffb1b9f30a77fc0;hb=18c1fd808e3e513c07279edf0473240df19700ce;hp=28ca7dbe665c5daa17ff14d7e26d44fd32d3d0c7;hpb=0b612866f322be462e80586db5bd4bce6d4fefe9;p=selector.git

diff --git a/selector.cc b/selector.cc
index 28ca7db..637ae74 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>
@@ -55,6 +55,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
 
 //////////////////////////////////////////////////////////////////////
 
@@ -104,6 +108,14 @@ int string_to_positive_integer(char *string) {
   return result;
 }
 
+void error_feedback() {
+  if(error_flash) {
+    flash();
+  } else {
+    beep();
+  }
+}
+
 //////////////////////////////////////////////////////////////////////
 // A quick and dirty hash table
 
@@ -188,11 +200,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);
   }
 }
 
@@ -240,7 +252,7 @@ void delete_char(char *buffer, int *position) {
       buffer[c] = buffer[c+1];
       c++;
     }
-  }
+  } else error_feedback();
 }
 
 void backspace_char(char *buffer, int *position) {
@@ -256,7 +268,7 @@ void backspace_char(char *buffer, int *position) {
     }
 
     (*position)--;
-  }
+  } else error_feedback();
 }
 
 void insert_char(char *buffer, int *position, char character) {
@@ -272,7 +284,7 @@ void insert_char(char *buffer, int *position, char character) {
     c++;
     buffer[c] = '\0';
     buffer[(*position)++] = character;
-  }
+  } else error_feedback();
 }
 
 void kill_before_cursor(char *buffer, int *position) {
@@ -376,7 +388,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)) {
 
@@ -413,8 +425,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) {
@@ -429,9 +441,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);
@@ -464,7 +476,7 @@ void update_screen(int *current_line, int *temporary_line, int motion,
   move(0, 0);
 
   if(with_colors) {
-    attron(COLOR_PAIR(1));
+    attron(COLOR_PAIR(COLOR_MODELINE));
   } else {
     attron(A_REVERSE);
   }
@@ -499,18 +511,25 @@ void update_screen(int *current_line, int *temporary_line, int motion,
     addstr(" ");
   }
 
-  if(use_regexp) {
-    addstr(" [regexp]");
-  }
+  if(use_regexp || case_sensitive) {
+    addstr(" [");
+    if(use_regexp) {
+      addstr("regexp");
+    }
 
-  if(case_sensitive) {
-    addstr(" [case]");
+    if(case_sensitive) {
+      if(use_regexp) {
+        addstr(",");
+      }
+      addstr("case");
+    }
+    addstr("]");
   }
 
   move(0, cursor_x);
 
   if(with_colors) {
-    attroff(COLOR_PAIR(1));
+    attroff(COLOR_PAIR(COLOR_MODELINE));
   } else {
     attroff(A_REVERSE);
   }
@@ -645,6 +664,11 @@ int main(int argc, char **argv) {
       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);
@@ -677,8 +701,6 @@ int main(int argc, char **argv) {
     }
 
     else if(strcmp(argv[i], "-a") == 0) {
-      case_sensitive = 1;
-      i++;
     }
 
     else if(strcmp(argv[i], "-t") == 0) {
@@ -737,6 +759,7 @@ 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
@@ -763,11 +786,6 @@ int main(int argc, char **argv) {
     hash_table = new_hash_table(hash_table_size);
   }
 
-  // if(i == argc && !input_filename[0]) {
-    // cerr << "You must provide a filename." << endl;
-    // exit(1);
-  // }
-
   if(input_filename[0]) {
     read_file(input_filename,
               nb_lines_max, &nb_lines, lines,
@@ -814,28 +832,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;
     }
@@ -896,11 +914,13 @@ int main(int argc, char **argv) {
     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
@@ -933,7 +953,6 @@ int main(int argc, char **argv) {
   } while(key != '\n' && key != KEY_ENTER && key != '\007'); // ^G
 
   echo();
-  // curs_set(1);
   endwin();
 
   //////////////////////////////////////////////////////////////////////