X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.cc;h=ebbd0214f7d068926bfc0ef6389ca370dc62b4d1;hb=f5a9d933f1272364e11c93589903e711b05bcbe5;hp=c6cf64cb9574cb9334c8d4ae961955bba1804475;hpb=50710a40445f3a2b25bfbc5b484abb7c5a0ee893;p=selector.git

diff --git a/selector.cc b/selector.cc
index c6cf64c..ebbd021 100644
--- a/selector.cc
+++ b/selector.cc
@@ -24,7 +24,7 @@
 
 // To use it as a super-history-search for bash:
 //
-// alias h='./selector -i -b -v -f <(history)'
+// alias h='selector -d -i -b -v -f <(history)'
 
 // This software is highly Linux-specific, but I would be glad to get
 // patches to make it work on other OS
@@ -104,8 +104,11 @@ 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
+  // hash_table_size is not a multiple of 387433 that should be okay)
+
   for(int k = 0; new_string[k]; k++) {
-    code += int(new_string[k]) << (8 * k%4);
+    code = code * 387433 + (unsigned int) (new_string[k]);
   }
 
   code = code % hash_table_size;
@@ -204,12 +207,12 @@ int next_visible(int current_line, int nb_lines, char **lines, matcher_t *matche
 
 void update_screen(int *current_line, int *temporary_line, int motion,
                    int nb_lines, char **lines,
-                   char *pattern_list) {
+                   char *pattern) {
 
   char buffer[buffer_size];
   matcher_t matcher;
 
-  initialize_matcher(use_regexp, &matcher, pattern_list);
+  initialize_matcher(use_regexp, &matcher, pattern);
 
   // We now take care of printing the lines per se
 
@@ -355,7 +358,7 @@ void update_screen(int *current_line, int *temporary_line, int motion,
   sprintf(buffer, "%d/%d pattern: %s%s",
           nb_printed_lines,
           nb_lines,
-          pattern_list,
+          pattern,
           use_regexp ? " [regexp]" : "");
 
   for(int k = strlen(buffer); k < console_width; k++) buffer[k] = ' ';
@@ -398,7 +401,9 @@ int main(int argc, char **argv) {
   strcpy(output_filename, "");
 
   int i = 1;
-  while(i < argc) {
+  int error = 0, show_help = 0;
+
+  while(!error && !show_help && i < argc) {
 
     if(strcmp(argv[i], "-o") == 0) {
       check_opt(argc, argv, i, 1, "<output filename>");
@@ -468,33 +473,41 @@ int main(int argc, char **argv) {
       i += 5;
     }
 
+    else if(strcmp(argv[i], "-h") == 0) {
+      show_help = 1;
+      i++;
+    }
+
     else {
-      cerr << "Selector version " << VERSION
-           << endl
-           << "Written by Francois Fleuret <francois@fleuret.org>"
-           << endl
-           << argv[0]
-           << " [-h]"
-           << " [-v]"
-           << " [-m]"
-           << " [-d]"
-           << " [-e]"
-           << " [-z]"
-           << " [-i]"
-           << " [-c <fg modeline> <bg modeline> <fg highlight> <bg highlight>]"
-           << " [-o <output filename>]"
-           << " [-s <pattern separator>]"
-           << " [-l <max number of lines>]"
-           << " -f <input filename>"
-           << endl;
-      if(strcmp(argv[i], "-h") == 0) {
-        exit(0);
-      } else {
-        exit(1);
-      }
+      cerr << "Unknown argument " << argv[i] << "." << endl;
+      error = 1;
     }
   }
 
+  if(show_help || error) {
+    cerr << "Selector version " << VERSION << "-R" << REVISION_NUMBER
+         << endl
+         << "Written by Francois Fleuret <francois@fleuret.org>."
+         << endl
+         << endl
+         << argv[0]
+         << " [-h]"
+         << " [-v]"
+         << " [-m]"
+         << " [-d]"
+         << " [-e]"
+         << " [-z]"
+         << " [-i]"
+         << " [-c <fg modeline> <bg modeline> <fg highlight> <bg highlight>]"
+         << " [-o <output filename>]"
+         << " [-s <pattern separator>]"
+         << " [-l <max number of lines>]"
+         << " -f <input filename>"
+         << endl;
+
+    exit(error);
+  }
+
   char **lines = new char *[nb_lines_max];
 
   if(!input_filename[0]) {
@@ -550,10 +563,10 @@ int main(int argc, char **argv) {
     }
   }
 
-  char patterns[buffer_size];
-  patterns[0] = '\0';
-  int patterns_point;
-  patterns_point = 0;
+  char pattern[buffer_size];
+  pattern[0] = '\0';
+  int pattern_point;
+  pattern_point = 0;
 
   initscr();
 
@@ -584,7 +597,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, patterns);
+  update_screen(&current_line, &temporary_line, 0, nb_lines, lines, pattern);
 
   do {
 
@@ -593,15 +606,15 @@ int main(int argc, char **argv) {
     int motion = 0;
 
     if(key >= ' ' && key <= '~') {
-      patterns[patterns_point++] = key;
-      patterns[patterns_point] = '\0';
+      pattern[pattern_point++] = key;
+      pattern[pattern_point] = '\0';
     }
 
     else if(key == KEY_BACKSPACE || key == '' || key == '' ||
             key == KEY_DC || key == '') {
-      if(patterns_point > 0) {
-        patterns_point--;
-        patterns[patterns_point] = '\0';
+      if(pattern_point > 0) {
+        pattern_point--;
+        pattern[pattern_point] = '\0';
       }
     }
 
@@ -621,6 +634,10 @@ int main(int argc, char **argv) {
       motion = -10;
     }
 
+    else if(key == KEY_DOWN || key == '') {
+      motion = 1;
+    }
+
     else if(key == KEY_UP || key == '') {
       motion = -1;
     }
@@ -630,16 +647,12 @@ int main(int argc, char **argv) {
     }
 
     else if(key == '') {
-      patterns_point = 0;
-      patterns[patterns_point] = '\0';
-    }
-
-    else if(key == KEY_DOWN || key == '') {
-      motion = 1;
+      pattern_point = 0;
+      pattern[pattern_point] = '\0';
     }
 
     update_screen(&current_line, &temporary_line, motion,
-                  nb_lines, lines, patterns);
+                  nb_lines, lines, pattern);
 
   } while(key != '\n' && key != KEY_ENTER && key != '');