X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.cc;h=637ae7432910875c85a93d3feffb1b9f30a77fc0;hb=28ce8e4f521dc01987da20eba019961d866b5c1c;hp=a1b5b119a35eb36da41b944a695183213f207ab7;hpb=c04bae20d28e2a15fff43974aa0804f425c65db2;p=selector.git

diff --git a/selector.cc b/selector.cc
index a1b5b11..637ae74 100644
--- a/selector.cc
+++ b/selector.cc
@@ -55,6 +55,7 @@ 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
@@ -108,7 +109,11 @@ int string_to_positive_integer(char *string) {
 }
 
 void error_feedback() {
-  flash();
+  if(error_flash) {
+    flash();
+  } else {
+    beep();
+  }
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -195,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);
   }
 }
 
@@ -383,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)) {
 
@@ -420,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) {
@@ -507,7 +512,7 @@ void update_screen(int *current_line, int *temporary_line, int motion,
   }
 
   if(use_regexp || case_sensitive) {
-    addstr("[");
+    addstr(" [");
     if(use_regexp) {
       addstr("regexp");
     }
@@ -659,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);
@@ -691,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) {
@@ -751,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