projects
/
selector.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made the long-line indicator more visible.
[selector.git]
/
selector.c
diff --git
a/selector.c
b/selector.c
index
07160f5
..
72f1aa1
100644
(file)
--- 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.
*
* 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.
* Written by Francois Fleuret <francois@fleuret.org>
*
* This file is part of selector.
@@
-45,7
+45,7
@@
#include <getopt.h>
#include <limits.h>
#include <getopt.h>
#include <limits.h>
-#define VERSION "1.1.
5
"
+#define VERSION "1.1.
6
"
#define BUFFER_SIZE 4096
#define BUFFER_SIZE 4096
@@
-320,43
+320,40
@@
struct matcher {
};
/* Routine to add an interval to a sorted list of intervals
};
/* 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;
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) {
f = 0;
while(f < n && switches[f] <= start) { f++; }
g = f;
while(g < n && switches[g] <= end) { g++; }
if(f == n) {
- /* switches[n] start end */
- /* XXXXXXXXXX| */
+ /* switches[n
-1
] start end */
+ /* XXXXXXXXXX
XX
| */
switches[f] = start;
switches[f+1] = end;
return n + 2;
}
switches[f] = start;
switches[f+1] = end;
return n + 2;
}
- if(f
%
2) {
+ if(f
%
2) {
- if(f == g) {
- /* switches[f-1] start end switches[f] */
- /* |XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX| */
- return n;
- }
-
- if(g%2) {
+ if(g % 2) {
/* switches[f-1] start switches[f] switches[g-1] end switches[g] */
/* |XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX| ... |XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX| */
/* switches[f-1] start switches[f] switches[g-1] end switches[g] */
/* |XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX| ... |XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX| */
- for(k = f; k < n; k++) { switches[k] = switches[
(k - f) + g
]; }
+ 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;
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 - f) + (g - 1
)]; }
+ for(k = f; k < n; k++) { switches[k] = switches[
k + ((g - 1) - f
)]; }
return n - ((g - 1) - f);
}
return n - ((g - 1) - f);
}
@@
-365,7
+362,7
@@
int add_interval(int n, int *switches, int start, int end) {
if(f == g) {
/* switches[f-1] start end switches[f] */
/* XXXXXXXXXXXX| |XXXXXXXXXX */
if(f == g) {
/* switches[f-1] start end switches[f] */
/* XXXXXXXXXXXX| |XXXXXXXXXX */
- for(k = n; k >= f; k--) {
+ for(k = n
- 1
; k >= f; k--) {
switches[k + 2] = switches[k];
}
switches[f] = start;
switches[k + 2] = switches[k];
}
switches[f] = start;
@@
-373,49
+370,64
@@
int add_interval(int n, int *switches, int start, int end) {
return n + 2;
}
return n + 2;
}
- if(g
%
2) {
+ if(g
%
2) {
/* switches[f-1] start switches[f] switches[g-1] end switches[g] */
/* XXXXXXXXXXXX| |XXXXXXXXXX ... |XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX| */
switches[f] = start;
/* 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 - (f + 1)) + g
]; }
+ 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;
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 - (f + 1)) + (g - 1
)]; }
+ for(k = f + 1; k < n; k++) { switches[k] = switches[
k + ((g - 1) - (f + 1)
)]; }
return n - ((g - 1) - (f + 1));
}
}
}
return n - ((g - 1) - (f + 1));
}
}
}
-int match(struct matcher *matcher, char *string, int *switches) {
- int n
, nb_switches = 0
;
+int match(struct matcher *matcher, char *string, int *
nb_switches, int *
switches) {
+ int n;
char *where;
char *where;
+ regmatch_t matches;
+
+ if(nb_switches) { *nb_switches = 0; }
+
if(matcher->nb_patterns >= 0) {
if(matcher->case_sensitive) {
for(n = 0; n < matcher->nb_patterns; n++) {
if((where = strstr(string, matcher->patterns[n])) == 0) return 0;
if(switches) {
if(matcher->nb_patterns >= 0) {
if(matcher->case_sensitive) {
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]));
+
*nb_switches = add_interval(*
nb_switches, switches,
+
(int) (where - string),
+
(int) (where - string) + strlen(matcher->patterns[n]));
}
}
} else {
for(n = 0; n < matcher->nb_patterns; n++) {
if((where = strcasestr(string, matcher->patterns[n])) == 0) return 0;
if(switches) {
}
}
} else {
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]));
+
*nb_switches = add_interval(*
nb_switches, switches,
+
(int) (where - string),
+
(int) (where - string) + strlen(matcher->patterns[n]));
}
}
}
return 1;
} else {
}
}
}
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;
+ }
}
}
}
}
@@
-541,14
+553,14
@@
void kill_after_cursor(char *buffer, int *position) {
int previous_visible(int current_line, char **lines, struct matcher *matcher) {
int line = current_line - 1;
int previous_visible(int current_line, char **lines, struct matcher *matcher) {
int line = current_line - 1;
- while(line >= 0 && !match(matcher, lines[line], 0)) 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;
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], 0)) line++;
+ while(line < nb_lines && !match(matcher, lines[line], 0
, 0
)) line++;
if(line < nb_lines)
return line;
if(line < nb_lines)
return line;
@@
-559,7
+571,6
@@
int next_visible(int current_line, int nb_lines, char **lines,
/*********************************************************************/
void print_string_with_switches(char *buffer, int line_width,
/*********************************************************************/
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) {
int nb_patterns, int *switches) {
int w, current = 0, next;
if(switches) {
@@
-567,21
+578,21
@@
void print_string_with_switches(char *buffer, int line_width,
if(switches[2 * w] < switches[2 * w + 1]) {
next = switches[2 * w];
if(next > line_width) { next = line_width; }
if(switches[2 * w] < switches[2 * w + 1]) {
next = switches[2 * w];
if(next > line_width) { next = line_width; }
- addnstr(buffer + current, next - current);
+ 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; }
attron(attr_hits);
current = next;
next = switches[2 * w + 1];
if(next > line_width) { next = line_width; }
- addnstr(buffer + current, next - current);
+ if(next > current) { addnstr(buffer + current, next - current); }
attroff(attr_hits);
current = next;
}
}
if(current < line_width) {
attroff(attr_hits);
current = next;
}
}
if(current < line_width) {
- addnstr(buffer + current,
consol
e_width - current);
+ addnstr(buffer + current,
lin
e_width - current);
}
} else {
}
} else {
- addnstr(buffer,
consol
e_width);
+ addnstr(buffer,
lin
e_width);
}
}
}
}
@@
-609,11
+620,16
@@
void update_screen(int *current_focus_line, int *displayed_focus_line,
int console_width, console_height;
int nb_printed_lines = 0;
int cursor_x;
int console_width, console_height;
int nb_printed_lines = 0;
int cursor_x;
+ int nb_switches;
initialize_matcher(&matcher, use_regexp, case_sensitive, pattern);
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 = 0;
}
} else {
switches = 0;
}
@@
-639,7
+655,7
@@
void update_screen(int *current_focus_line, int *displayed_focus_line,
else if(nb_lines > 0) {
int new_focus_line;
else if(nb_lines > 0) {
int new_focus_line;
- if(match(&matcher, lines[*current_focus_line], 0)) {
+ 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,
new_focus_line = *current_focus_line;
} else {
new_focus_line = next_visible(*current_focus_line, nb_lines, lines,
@@
-689,21
+705,21
@@
void update_screen(int *current_focus_line, int *displayed_focus_line,
if(first_line > 0) {
first_line--;
if(first_line > 0) {
first_line--;
- while(first_line > 0 && !match(&matcher, lines[first_line], 0)) {
+ while(first_line > 0 && !match(&matcher, lines[first_line], 0
, 0
)) {
first_line--;
}
first_line--;
}
- if(match(&matcher, lines[first_line], 0)) {
+ if(match(&matcher, lines[first_line], 0
, 0
)) {
nb_match++;
}
}
if(nb_match < console_height - 1 && last_line < nb_lines - 1) {
last_line++;
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], 0)) {
+ while(last_line < nb_lines - 1 && !match(&matcher, lines[last_line], 0
, 0
)) {
last_line++;
}
last_line++;
}
- if(match(&matcher, lines[last_line], 0)) {
+ if(match(&matcher, lines[last_line], 0
, 0
)) {
nb_match++;
}
}
nb_match++;
}
}
@@
-712,7
+728,7
@@
void update_screen(int *current_focus_line, int *displayed_focus_line,
/* Now we display them */
for(l = first_line; l <= last_line; l++) {
/* Now we display them */
for(l = first_line; l <= last_line; l++) {
- if(match(&matcher, lines[l], switches)) {
+ if(match(&matcher, lines[l],
&nb_switches,
switches)) {
int k = 0;
while(lines[l][k] && k < BUFFER_SIZE - 2 && k < console_width) {
int k = 0;
while(lines[l][k] && k < BUFFER_SIZE - 2 && k < console_width) {
@@
-724,35
+740,36
@@
void update_screen(int *current_focus_line, int *displayed_focus_line,
if(l == new_focus_line) {
if(show_long_lines && k >= console_width) {
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++] = ' ';
}
} 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,
- matcher.nb_patterns, switches);
- attroff(attr_focus_line);
} else {
if(show_long_lines && k >= console_width) {
} 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';
} else {
buffer[k++] = '\n';
buffer[k++] = '\0';
+
+ print_string_with_switches(buffer, k,
+ nb_switches / 2, switches);
}
}
- print_string_with_switches(buffer, k, console_width,
- matcher.nb_patterns, switches);
}
nb_printed_lines++;
}
nb_printed_lines++;
@@
-945,6
+962,7
@@
static struct option long_options[] = {
{ "regexp", no_argument, 0, 'e' },
{ "case-sensitive", no_argument, 0, 'a' },
{ "show-long-lines", no_argument, 0, 'j'},
{ "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' },
{ "upper-case-makes-case-sensitive", no_argument, 0, 'u' },
{ "title", 1, 0, 't' },
{ "number-of-lines", 1, 0, 'l' },