* 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.5"
+#define VERSION "1.1.6"
#define BUFFER_SIZE 4096
fprintf(out, " -a, --case-sensitive\n");
fprintf(out, " start in case sensitive mode\n");
fprintf(out, " -j, --show-long-lines\n");
- fprintf(out, " print three dots at the end of truncated 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");
};
/* Routine to add an interval to a sorted list of intervals
- extermities. Returns the number of extremities. This is an effing
- nightmare */
+ 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;
while(g < n && switches[g] <= end) { g++; }
if(f == n) {
- /* switches[n] start end */
- /* XXXXXXXXXX| */
+ /* switches[n-1] start end */
+ /* XXXXXXXXXXXX| */
switches[f] = start;
switches[f+1] = end;
return n + 2;
/*********************************************************************/
void print_string_with_switches(char *buffer, int line_width,
- int console_width,
int nb_patterns, int *switches) {
int w, current = 0, next;
if(switches) {
}
}
if(current < line_width) {
- addnstr(buffer + current, console_width - current);
+ addnstr(buffer + current, line_width - current);
}
} else {
- addnstr(buffer, console_width);
+ addnstr(buffer, line_width);
}
}
initialize_matcher(&matcher, use_regexp, case_sensitive, pattern);
- if(show_hits && matcher.nb_patterns >= 0) {
- switches = safe_malloc(sizeof(int) * matcher.nb_patterns * 2);
+ 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 = safe_malloc(sizeof(int) * 2);
+ switches = 0;
}
console_width = getmaxx(stdscr);
if(l == new_focus_line) {
if(show_long_lines && k >= console_width) {
- if(console_width >= 4) {
- buffer[console_width - 4] = ' ';
- buffer[console_width - 3] = '.';
- buffer[console_width - 2] = '.';
- buffer[console_width - 1] = '.';
- }
+ 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);
- print_string_with_switches(buffer, k, console_width,
- nb_switches / 2, switches);
- attroff(attr_focus_line);
} else {
if(show_long_lines && k >= console_width) {
- if(console_width >= 4) {
- buffer[console_width - 4] = ' ';
- buffer[console_width - 3] = '.';
- buffer[console_width - 2] = '.';
- buffer[console_width - 1] = '.';
- }
+ 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, console_width,
- nb_switches / 2, switches);
+ print_string_with_switches(buffer, k,
+ nb_switches / 2, switches);
+ }
}
nb_printed_lines++;