projects
/
selector.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added the -u option.
[selector.git]
/
selector.c
diff --git
a/selector.c
b/selector.c
index
1081617
..
646cffa
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 Francois Fleuret
+ * Copyright (c) 2009, 2010
, 2011
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.
@@
-66,6
+66,7
@@
int case_sensitive = 0;
char *title = 0;
int error_flash = 0;
int exclamation_negates = 0;
char *title = 0;
int error_flash = 0;
int exclamation_negates = 0;
+int upper_caps_makes_case_sensitive = 0;
int attr_modeline, attr_focus_line, attr_error;
int attr_modeline, attr_focus_line, attr_error;
@@
-187,8
+188,11
@@
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, " start in regexp mode\n");
fprintf(out, " -a, --case-sensitive\n");
fprintf(out, " start in case sensitive mode\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, " -n, --exclamation-negates\n");
- fprintf(out, "
exclamation points in substring requires the string
to be absent\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");
fprintf(out, " -m, --monochrome\n");
fprintf(out, " monochrome mode\n");
fprintf(out, " -q, --no-beep\n");
@@
-302,15
+306,15
@@
int add_and_get_previous_index(struct hash_table_t *hash_table,
A matcher matches either with a collection of substrings, or with a
regexp */
A matcher matches either with a collection of substrings, or with a
regexp */
-
typedef struct
{
+
struct matcher
{
regex_t preg;
int regexp_error;
int nb_patterns;
int case_sensitive;
char *splitted_patterns, **patterns;
regex_t preg;
int regexp_error;
int nb_patterns;
int case_sensitive;
char *splitted_patterns, **patterns;
-}
matcher_t
;
+};
-int match(
matcher_t
*matcher, char *string) {
+int match(
struct matcher
*matcher, char *string) {
int n;
if(matcher->nb_patterns >= 0) {
if(matcher->case_sensitive) {
int n;
if(matcher->nb_patterns >= 0) {
if(matcher->case_sensitive) {
@@
-348,7
+352,7
@@
int match(matcher_t *matcher, char *string) {
}
}
}
}
-void free_matcher(
matcher_t
*matcher) {
+void free_matcher(
struct matcher
*matcher) {
if(matcher->nb_patterns < 0) {
if(!matcher->regexp_error) regfree(&matcher->preg);
} else {
if(matcher->nb_patterns < 0) {
if(!matcher->regexp_error) regfree(&matcher->preg);
} else {
@@
-357,7
+361,7
@@
void free_matcher(matcher_t *matcher) {
}
}
}
}
-void initialize_matcher(
matcher_t
*matcher,
+void initialize_matcher(
struct matcher
*matcher,
int use_regexp, int case_sensitive,
const char *pattern) {
const char *s;
int use_regexp, int case_sensitive,
const char *pattern) {
const char *s;
@@
-365,12
+369,20
@@
void initialize_matcher(matcher_t *matcher,
int n;
if(use_regexp) {
int n;
if(use_regexp) {
+ matcher->case_sensitive = case_sensitive;
matcher->nb_patterns = -1;
matcher->regexp_error = regcomp(&matcher->preg, pattern,
case_sensitive ? 0 : REG_ICASE);
} else {
matcher->regexp_error = 0;
matcher->nb_patterns = 1;
matcher->nb_patterns = -1;
matcher->regexp_error = regcomp(&matcher->preg, pattern,
case_sensitive ? 0 : REG_ICASE);
} else {
matcher->regexp_error = 0;
matcher->nb_patterns = 1;
+
+ if(upper_caps_makes_case_sensitive) {
+ for(s = pattern; *s && !case_sensitive; s++) {
+ case_sensitive = (*s >= 'A' && *s <= 'Z');
+ }
+ }
+
matcher->case_sensitive = case_sensitive;
for(s = pattern; *s; s++) {
matcher->case_sensitive = case_sensitive;
for(s = pattern; *s; s++) {
@@
-460,14
+472,14
@@
void kill_after_cursor(char *buffer, int *position) {
/*********************************************************************/
/*********************************************************************/
-int previous_visible(int current_line, char **lines,
matcher_t
*matcher) {
+int previous_visible(int current_line, char **lines,
struct matcher
*matcher) {
int line = current_line - 1;
while(line >= 0 && !match(matcher, lines[line])) line--;
return line;
}
int next_visible(int current_line, int nb_lines, char **lines,
int line = current_line - 1;
while(line >= 0 && !match(matcher, lines[line])) line--;
return line;
}
int next_visible(int current_line, int nb_lines, char **lines,
-
matcher_t
*matcher) {
+
struct matcher
*matcher) {
int line = current_line + 1;
while(line < nb_lines && !match(matcher, lines[line])) line++;
int line = current_line + 1;
while(line < nb_lines && !match(matcher, lines[line])) line++;
@@
-498,7
+510,7
@@
void update_screen(int *current_focus_line, int *displayed_focus_line,
char *pattern) {
char buffer[BUFFER_SIZE];
char *pattern) {
char buffer[BUFFER_SIZE];
-
matcher_t
matcher;
+
struct matcher
matcher;
int k, l, m;
int console_width, console_height;
int nb_printed_lines = 0;
int k, l, m;
int console_width, console_height;
int nb_printed_lines = 0;
@@
-603,32
+615,24
@@
void update_screen(int *current_focus_line, int *displayed_focus_line,
if(match(&matcher, lines[l])) {
int k = 0;
if(match(&matcher, lines[l])) {
int k = 0;
- while(lines[l][k] && k < BUFFER_SIZE - 2 && k < console_width
- 2
) {
+ while(lines[l][k] && k < BUFFER_SIZE - 2 && k < console_width) {
buffer[k] = lines[l][k];
k++;
}
buffer[k] = lines[l][k];
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++] = ' ';
}
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 {
attron(attr_focus_line);
addnstr(buffer, console_width);
attroff(attr_focus_line);
} else {
+ buffer[k++] = '\n';
+ buffer[k++] = '\0';
+ /* clrtoeol(); */
addnstr(buffer, console_width);
}
addnstr(buffer, console_width);
}
@@
-702,13
+706,13
@@
void update_screen(int *current_focus_line, int *displayed_focus_line,
/* Add a few info about the mode we are in (regexp and/or case
sensitive) */
/* Add a few info about the mode we are in (regexp and/or case
sensitive) */
- if(use_regexp || case_sensitive) {
+ if(use_regexp ||
matcher.
case_sensitive) {
addstr(" [");
if(use_regexp) {
addstr("regexp");
}
addstr(" [");
if(use_regexp) {
addstr("regexp");
}
- if(case_sensitive) {
+ if(
matcher.
case_sensitive) {
if(use_regexp) {
addstr(",");
}
if(use_regexp) {
addstr(",");
}
@@
-860,6
+864,7
@@
static struct option long_options[] = {
{ "remove-duplicates", no_argument, 0, 'd' },
{ "regexp", no_argument, 0, 'e' },
{ "case-sensitive", no_argument, 0, 'a' },
{ "remove-duplicates", no_argument, 0, 'd' },
{ "regexp", no_argument, 0, 'e' },
{ "case-sensitive", no_argument, 0, 'a' },
+ { "upper-case-makes-case-sensitive", no_argument, 0, 'u' },
{ "title", 1, 0, 't' },
{ "number-of-lines", 1, 0, 'l' },
{ "colors", 1, 0, 'c' },
{ "title", 1, 0, 't' },
{ "number-of-lines", 1, 0, 'l' },
{ "colors", 1, 0, 'c' },
@@
-901,7
+906,7
@@
int main(int argc, char **argv) {
strcpy(output_filename, "");
strcpy(output_filename, "");
- while ((c = getopt_long(argc, argv, "o:s:x:vwmqf:ibzdeant:l:c:-h",
+ while ((c = getopt_long(argc, argv, "o:s:x:vwmqf:ibzdea
u
nt:l:c:-h",
long_options, NULL)) != -1) {
switch(c) {
long_options, NULL)) != -1) {
switch(c) {
@@
-958,6
+963,10
@@
int main(int argc, char **argv) {
case_sensitive = 1;
break;
case_sensitive = 1;
break;
+ case 'u':
+ upper_caps_makes_case_sensitive = 1;
+ break;
+
case 'n':
exclamation_negates = 1;
break;
case 'n':
exclamation_negates = 1;
break;