X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=selector.git;a=blobdiff_plain;f=selector.c;h=ca9d392d02b76d5b012fc2d19793299c26c0bc85;hp=b849e65b7a5e5e2ff4adce999cc4a71776103335;hb=9989270a08b72be02921e1c32ec01950a470cca5;hpb=1c1c34b6adc7cf03bf97470ad1180fd61911b4b3

diff --git a/selector.c b/selector.c
index b849e65..ca9d392 100644
--- a/selector.c
+++ b/selector.c
@@ -3,7 +3,7 @@
  *  selector is a simple command line utility for selection of strings
  *  with a dynamic pattern-matching.
  *
- *  Copyright (c) 2009, 2010 Francois Fleuret
+ *  Copyright (c) 2009, 2010, 2011 Francois Fleuret
  *  Written by Francois Fleuret <francois@fleuret.org>
  *
  *  This file is part of selector.
@@ -45,7 +45,7 @@
 #include <getopt.h>
 #include <limits.h>
 
-#define VERSION "1.1.2"
+#define VERSION "1.1.3"
 
 #define BUFFER_SIZE 4096
 
@@ -65,6 +65,7 @@ int use_regexp = 0;
 int case_sensitive = 0;
 char *title = 0;
 int error_flash = 0;
+int exclamation_negates = 0;
 
 int attr_modeline, attr_focus_line, attr_error;
 
