X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.cc;h=a1b5b119a35eb36da41b944a695183213f207ab7;hb=5b1410b3fc2ceb4dc75d0c462d630208cfa9b3f3;hp=36b7b9a895f60f89b34f9f22d888ac693a165853;hpb=7a7573dd2cd455de9e1848cfe56775de7b7d4d2b;p=selector.git

diff --git a/selector.cc b/selector.cc
index 36b7b9a..a1b5b11 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>
@@ -107,6 +107,10 @@ int string_to_positive_integer(char *string) {
   return result;
 }
 
+void error_feedback() {
+  flash();
+}
+
 //////////////////////////////////////////////////////////////////////
 // A quick and dirty hash table
 
@@ -243,7 +247,7 @@ void delete_char(char *buffer, int *position) {
       buffer[c] = buffer[c+1];
       c++;
     }
-  }
+  } else error_feedback();
 }
 
 void backspace_char(char *buffer, int *position) {
@@ -259,7 +263,7 @@ void backspace_char(char *buffer, int *position) {
     }
 
     (*position)--;
-  }
+  } else error_feedback();
 }
 
 void insert_char(char *buffer, int *position, char character) {
@@ -275,7 +279,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) {
@@ -510,7 +514,7 @@ void update_screen(int *current_line, int *temporary_line, int motion,
 
     if(case_sensitive) {
       if(use_regexp) {
-        addstr(" ");
+        addstr(",");
       }
       addstr("case");
     }
@@ -773,11 +777,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,
@@ -824,27 +823,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(COLOR_MODELINE , color_fg_modeline, color_bg_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;
     }
@@ -905,11 +905,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
@@ -942,7 +944,6 @@ int main(int argc, char **argv) {
   } while(key != '\n' && key != KEY_ENTER && key != '\007'); // ^G
 
   echo();
-  // curs_set(1);
   endwin();
 
   //////////////////////////////////////////////////////////////////////