X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.cc;h=ebe528e315e5b07200cd61589d2725d32ceaf518;hb=bf323e43f1f63a67f6b8bf9ad4ec90057891320b;hp=46ff098228a8660c412787aabf56d269b0ce1a4e;hpb=a89e85005ffd65dd80f44a7661511d3677258fa4;p=selector.git

diff --git a/selector.cc b/selector.cc
index 46ff098..ebe528e 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>
@@ -56,6 +56,9 @@ int use_regexp = 0;
 int case_sensitive = 0;
 char *title = 0;
 
+#define COLOR_MODELINE 1
+#define COLOR_HIGHLIGHTED_LINE 2
+
 //////////////////////////////////////////////////////////////////////
 
 void inject_into_tty_buffer(char *string) {
@@ -104,6 +107,10 @@ int string_to_positive_integer(char *string) {
   return result;
 }
 
+void error_feedback() {
+  flash();
+}
+
 //////////////////////////////////////////////////////////////////////
 // A quick and dirty hash table
 
@@ -240,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) {
@@ -256,7 +263,7 @@ void backspace_char(char *buffer, int *position) {
     }
 
     (*position)--;
-  }
+  } else error_feedback();
 }
 
 void insert_char(char *buffer, int *position, char character) {
@@ -272,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) {
@@ -429,9 +436,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 +471,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 +506,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);
   }
@@ -763,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,
@@ -814,9 +823,6 @@ int main(int argc, char **argv) {
 
   noecho();
 
-  // Hide the cursor
-  // curs_set(0);
-
   // So that the arrow keys work
   keypad(stdscr, TRUE);
 
@@ -828,14 +834,12 @@ int main(int argc, char **argv) {
          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 +900,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
@@ -915,7 +921,7 @@ int main(int argc, char **argv) {
       use_regexp = !use_regexp;
     }
 
-    else if(key == '\011') { // ^R
+    else if(key == '\011') { // ^I
       case_sensitive = !case_sensitive;
     }
 
@@ -933,7 +939,6 @@ int main(int argc, char **argv) {
   } while(key != '\n' && key != KEY_ENTER && key != '\007'); // ^G
 
   echo();
-  // curs_set(1);
   endwin();
 
   //////////////////////////////////////////////////////////////////////