@@ -186,14 +187,15 @@ void usage(FILE *out) {
   fprintf(out, "         start in regexp mode\n");
   fprintf(out, " -a, --case-sensitive\n");
   fprintf(out, "         start in case sensitive mode\n");
+  fprintf(out, " -n, --exclamation-negates\n");
+  fprintf(out, "         exclamation points in substring requires the string to be absent\n");
   fprintf(out, " -m, --monochrome\n");
   fprintf(out, "         monochrome mode\n");
   fprintf(out, " -q, --no-beep\n");
   fprintf(out, "         make a flash instead of a beep on an edition error\n");
   fprintf(out, " --bash\n");
   fprintf(out, "         setting for bash history search, same as -b -i -d -v -w -l ${HISTSIZE}\n");
-  fprintf(out, " --, --rest-are-files\n");
-  fprintf(out, "         all following arguments are filenames\n");
+  fprintf(out, " --      all following arguments are filenames\n");
   fprintf(out, " -t <title>, --title <title>\n");
   fprintf(out, "         add a title in the modeline\n");
   fprintf(out, " -c <colors>, --colors <colors>\n");
@@ -214,6 +216,8 @@ void usage(FILE *out) {
 
 /* A quick and dirty hash table */
 
+#define MAGIC_HASH_MULTIPLIER 387433
+
 /* The table itself stores indexes of the strings taken in a char**
    table. When a string is added, if it was already in the table, the
    new index replaces the previous one.  */
@@ -256,11 +260,11 @@ int add_and_get_previous_index(struct hash_table_t *hash_table,
   int k;
 
   /* 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) */
+     hash_table->size is not a multiple of MAGIC_HASH_MULTIPLIER that
+     should be okay) */
 
   for(k = 0; new_string[k]; k++) {
-    code = code * 387433 + (unsigned int) (new_string[k]);
+    code = code * MAGIC_HASH_MULTIPLIER + (unsigned int) (new_string[k]);
   }
 
   code = code % hash_table->size;
@@ -284,7 +288,7 @@ int add_and_get_previous_index(struct hash_table_t *hash_table,
     if(code == start) {
       printf("Full hash table (that should not happen)\n");
       exit(EXIT_FAILURE);
-   } 
+   }
   }
 
   /* This string was not already in there, store the index in the
@@ -306,16 +310,36 @@ typedef struct {
   char *splitted_patterns, **patterns;
 } matcher_t;
 
-int match(char *string, matcher_t *matcher) {
+int match(matcher_t *matcher, char *string) {
   int n;
   if(matcher->nb_patterns >= 0) {
     if(matcher->case_sensitive) {
-      for(n = 0; n < matcher->nb_patterns; n++) {
-        if(strstr(string, matcher->patterns[n]) == 0) return 0;
+      if(exclamation_negates) {
+        for(n = 0; n < matcher->nb_patterns; n++) {
+          if(matcher->patterns[n][0] == '!') {
+            if(strstr(string, matcher->patterns[n] + 1) != 0) return 0;
+          } else {
+            if(strstr(string, matcher->patterns[n]) == 0) return 0;
+          }
+        }
+      } else {
+        for(n = 0; n < matcher->nb_patterns; n++) {
+          if(strstr(string, matcher->patterns[n]) == 0) return 0;
+        }
       }
     } else {
-      for(n = 0; n < matcher->nb_patterns; n++) {
-        if(strcasestr(string, matcher->patterns[n]) == 0) return 0;
+      if(exclamation_negates) {
+        for(n = 0; n < matcher->nb_patterns; n++) {
+          if(matcher->patterns[n][0] == '!') {
+            if(strcasestr(string, matcher->patterns[n] + 1) != 0) return 0;
+          } else {
+            if(strcasestr(string, matcher->patterns[n]) == 0) return 0;
+          }
+        }
+      } else {
+        for(n = 0; n < matcher->nb_patterns; n++) {
+          if(strcasestr(string, matcher->patterns[n]) == 0) return 0;
+        }
       }
     }
     return 1;
@@ -333,8 +357,9 @@ void free_matcher(matcher_t *matcher) {
   }
 }
 
-void initialize_matcher(int use_regexp, int case_sensitive,
-                        matcher_t *matcher, const char *pattern) {
+void initialize_matcher(matcher_t *matcher,
+                        int use_regexp, int case_sensitive,
+                        const char *pattern) {
   const char *s;
   char *t, *last_pattern_start;
   int n;
@@ -437,14 +462,14 @@ void kill_after_cursor(char *buffer, int *position) {
 
 int previous_visible(int current_line, char **lines, matcher_t *matcher) {
   int line = current_line - 1;
-  while(line >= 0 && !match(lines[line], matcher)) line--;
+  while(line >= 0 && !match(matcher, lines[line])) line--;
   return line;
 }
 
 int next_visible(int current_line, int nb_lines, char **lines,
                  matcher_t *matcher) {
   int line = current_line + 1;
-  while(line < nb_lines && !match(lines[line], matcher)) line++;
+  while(line < nb_lines && !match(matcher, lines[line])) line++;
 
   if(line < nb_lines)
     return line;
@@ -479,7 +504,7 @@ void update_screen(int *current_focus_line, int *displayed_focus_line,
   int nb_printed_lines = 0;
   int cursor_x;
 
-  initialize_matcher(use_regexp, case_sensitive, &matcher, pattern);
+  initialize_matcher(&matcher, use_regexp, case_sensitive, pattern);
 
   console_width = getmaxx(stdscr);
   console_height = getmaxy(stdscr);
@@ -502,7 +527,7 @@ void update_screen(int *current_focus_line, int *displayed_focus_line,
 
   else if(nb_lines > 0) {
     int new_focus_line;
-    if(match(lines[*current_focus_line], &matcher)) {
+    if(match(&matcher, lines[*current_focus_line])) {
       new_focus_line = *current_focus_line;
     } else {
       new_focus_line = next_visible(*current_focus_line, nb_lines, lines,
@@ -552,21 +577,21 @@ void update_screen(int *current_focus_line, int *displayed_focus_line,
 
         if(first_line > 0) {
           first_line--;
-          while(first_line > 0 && !match(lines[first_line], &matcher)) {
+          while(first_line > 0 && !match(&matcher, lines[first_line])) {
             first_line--;
           }
-          if(match(lines[first_line], &matcher)) {
+          if(match(&matcher, lines[first_line])) {
             nb_match++;
           }
         }
 
         if(nb_match < console_height - 1 && last_line < nb_lines - 1) {
           last_line++;
-          while(last_line < nb_lines - 1 && !match(lines[last_line], &matcher)) {
+          while(last_line < nb_lines - 1 && !match(&matcher, lines[last_line])) {
             last_line++;
           }
 
-          if(match(lines[last_line], &matcher)) {
+          if(match(&matcher, lines[last_line])) {
             nb_match++;
           }
         }
@@ -575,7 +600,7 @@ void update_screen(int *current_focus_line, int *displayed_focus_line,
       /* Now we display them */
 
       for(l = first_line; l <= last_line; l++) {
-        if(match(lines[l], &matcher)) {
+        if(match(&matcher, lines[l])) {
           int k = 0;
 
           while(lines[l][k] && k < BUFFER_SIZE - 2 && k < console_width - 2) {
@@ -583,27 +608,19 @@ void update_screen(int *current_focus_line, int *displayed_focus_line,
             k++;
           }
 
-          /* We fill the rest of the line with blanks if this is the
-             highlighted line */
+          /* Highlight the highlighted line ... */
 
           if(l == new_focus_line) {
             while(k < console_width) {
               buffer[k++] = ' ';
             }
-          }
-
-          buffer[k++] = '\n';
-          buffer[k++] = '\0';
-
-          clrtoeol();
-
-          /* Highlight the highlighted line ... */
-
-          if(l == new_focus_line) {
             attron(attr_focus_line);
             addnstr(buffer, console_width);
             attroff(attr_focus_line);
           } else {
+            buffer[k++] = '\n';
+            buffer[k++] = '\0';
+            /* clrtoeol(); */
             addnstr(buffer, console_width);
           }
 
@@ -793,7 +810,7 @@ void read_file(struct hash_table_t *hash_table,
       raw_line[BUFFER_SIZE - 1] = '\0';
       fprintf(stderr, "selector: Line too long (max is %d characters):\n",
               BUFFER_SIZE);
-      fprintf(stderr, raw_line);
+      fprintf(stderr, "%s", raw_line);
       fprintf(stderr, "\n");
       exit(EXIT_FAILURE);
     }
@@ -838,7 +855,6 @@ static struct option long_options[] = {
   { "title", 1, 0, 't' },
   { "number-of-lines", 1, 0, 'l' },
   { "colors", 1, 0, 'c' },
-  { "rest-are-files", no_argument, 0, '-' },
   { "bash", no_argument, 0, OPT_BASH_MODE },
   { "help", no_argument, 0, 'h' },
   { 0, 0, 0, 0 }
@@ -850,8 +866,7 @@ int main(int argc, char **argv) {
   char pattern[BUFFER_SIZE];
   int c, k, l, n;
   int cursor_position;
-  int error = 0, show_help = 0;
-  int rest_are_files = 0;
+  int error = 0, show_help = 0, done = 0;
   int key;
   int current_focus_line, displayed_focus_line;
 
@@ -878,8 +893,7 @@ int main(int argc, char **argv) {
 
   strcpy(output_filename, "");
 
-  while (!rest_are_files &&
-         (c = getopt_long(argc, argv, "o:s:x:vwmqf:ibzdeat:l:c:-h",
+  while ((c = getopt_long(argc, argv, "o:s:x:vwmqf:ibzdeant:l:c:-h",
                           long_options, NULL)) != -1) {
 
     switch(c) {
@@ -936,6 +950,10 @@ int main(int argc, char **argv) {
       case_sensitive = 1;
       break;
 
+    case 'n':
+      exclamation_negates = 1;
+      break;
+
     case 't':
       free(title);
       title = safe_malloc((strlen(optarg) + 1) * sizeof(char));
@@ -954,10 +972,6 @@ int main(int argc, char **argv) {
       color_bg_highlight = colors[3];
       break;
 
-    case '-':
-      rest_are_files = 1;
-      break;
-
     case 'h':
       show_help = 1;
       break;
@@ -1203,14 +1217,27 @@ int main(int argc, char **argv) {
       clear();
     }
 
+    else if(key == '\007' || /* ^G */
+            key == '\033' || /* ^[ (escape) */
+            key == '\n' ||
+            key == KEY_ENTER) {
+      done = 1;
+    }
+
+    else if(key == KEY_RESIZE || key == -1) {
+      /* Do nothing when the tty is resized */
+    }
+
+    else {
+      /* Unknown key */
+      error_feedback();
+    }
+
     update_screen(&current_focus_line, &displayed_focus_line,
                   motion,
                   nb_lines, labels, cursor_position, pattern);
 
-  } while(key != '\007' && /* ^G */
-          key != '\033' && /* ^[ (escape) */
-          key != '\n' &&
-          key != KEY_ENTER);
+  } while(!done);
 
   echo();
   endwin();
@@ -1239,7 +1266,7 @@ int main(int argc, char **argv) {
       FILE *out = fopen(output_filename, "w");
       if(out) {
         if(t) {
-          fprintf(out, t);
+          fprintf(out, "%s", t);
         }
         fprintf(out, "\n");
       } else {