X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.cc;h=71768e72883a49286683128a5790eb6c47af9529;hb=4793cb14370b37b6ec83779b3cd29009af968c4d;hp=f5b9d2d9df9b9e3cababe2e2b7844aa397c4bb97;hpb=90657aba25e6ff797f8631ae59cd50a27c227744;p=selector.git

diff --git a/selector.cc b/selector.cc
index f5b9d2d..71768e7 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;
 
 //////////////////////////////////////////////////////////////////////
 
@@ -129,13 +131,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 +161,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 +220,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
 
@@ -228,8 +238,7 @@ void update_screen(int *current_line, int *temporary_line, int motion,
 
   if(matcher.regexp_error) {
     addstr("[regexp error]");
-  } else {
-
+  } else if(nb_lines > 0) {
     int new_line;
     if(match(lines[*current_line], &matcher)) {
       new_line = *current_line;
@@ -349,15 +358,26 @@ void update_screen(int *current_line, int *temporary_line, int motion,
     if(nb_printed_lines == 0) {
       addnstr("[no selection]\n", console_width);
     }
+  } else {
+    addnstr("[empty choice]\n", console_width);
   }
 
   // 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';
@@ -462,6 +482,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]);
@@ -503,7 +536,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
@@ -544,14 +580,14 @@ int main(int argc, char **argv) {
 
     file.getline(raw_line, buffer_size);
 
-    if(file.fail()) {
-      cerr << "Line too long." << endl;
-      cerr << raw_line << endl;
-      exit(1);
-    }
-
     if(raw_line[0]) {
 
+      if(file.fail()) {
+        cerr << "Line too long:" << endl;
+        cerr << raw_line << endl;
+        exit(1);
+      }
+
       char *s, *t;
       const char *u;
 
@@ -753,6 +789,7 @@ int main(int argc, char **argv) {
   }
 
   delete[] lines;
+  delete[] title;
 
   exit(0);
 }