* selector is a simple command line utility for selection of strings
* with a dynamic pattern-matching.
*
- * Copyright (c) 2009, 2010, 2011 Francois Fleuret
+ * Copyright (c) 2009, 2010, 2011, 2012 Francois Fleuret
* Written by Francois Fleuret <francois@fleuret.org>
*
* This file is part of selector.
#include <getopt.h>
#include <limits.h>
-#define VERSION "1.1.4"
+#define VERSION "1.1.6"
#define BUFFER_SIZE 4096
int case_sensitive = 0;
char *title = 0;
int error_flash = 0;
-int exclamation_negates = 0;
int upper_caps_makes_case_sensitive = 0;
+int show_long_lines = 0;
+int show_hits = 0;
-int attr_modeline, attr_focus_line, attr_error;
+int attr_modeline, attr_focus_line, attr_error, attr_hits;
/********************************************************************/
void *safe_malloc(size_t n) {
void *p = malloc(n);
- if (!p && n != 0) {
- printf("Can not allocate memory: %s\n", strerror(errno));
+ if(!p && n != 0) {
+ fprintf(stderr,
+ "selector: can not allocate memory: %s\n", strerror(errno));
exit(EXIT_FAILURE);
}
return p;
fprintf(out, " start in regexp mode\n");
fprintf(out, " -a, --case-sensitive\n");
fprintf(out, " start in case sensitive mode\n");
+ fprintf(out, " -j, --show-long-lines\n");
+ fprintf(out, " print a long-line indicator at the end of truncated lines\n");
+ fprintf(out, " -y, --show-hits\n");
+ fprintf(out, " highlight the matching substrings\n");
fprintf(out, " -u, --upper-case-makes-case-sensitive\n");
fprintf(out, " using an upper case character in the matching string makes\n");
fprintf(out, " the matching case-sensitive\n");
- fprintf(out, " -n, --exclamation-negates\n");
- fprintf(out, " substrings starting with an exclamation mark have to be absent\n");
fprintf(out, " -m, --monochrome\n");
fprintf(out, " monochrome mode\n");
fprintf(out, " -q, --no-beep\n");
/* We came back to our original code, which means that the table
is full */
if(code == start) {
- printf("Full hash table (that should not happen)\n");
+ fprintf(stderr,
+ "Full hash table (that should not happen)\n");
exit(EXIT_FAILURE);
}
}
char *splitted_patterns, **patterns;
};
-int match(struct matcher *matcher, char *string) {
+/* Routine to add an interval to a sorted list of intervals
+ extremities. Returns the resulting number of extremities.
+
+ This routine is an effing nightmare */
+
+int add_interval(int n, int *switches, int start, int end) {
+ int f, g, k;
+
+ if(start == end) { return n; }
+
+ f = 0;
+ while(f < n && switches[f] <= start) { f++; }
+ g = f;
+ while(g < n && switches[g] <= end) { g++; }
+
+ if(f == n) {
+ /* switches[n-1] start end */
+ /* XXXXXXXXXXXX| */
+ switches[f] = start;
+ switches[f+1] = end;
+ return n + 2;
+ }
+
+ if(f % 2) {
+
+ if(g % 2) {
+ /* switches[f-1] start switches[f] switches[g-1] end switches[g] */
+ /* |XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX| ... |XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX| */
+ for(k = f; k < n; k++) { switches[k] = switches[k + (g - f)]; }
+ return n - (g - f);
+ } else {
+ /* switches[f-1] start switches[f] switches[g-1] end switches[g] */
+ /* |XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX| ... XXXXXXXXXXXX| |XXXXXXXXXX */
+ switches[g - 1] = end;
+ for(k = f; k < n; k++) { switches[k] = switches[k + ((g - 1) - f)]; }
+ return n - ((g - 1) - f);
+ }
+
+ } else {
+
+ if(f == g) {
+ /* switches[f-1] start end switches[f] */
+ /* XXXXXXXXXXXX| |XXXXXXXXXX */
+ for(k = n - 1; k >= f; k--) {
+ switches[k + 2] = switches[k];
+ }
+ switches[f] = start;
+ switches[f + 1] = end;
+ return n + 2;
+ }
+
+ if(g % 2) {
+ /* switches[f-1] start switches[f] switches[g-1] end switches[g] */
+ /* XXXXXXXXXXXX| |XXXXXXXXXX ... |XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX| */
+ switches[f] = start;
+ for(k = f + 1; k < n; k++) { switches[k] = switches[k + (g - (f + 1))]; }
+ return n - (g - (f + 1));
+ } else {
+ /* switches[f-1] start switches[f] switches[g-1] end switches[g] */
+ /* XXXXXXXXXXXX| |XXXXXXXXXX ... XXXXXXXXXXXX| |XXXXXXXXXX */
+ switches[f] = start;
+ switches[g - 1] = end;
+ for(k = f + 1; k < n; k++) { switches[k] = switches[k + ((g - 1) - (f + 1))]; }
+ return n - ((g - 1) - (f + 1));
+ }
+ }
+}
+
+int match(struct matcher *matcher, char *string, int *nb_switches, int *switches) {
int n;
+ char *where;
+ regmatch_t matches;
+
+ if(nb_switches) { *nb_switches = 0; }
+
if(matcher->nb_patterns >= 0) {
if(matcher->case_sensitive) {
- 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;
+ for(n = 0; n < matcher->nb_patterns; n++) {
+ if((where = strstr(string, matcher->patterns[n])) == 0) return 0;
+ if(switches) {
+ *nb_switches = add_interval(*nb_switches, switches,
+ (int) (where - string),
+ (int) (where - string) + strlen(matcher->patterns[n]));
}
}
} else {
- 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;
+ for(n = 0; n < matcher->nb_patterns; n++) {
+ if((where = strcasestr(string, matcher->patterns[n])) == 0) return 0;
+ if(switches) {
+ *nb_switches = add_interval(*nb_switches, switches,
+ (int) (where - string),
+ (int) (where - string) + strlen(matcher->patterns[n]));
}
}
}
return 1;
} else {
- return regexec(&matcher->preg, string, 0, 0, 0) == 0;
+ if(switches) {
+ if(regexec(&matcher->preg, string, 1, &matches, 0) == 0) {
+ *nb_switches = 2;
+ switches[0] = matches.rm_so;
+ switches[1] = matches.rm_eo;
+ return 1;
+ } else {
+ return 0;
+ }
+ } else {
+ return regexec(&matcher->preg, string, 0, 0, 0) == 0;
+ }
}
}
int previous_visible(int current_line, char **lines, struct matcher *matcher) {
int line = current_line - 1;
- while(line >= 0 && !match(matcher, lines[line])) line--;
+ while(line >= 0 && !match(matcher, lines[line], 0, 0)) line--;
return line;
}
int next_visible(int current_line, int nb_lines, char **lines,
struct matcher *matcher) {
int line = current_line + 1;
- while(line < nb_lines && !match(matcher, lines[line])) line++;
+ while(line < nb_lines && !match(matcher, lines[line], 0, 0)) line++;
if(line < nb_lines)
return line;
/*********************************************************************/
+void print_string_with_switches(char *buffer, int line_width,
+ int nb_patterns, int *switches) {
+ int w, current = 0, next;
+ if(switches) {
+ for(w = 0; w < nb_patterns && switches[2 * w] < line_width; w++) {
+ if(switches[2 * w] < switches[2 * w + 1]) {
+ next = switches[2 * w];
+ if(next > line_width) { next = line_width; }
+ if(next > current) { addnstr(buffer + current, next - current); }
+ attron(attr_hits);
+ current = next;
+ next = switches[2 * w + 1];
+ if(next > line_width) { next = line_width; }
+ if(next > current) { addnstr(buffer + current, next - current); }
+ attroff(attr_hits);
+ current = next;
+ }
+ }
+ if(current < line_width) {
+ addnstr(buffer + current, line_width - current);
+ }
+ } else {
+ addnstr(buffer, line_width);
+ }
+}
+
/* The line highlighted is the first one matching the matcher in that
order: (1) current_focus_line after motion, if it does not match,
then (2) the first with a greater index, if none matches, then (3)
int nb_lines, char **lines,
int cursor_position,
char *pattern) {
-
+ int *switches;
char buffer[BUFFER_SIZE];
struct matcher matcher;
int k, l, m;
int console_width, console_height;
int nb_printed_lines = 0;
int cursor_x;
+ int nb_switches;
initialize_matcher(&matcher, use_regexp, case_sensitive, pattern);
+ if(show_hits) {
+ if(matcher.nb_patterns >= 0) {
+ switches = safe_malloc(sizeof(int) * matcher.nb_patterns * 2);
+ } else {
+ switches = safe_malloc(sizeof(int) * 2);
+ }
+ } else {
+ switches = 0;
+ }
+
console_width = getmaxx(stdscr);
console_height = getmaxy(stdscr);
else if(nb_lines > 0) {
int new_focus_line;
- if(match(&matcher, lines[*current_focus_line])) {
+ if(match(&matcher, lines[*current_focus_line], 0, 0)) {
new_focus_line = *current_focus_line;
} else {
new_focus_line = next_visible(*current_focus_line, nb_lines, lines,
if(first_line > 0) {
first_line--;
- while(first_line > 0 && !match(&matcher, lines[first_line])) {
+ while(first_line > 0 && !match(&matcher, lines[first_line], 0, 0)) {
first_line--;
}
- if(match(&matcher, lines[first_line])) {
+ if(match(&matcher, lines[first_line], 0, 0)) {
nb_match++;
}
}
if(nb_match < console_height - 1 && last_line < nb_lines - 1) {
last_line++;
- while(last_line < nb_lines - 1 && !match(&matcher, lines[last_line])) {
+ while(last_line < nb_lines - 1 && !match(&matcher, lines[last_line], 0, 0)) {
last_line++;
}
- if(match(&matcher, lines[last_line])) {
+ if(match(&matcher, lines[last_line], 0, 0)) {
nb_match++;
}
}
/* Now we display them */
for(l = first_line; l <= last_line; l++) {
- if(match(&matcher, lines[l])) {
+ if(match(&matcher, lines[l], &nb_switches, switches)) {
int k = 0;
while(lines[l][k] && k < BUFFER_SIZE - 2 && k < console_width) {
/* Highlight the highlighted line ... */
if(l == new_focus_line) {
- while(k < console_width) {
- buffer[k++] = ' ';
+ if(show_long_lines && k >= console_width) {
+ attron(attr_focus_line);
+ print_string_with_switches(buffer, console_width-1,
+ nb_switches / 2, switches);
+ /* attron(attr_error); */
+ addnstr("\\", 1);
+ /* attroff(attr_error); */
+ attroff(attr_focus_line);
+ } else {
+ while(k < console_width) {
+ buffer[k++] = ' ';
+ }
+ attron(attr_focus_line);
+ print_string_with_switches(buffer, k,
+ nb_switches / 2, switches);
+ attroff(attr_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);
+ if(show_long_lines && k >= console_width) {
+ print_string_with_switches(buffer, console_width-1,
+ nb_switches / 2, switches);
+ attron(attr_focus_line);
+ addnstr("\\", 1);
+ attroff(attr_focus_line);
+ } else {
+ buffer[k++] = '\n';
+ buffer[k++] = '\0';
+
+ print_string_with_switches(buffer, k,
+ nb_switches / 2, switches);
+ }
}
nb_printed_lines++;
/* We are done */
refresh();
+ if(switches) { free(switches); }
free_matcher(&matcher);
}
exit(EXIT_FAILURE);
}
- while(*nb_lines < nb_lines_max && (fgets(raw_line, BUFFER_SIZE, file))) {
+ while(*nb_lines < nb_lines_max && fgets(raw_line, BUFFER_SIZE, file)) {
for(s = raw_line + strlen(raw_line) - 1; s > raw_line && *s == '\n'; s--) {
*s = '\0';
}
{ "remove-duplicates", no_argument, 0, 'd' },
{ "regexp", no_argument, 0, 'e' },
{ "case-sensitive", no_argument, 0, 'a' },
+ { "show-long-lines", no_argument, 0, 'j'},
+ { "show-hits", no_argument, 0, 'j'},
{ "upper-case-makes-case-sensitive", no_argument, 0, 'u' },
{ "title", 1, 0, 't' },
{ "number-of-lines", 1, 0, 'l' },
strcpy(output_filename, "");
- while ((c = getopt_long(argc, argv, "o:s:x:vwmqf:ibzdeaunt:l:c:-h",
+ while ((c = getopt_long(argc, argv, "o:s:x:vwmqf:ibzdeajyunt:l:c:-h",
long_options, NULL)) != -1) {
switch(c) {
case_sensitive = 1;
break;
- case 'u':
- upper_caps_makes_case_sensitive = 1;
+ case 'j':
+ show_long_lines = 1;
break;
- case 'n':
- exclamation_negates = 1;
+ case 'y':
+ show_hits = 1;
+ break;
+
+ case 'u':
+ upper_caps_makes_case_sensitive = 1;
break;
case 't':
attr_error = A_STANDOUT;
attr_modeline = A_REVERSE;
attr_focus_line = A_STANDOUT;
+ attr_hits = A_BOLD;
if(with_colors && has_colors()) {
/* Here we come back to standard display */
- if((key == KEY_ENTER || key == '\n')) {
+ if(key == KEY_ENTER || key == '\n') {
char *t;
projects / selector.git / blobdiff