X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.cc;h=0bb2d3f95ced54cd5fde0dddc68172f7b0204872;hb=af3bbcdf9a629c4fb333709dedd435b72bdc5213;hp=31bf262b48248d9032531c2655e6086c8c6534b1;hpb=5096c70784d53b70db47028d7ebc766f8c02f0bf;p=selector.git

diff --git a/selector.cc b/selector.cc
index 31bf262..0bb2d3f 100644
--- a/selector.cc
+++ b/selector.cc
@@ -23,12 +23,8 @@
  */
 
 // To use it as a super-history-search for bash:
-//
 // 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
-
 #include <fstream>
 #include <iostream>
 
@@ -45,7 +41,7 @@ using namespace std;
 
 #define VERSION "1.0"
 
-const int buffer_size = 1024;
+const int buffer_size = 4096;
 
 // Yeah, global variables!
 
@@ -57,19 +53,18 @@ int zsh_history = 0, bash_history = 0;
 int inverse_order = 0;
 int remove_duplicates = 0;
 int use_regexp = 0;
+int case_sensitive = 0;
 
 //////////////////////////////////////////////////////////////////////
 
-// This looks severely Linux-only ...
-
-void inject_into_tty_buffer(char *line) {
+void inject_into_tty_buffer(char *string) {
   struct termios oldtio, newtio;
-  tcgetattr(STDIN_FILENO,&oldtio);
+  tcgetattr(STDIN_FILENO, &oldtio);
   memset(&newtio, 0, sizeof(newtio));
   // Set input mode (non-canonical, *no echo*,...)
   tcsetattr(STDIN_FILENO, TCSANOW, &newtio);
-  // Put the selected line in the tty input buffer
-  for(char *k = line; *k; k++) {
+  // Put the selected string in the tty input buffer
+  for(char *k = string; *k; k++) {
     ioctl(STDIN_FILENO, TIOCSTI, k);
   }
   // Restore the old settings
@@ -135,13 +130,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 {
@@ -158,13 +160,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) {
@@ -216,7 +219,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
 
@@ -234,8 +237,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;
@@ -355,6 +357,8 @@ 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
@@ -468,6 +472,11 @@ int main(int argc, char **argv) {
       i++;
     }
 
+    else if(strcmp(argv[i], "-a") == 0) {
+      case_sensitive = 1;
+      i++;
+    }
+
     else if(strcmp(argv[i], "-l") == 0) {
       check_opt(argc, argv, i, 1, "<maximum number of lines>");
       nb_lines_max = atoi(argv[i+1]);
@@ -500,20 +509,25 @@ int main(int argc, char **argv) {
          << "Written by Francois Fleuret <francois@fleuret.org>."
          << endl
          << endl
-         << argv[0]
-         << " [-h]"
-         << " [-v]"
-         << " [-m]"
-         << " [-d]"
-         << " [-e]"
-         << " [-b]"
-         << " [-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>"
+         << "Usage: " << argv[0] << " [options] -f <file>" << endl
+         << endl
+         << " -h      show this help" << endl
+         << " -v      inject the selected line in the tty" << endl
+         << " -d      remove duplicated lines" << endl
+         << " -b      remove the bash history line prefix" << endl
+         << " -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
+         << " -c <fg modeline> <bg modeline> <fg highlight> <bg highlight>" << endl
+         << "         set the display colors" << endl
+         << " -o <output filename>" << endl
+         << "         set a file to write the selected line to" << endl
+         << " -s <pattern separator>" << endl
+         << "         set the symbol to separate substrings in the pattern" << endl
+         << " -l <max number of lines>" << endl
+         << "         set the maximum number of lines to take into account" << endl
          << endl;
 
     exit(error);
@@ -546,7 +560,13 @@ int main(int argc, char **argv) {
 
     file.getline(raw_line, buffer_size);
 
-    if(strcmp(raw_line, "") != 0) {
+    if(raw_line[0]) {
+
+      if(file.fail()) {
+        cerr << "Line too long:" << endl;
+        cerr << raw_line << endl;
+        exit(1);
+      }
 
       char *s, *t;
       const char *u;