X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;ds=inline;f=selector.cc;h=9c863a4851fcb583d1c104b9cb5119aa69a37d3f;hb=da5be31b219ede348c3ac884768e39d6d169d7fd;hp=3ffccc1327ec70e29c3d6591de21a15ae6e46f25;hpb=8eb6affd35f9c02dc6bfa5ec8319004bf6f8e78c;p=selector.git

diff --git a/selector.cc b/selector.cc
index 3ffccc1..9c863a4 100644
--- a/selector.cc
+++ b/selector.cc
@@ -53,6 +53,8 @@ int zsh_history = 0, bash_history = 0;
 int inverse_order = 0;
 int remove_duplicates = 0;
 int use_regexp = 0;
+int case_sensitive = 0;
+char *title = 0;
 
 //////////////////////////////////////////////////////////////////////
 
@@ -85,6 +87,10 @@ void check_opt(int argc, char **argv, int n_opt, int n, const char *help) {
 //////////////////////////////////////////////////////////////////////
 // A quick and dirty hash table
 
+// The table itself stores index of the strings in a char
+// **table. When a string is added, if it was already in the table,
+// the new index replaces the previous one.
+
 int *new_hash_table(int hash_table_size) {
   int *result;
   result = new int[hash_table_size];
@@ -94,6 +100,10 @@ int *new_hash_table(int hash_table_size) {
   return result;
 }
 
+// Adds new_string in the table, associated to new_index. If this
+// string was not already in the table, returns -1. Otherwise, returns
+// the previous index it had.
+
 int test_and_add(char *new_string, int new_index,
                  char **strings, int *hash_table, int hash_table_size) {
   unsigned int code = 0;
@@ -108,16 +118,23 @@ int test_and_add(char *new_string, int new_index,
   code = code % hash_table_size;
 
   while(hash_table[code] >= 0) {
+    // There is a string with that code
     if(strcmp(new_string, strings[hash_table[code]]) == 0) {
+      // It is the same string, we keep a copy of the stored index
       int result = hash_table[code];
+      // Put the new one
       hash_table[code] = new_index;
+      // And return the previous one
       return result;
     }
+    // This collision was not the same string, let's move to the next
+    // in the table
     code = (code + 1) % hash_table_size;
   }
 
+  // This string was not already in there, store the index in the
+  // table and return -1
   hash_table[code] = new_index;
-
   return -1;
 }
 
@@ -129,13 +146,20 @@ struct matcher_t {
   regex_t preg;
   int regexp_error;
   int nb_patterns;
+  int case_sensitive;
   char *splitted_patterns, **patterns;
 };
 
 int match(char *string, matcher_t *matcher) {
   if(matcher->nb_patterns >= 0) {
-    for(int n = 0; n < matcher->nb_patterns; n++) {
-      if(strstr(string, matcher->patterns[n]) == 0) return 0;
+    if(matcher->case_sensitive) {
+      for(int n = 0; n < matcher->nb_patterns; n++) {
+        if(strstr(string, matcher->patterns[n]) == 0) return 0;
+      }
+    } else {
+      for(int n = 0; n < matcher->nb_patterns; n++) {
+        if(strcasestr(string, matcher->patterns[n]) == 0) return 0;
+      }
     }
     return 1;
   } else {
@@ -152,13 +176,14 @@ void free_matcher(matcher_t *matcher) {
   }
 }
 
-void initialize_matcher(int use_regexp, matcher_t *matcher, const char *pattern) {
+void initialize_matcher(int use_regexp, int case_sensitive, matcher_t *matcher, const char *pattern) {
   if(use_regexp) {
     matcher->nb_patterns = -1;
-    matcher->regexp_error = regcomp(&matcher->preg, pattern, REG_ICASE);
+    matcher->regexp_error = regcomp(&matcher->preg, pattern, case_sensitive ? 0 : REG_ICASE);
   } else {
     matcher->regexp_error = 0;
     matcher->nb_patterns = 1;
+    matcher->case_sensitive = case_sensitive;
 
     for(const char *s = pattern; *s; s++) {
       if(*s == pattern_separator) {
@@ -210,7 +235,7 @@ void update_screen(int *current_line, int *temporary_line, int motion,
   char buffer[buffer_size];
   matcher_t matcher;
 
-  initialize_matcher(use_regexp, &matcher, pattern);
+  initialize_matcher(use_regexp, case_sensitive, &matcher, pattern);
 
   // We now take care of printing the lines per se
 
@@ -354,11 +379,20 @@ void update_screen(int *current_line, int *temporary_line, int motion,
 
   // Draw the modeline
 
-  sprintf(buffer, "%d/%d pattern: %s%s",
-          nb_printed_lines,
-          nb_lines,
-          pattern,
-          use_regexp ? " [regexp]" : "");
+  if(title) {
+    sprintf(buffer, "%s %d/%d pattern: %s%s",
+            title,
+            nb_printed_lines,
+            nb_lines,
+            pattern,
+            use_regexp ? " [regexp]" : "");
+  } else {
+    sprintf(buffer, "%d/%d pattern: %s%s",
+            nb_printed_lines,
+            nb_lines,
+            pattern,
+            use_regexp ? " [regexp]" : "");
+  }
 
   for(int k = strlen(buffer); k < console_width; k++) buffer[k] = ' ';
   buffer[console_width] = '\0';
@@ -463,6 +497,19 @@ int main(int argc, char **argv) {
       i++;
     }
 
+    else if(strcmp(argv[i], "-a") == 0) {
+      case_sensitive = 1;
+      i++;
+    }
+
+    else if(strcmp(argv[i], "-t") == 0) {
+      check_opt(argc, argv, i, 1, "<title>");
+      delete[] title;
+      title = new char[strlen(argv[i+1]) + 1];
+      strcpy(title, argv[i+1]);
+      i += 2;
+    }
+
     else if(strcmp(argv[i], "-l") == 0) {
       check_opt(argc, argv, i, 1, "<maximum number of lines>");
       nb_lines_max = atoi(argv[i+1]);
@@ -504,7 +551,10 @@ int main(int argc, char **argv) {
          << " -z      remove the zsh history line prefix" << endl
          << " -i      invert the order of lines" << endl
          << " -e      start in regexp mode" << endl
+         << " -a      case sensitive" << endl
          << " -m      monochrome mode" << endl
+         << " -t <title>" << endl
+         << "         add a title in the modeline" << endl
          << " -c <fg modeline> <bg modeline> <fg highlight> <bg highlight>" << endl
          << "         set the display colors" << endl
          << " -o <output filename>" << endl
@@ -587,8 +637,8 @@ int main(int argc, char **argv) {
         lines[nb_lines] = new char[strlen(s) + 1];
         strcpy(lines[nb_lines], s);
       } else {
-        // We do not allocate a new string but use the pointer to the
-        // first occurence of it
+        // The string was already in there, so we do not allocate a
+        // new string but use the pointer to the first occurence of it
         lines[nb_lines] = lines[dup];
         lines[dup] = 0;
       }
@@ -754,6 +804,7 @@ int main(int argc, char **argv) {
   }
 
   delete[] lines;
+  delete[] title;
 
   exit(0);
 }