/*
- * selector is a simple shell command 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 Francois Fleuret
* Written by Francois Fleuret <francois@fleuret.org>
int inverse_order = 0;
int remove_duplicates = 0;
int use_regexp = 0;
+int case_sensitive = 0;
+char *title = 0;
+
+#define COLOR_MODELINE 1
+#define COLOR_HIGHLIGHTED_LINE 2
//////////////////////////////////////////////////////////////////////
}
}
+int string_to_positive_integer(char *string) {
+ int error = 0;
+ int result = 0;
+
+ if(*string) {
+ for(char *s = string; *s; s++) {
+ if(*s >= '0' && *s <= '9') {
+ result = result * 10 + int(*s - '0');
+ } else error = 1;
+ }
+ } else error = 1;
+
+ if(error) {
+ cerr << "Value `" << string << "' is not a positive integer." << endl;
+ exit(1);
+ }
+
+ return result;
+}
+
//////////////////////////////////////////////////////////////////////
// A quick and dirty hash table
+// The table itself stores index of the strings in a char
+// **table. When a string is added, if it was already in the table,
+// the new index replaces the previous one.
+
int *new_hash_table(int hash_table_size) {
int *result;
result = new int[hash_table_size];
return result;
}
+// Adds new_string in the table, associated to new_index. If this
+// string was not already in the table, returns -1. Otherwise, returns
+// the previous index it had.
+
int test_and_add(char *new_string, int new_index,
char **strings, int *hash_table, int hash_table_size) {
unsigned int code = 0;
code = code % hash_table_size;
while(hash_table[code] >= 0) {
+ // There is a string with that code
if(strcmp(new_string, strings[hash_table[code]]) == 0) {
+ // It is the same string, we keep a copy of the stored index
int result = hash_table[code];
+ // Put the new one
hash_table[code] = new_index;
+ // And return the previous one
return result;
}
+ // This collision was not the same string, let's move to the next
+ // in the table
code = (code + 1) % hash_table_size;
}
+ // This string was not already in there, store the index in the
+ // table and return -1
hash_table[code] = new_index;
-
return -1;
}
regex_t preg;
int regexp_error;
int nb_patterns;
+ int case_sensitive;
char *splitted_patterns, **patterns;
};
int match(char *string, matcher_t *matcher) {
if(matcher->nb_patterns >= 0) {
- for(int n = 0; n < matcher->nb_patterns; n++) {
- if(strstr(string, matcher->patterns[n]) == 0) return 0;
+ if(matcher->case_sensitive) {
+ for(int n = 0; n < matcher->nb_patterns; n++) {
+ if(strstr(string, matcher->patterns[n]) == 0) return 0;
+ }
+ } else {
+ for(int n = 0; n < matcher->nb_patterns; n++) {
+ if(strcasestr(string, matcher->patterns[n]) == 0) return 0;
+ }
}
return 1;
} else {
}
}
-void initialize_matcher(int use_regexp, matcher_t *matcher, const char *pattern) {
+void initialize_matcher(int use_regexp, int case_sensitive,
+ matcher_t *matcher, const char *pattern) {
+
if(use_regexp) {
matcher->nb_patterns = -1;
- matcher->regexp_error = regcomp(&matcher->preg, pattern, REG_ICASE);
+ matcher->regexp_error = regcomp(&matcher->preg, pattern, case_sensitive ? 0 : REG_ICASE);
} else {
matcher->regexp_error = 0;
matcher->nb_patterns = 1;
+ matcher->case_sensitive = case_sensitive;
for(const char *s = pattern; *s; s++) {
if(*s == pattern_separator) {
}
}
+//////////////////////////////////////////////////////////////////////
+// Buffer edition
+
+void delete_char(char *buffer, int *position) {
+ if(buffer[*position]) {
+ int c = *position;
+ while(c < buffer_size && buffer[c]) {
+ buffer[c] = buffer[c+1];
+ c++;
+ }
+ }
+}
+
+void backspace_char(char *buffer, int *position) {
+ if(*position > 0) {
+ if(buffer[*position]) {
+ int c = *position - 1;
+ while(buffer[c]) {
+ buffer[c] = buffer[c+1];
+ c++;
+ }
+ } else {
+ buffer[*position - 1] = '\0';
+ }
+
+ (*position)--;
+ }
+}
+
+void insert_char(char *buffer, int *position, char character) {
+ if(strlen(buffer) < buffer_size - 1) {
+ int c = *position;
+ char t = buffer[c], u;
+ while(t) {
+ c++;
+ u = buffer[c];
+ buffer[c] = t;
+ t = u;
+ }
+ c++;
+ buffer[c] = '\0';
+ buffer[(*position)++] = character;
+ }
+}
+
+void kill_before_cursor(char *buffer, int *position) {
+ int s = 0;
+ while(buffer[*position + s]) {
+ buffer[s] = buffer[*position + s];
+ s++;
+ }
+ buffer[s] = '\0';
+ *position = 0;
+}
+
+void kill_after_cursor(char *buffer, int *position) {
+ buffer[*position] = '\0';
+}
+
//////////////////////////////////////////////////////////////////////
int previous_visible(int current_line, int nb_lines, char **lines, matcher_t *matcher) {
void update_screen(int *current_line, int *temporary_line, int motion,
int nb_lines, char **lines,
+ int cursor_position,
char *pattern) {
char buffer[buffer_size];
matcher_t matcher;
- initialize_matcher(use_regexp, &matcher, pattern);
+ initialize_matcher(use_regexp, case_sensitive, &matcher, pattern);
// We now take care of printing the lines per se
if(matcher.regexp_error) {
addstr("[regexp error]");
- } else {
-
+ } else if(nb_lines > 0) {
int new_line;
if(match(lines[*current_line], &matcher)) {
new_line = *current_line;
if(l == new_line) {
if(with_colors) {
- attron(COLOR_PAIR(2));
+ attron(COLOR_PAIR(COLOR_HIGHLIGHTED_LINE));
addnstr(buffer, console_width);
- attroff(COLOR_PAIR(2));
+ attroff(COLOR_PAIR(COLOR_HIGHLIGHTED_LINE));
} else {
attron(A_STANDOUT);
addnstr(buffer, console_width);
if(nb_printed_lines == 0) {
addnstr("[no selection]\n", console_width);
}
+ } else {
+ addnstr("[empty choice]\n", console_width);
}
// Draw the modeline
- sprintf(buffer, "%d/%d pattern: %s%s",
- nb_printed_lines,
- nb_lines,
- pattern,
- use_regexp ? " [regexp]" : "");
+ move(0, 0);
+
+ if(with_colors) {
+ attron(COLOR_PAIR(COLOR_MODELINE));
+ } else {
+ attron(A_REVERSE);
+ }
- for(int k = strlen(buffer); k < console_width; k++) buffer[k] = ' ';
+ for(int k = 0; k < console_width; k++) buffer[k] = ' ';
buffer[console_width] = '\0';
+ addnstr(buffer, console_width);
move(0, 0);
+
+ // There must be a more elegant way of moving the cursor at a
+ // location met during display
+
+ int cursor_x = 0;
+
+ if(title) {
+ addstr(title);
+ addstr(" ");
+ cursor_x += strlen(title) + 1;
+ }
+
+ sprintf(buffer, "%d/%d ", nb_printed_lines, nb_lines);
+ addstr(buffer);
+ cursor_x += strlen(buffer);
+
+ addnstr(pattern, cursor_position);
+ cursor_x += cursor_position;
+
+ if(pattern[cursor_position]) {
+ addstr(pattern + cursor_position);
+ } else {
+ addstr(" ");
+ }
+
+ if(use_regexp || case_sensitive) {
+ addstr("[");
+ if(use_regexp) {
+ addstr("regexp");
+ }
+
+ if(case_sensitive) {
+ if(use_regexp) {
+ addstr(",");
+ }
+ addstr("case");
+ }
+ addstr("]");
+ }
+
+ move(0, cursor_x);
+
if(with_colors) {
- attron(COLOR_PAIR(1));
- addnstr(buffer, console_width);
- attroff(COLOR_PAIR(1));
+ attroff(COLOR_PAIR(COLOR_MODELINE));
} else {
- attron(A_REVERSE);
- addnstr(buffer, console_width);
attroff(A_REVERSE);
}
//////////////////////////////////////////////////////////////////////
+void read_file(const char *input_filename,
+ int nb_lines_max, int *nb_lines, char **lines,
+ int hash_table_size, int *hash_table) {
+
+ char buffer[buffer_size], raw_line[buffer_size];;
+
+ ifstream file(input_filename);
+
+ if(file.fail()) {
+ cerr << "Can not open " << input_filename << endl;
+ exit(1);
+ }
+
+ while(*nb_lines < nb_lines_max && !file.eof()) {
+
+ file.getline(raw_line, buffer_size);
+
+ if(raw_line[0]) {
+
+ if(file.fail()) {
+ cerr << "Line too long:" << endl;
+ cerr << raw_line << endl;
+ exit(1);
+ }
+
+ char *s, *t;
+ const char *u;
+
+ s = buffer;
+ t = raw_line;
+ while(*t) {
+ u = unctrl(*t++);
+ while(*u) { *s++ = *u++; }
+ }
+ *s = '\0';
+
+ s = buffer;
+
+ if(zsh_history && *s == ':') {
+ while(*s && *s != ';') s++;
+ if(*s == ';') s++;
+ }
+
+ if(bash_history && (*s == ' ' || (*s >= '0' && *s <= '9'))) {
+ while(*s == ' ' || (*s >= '0' && *s <= '9')) s++;
+ }
+
+ int dup;
+
+ if(hash_table) {
+ dup = test_and_add(s, *nb_lines, lines, hash_table, hash_table_size);
+ } else {
+ dup = -1;
+ }
+
+ if(dup < 0) {
+ lines[*nb_lines] = new char[strlen(s) + 1];
+ strcpy(lines[*nb_lines], s);
+ } else {
+ // The string was already in there, so we do not allocate a
+ // new string but use the pointer to the first occurence of it
+ lines[*nb_lines] = lines[dup];
+ lines[dup] = 0;
+ }
+
+ (*nb_lines)++;
+ }
+ }
+}
+
+//////////////////////////////////////////////////////////////////////
+
int main(int argc, char **argv) {
if(!ttyname(STDIN_FILENO)) {
exit(1);
}
- char buffer[buffer_size], raw_line[buffer_size];;
int color_fg_modeline, color_bg_modeline;
int color_fg_highlight, color_bg_highlight;
int i = 1;
int error = 0, show_help = 0;
+ int rest_are_files = 0;
- while(!error && !show_help && i < argc) {
+ while(!error && !show_help && i < argc && argv[i][0] == '-' && !rest_are_files) {
if(strcmp(argv[i], "-o") == 0) {
check_opt(argc, argv, i, 1, "<output filename>");
i++;
}
+ else if(strcmp(argv[i], "-a") == 0) {
+ case_sensitive = 1;
+ i++;
+ }
+
+ else if(strcmp(argv[i], "-t") == 0) {
+ check_opt(argc, argv, i, 1, "<title>");
+ delete[] title;
+ title = new char[strlen(argv[i+1]) + 1];
+ strcpy(title, argv[i+1]);
+ i += 2;
+ }
+
else if(strcmp(argv[i], "-l") == 0) {
check_opt(argc, argv, i, 1, "<maximum number of lines>");
- nb_lines_max = atoi(argv[i+1]);
+ nb_lines_max = string_to_positive_integer(argv[i+1]);
i += 2;
}
else if(strcmp(argv[i], "-c") == 0) {
check_opt(argc, argv, i, 4, "<fg modeline> <bg modeline> <fg highlight> <bg highlight>");
- color_fg_modeline = atoi(argv[i+1]);
- color_bg_modeline = atoi(argv[i+2]);
- color_fg_highlight = atoi(argv[i+3]);
- color_bg_highlight = atoi(argv[i+4]);
+ color_fg_modeline = string_to_positive_integer(argv[i + 1]);
+ color_bg_modeline = string_to_positive_integer(argv[i + 2]);
+ color_fg_highlight = string_to_positive_integer(argv[i + 3]);
+ color_bg_highlight = string_to_positive_integer(argv[i + 4]);
i += 5;
}
+ else if(strcmp(argv[i], "--") == 0) {
+ rest_are_files = 1;
+ i++;
+ }
+
else if(strcmp(argv[i], "-h") == 0) {
show_help = 1;
i++;
}
else {
- cerr << "Unknown argument " << argv[i] << "." << endl;
+ cerr << "Unknown option " << argv[i] << "." << endl;
error = 1;
}
}
<< "Written by Francois Fleuret <francois@fleuret.org>."
<< endl
<< endl
- << "Usage: " << argv[0] << " [options] -f <file>" << endl
+ << "Usage: " << argv[0] << " [options] [<filename1> [<filename2> ...]]" << endl
<< endl
<< " -h show this help" << endl
<< " -v inject the selected line in the tty" << endl
<< " -z remove the zsh history line prefix" << endl
<< " -i invert the order of lines" << endl
<< " -e start in regexp mode" << endl
+ << " -a case sensitive" << endl
<< " -m monochrome mode" << endl
+ << " -- rest of the arguments are filenames" << endl
+ << " -t <title>" << endl
+ << " add a title in the modeline" << endl
<< " -c <fg modeline> <bg modeline> <fg highlight> <bg highlight>" << endl
<< " set the display colors" << endl
<< " -o <output filename>" << endl
char **lines = new char *[nb_lines_max];
- if(!input_filename[0]) {
- cerr << "You must specify a input file with -f." << endl;
- exit(1);
- }
-
int nb_lines = 0;
-
- ifstream file(input_filename);
-
- if(file.fail()) {
- cerr << "Can not open " << input_filename << endl;
- return 1;
- }
-
int hash_table_size = nb_lines_max * 10;
int *hash_table = 0;
hash_table = new_hash_table(hash_table_size);
}
- while(nb_lines < nb_lines_max && !file.eof()) {
-
- file.getline(raw_line, buffer_size);
-
- if(file.fail()) {
- cerr << "Line too long." << endl;
- cerr << raw_line << endl;
- exit(1);
- }
-
- if(raw_line[0]) {
-
- char *s, *t;
- const char *u;
+ // if(i == argc && !input_filename[0]) {
+ // cerr << "You must provide a filename." << endl;
+ // exit(1);
+ // }
- s = buffer;
- t = raw_line;
- while(*t) {
- u = unctrl(*t++);
- while(*u) { *s++ = *u++; }
- }
- *s = '\0';
-
- s = buffer;
-
- if(zsh_history && *s == ':') {
- while(*s && *s != ';') s++;
- if(*s == ';') s++;
- }
-
- if(bash_history && (*s == ' ' || (*s >= '0' && *s <= '9'))) {
- while(*s == ' ' || (*s >= '0' && *s <= '9')) s++;
- }
-
- int dup;
-
- if(hash_table) {
- dup = test_and_add(s, nb_lines, lines, hash_table, hash_table_size);
- } else {
- dup = -1;
- }
-
- if(dup < 0) {
- lines[nb_lines] = new char[strlen(s) + 1];
- strcpy(lines[nb_lines], s);
- } else {
- // We do not allocate a new string but use the pointer to the
- // first occurence of it
- lines[nb_lines] = lines[dup];
- lines[dup] = 0;
- }
+ if(input_filename[0]) {
+ read_file(input_filename,
+ nb_lines_max, &nb_lines, lines,
+ hash_table_size, hash_table);
+ }
- nb_lines++;
- }
+ while(i < argc) {
+ read_file(argv[i],
+ nb_lines_max, &nb_lines, lines,
+ hash_table_size, hash_table);
+ i++;
}
delete[] hash_table;
lines[n++] = lines[k];
}
}
+
nb_lines = n;
if(inverse_order) {
- for(int i = 0; i < nb_lines/2; i++) {
+ for(int i = 0; i < nb_lines / 2; i++) {
char *s = lines[nb_lines - 1 - i];
lines[nb_lines - 1 - i] = lines[i];
lines[i] = s;
char pattern[buffer_size];
pattern[0] = '\0';
- int pattern_point;
- pattern_point = 0;
+ int cursor_position;
+ cursor_position = 0;
//////////////////////////////////////////////////////////////////////
// Here we start to display with curse
noecho();
// Hide the cursor
- curs_set(0);
+ // curs_set(0);
// So that the arrow keys work
keypad(stdscr, TRUE);
color_fg_highlight < 0 || color_bg_highlight >= COLORS ||
color_bg_highlight < 0 || color_bg_highlight >= COLORS) {
echo();
- curs_set(1);
+ // curs_set(1);
endwin();
cerr << "Color numbers have to be between 0 and " << COLORS - 1 << "." << endl;
exit(1);
}
- init_pair(1, color_fg_modeline, color_bg_modeline);
- init_pair(2, color_fg_highlight, color_bg_highlight);
+ init_pair(COLOR_MODELINE , color_fg_modeline, color_bg_modeline);
+ init_pair(COLOR_HIGHLIGHTED_LINE, color_fg_highlight, color_bg_highlight);
} else {
with_colors = 0;
}
int key;
int current_line = 0, temporary_line = 0;
- update_screen(¤t_line, &temporary_line, 0, nb_lines, lines, pattern);
+ update_screen(¤t_line, &temporary_line, 0, nb_lines, lines, cursor_position, pattern);
do {
int motion = 0;
- if(key >= ' ' && key <= '~') {
- pattern[pattern_point++] = key;
- pattern[pattern_point] = '\0';
+ if(key >= ' ' && key <= '~') { // Insert character
+ insert_char(pattern, &cursor_position, key);
}
- else if(key == KEY_BACKSPACE || key == '\b' || key == '\7f' ||
- key == KEY_DC || key == '\ 4') {
- if(pattern_point > 0) {
- pattern_point--;
- pattern[pattern_point] = '\0';
- }
+ else if(key == KEY_BACKSPACE ||
+ key == '\010' || // ^H
+ key == '\177') { // ^?
+ backspace_char(pattern, &cursor_position);
+ }
+
+ else if(key == KEY_DC ||
+ key == '\004') { // ^D
+ delete_char(pattern, &cursor_position);
}
else if(key == KEY_HOME) {
motion = -10;
}
- else if(key == KEY_DOWN || key == '\ e') {
+ else if(key == KEY_DOWN ||
+ key == '\016') { // ^N
motion = 1;
}
- else if(key == KEY_UP || key == '\10') {
+ else if(key == KEY_UP ||
+ key == '\020') { // ^P
motion = -1;
}
- else if(key == '\12') {
+ else if(key == KEY_LEFT ||
+ key == '\002') { // ^B
+ if(cursor_position > 0) cursor_position--;
+ }
+
+ else if(key == KEY_RIGHT ||
+ key == '\006') { // ^F
+ if(pattern[cursor_position]) cursor_position++;
+ }
+
+ else if(key == '\001') { // ^A
+ cursor_position = 0;
+ }
+
+ else if(key == '\005') { // ^E
+ cursor_position = strlen(pattern);
+ }
+
+ else if(key == '\022') { // ^R
use_regexp = !use_regexp;
}
- else if(key == '\15') {
- pattern_point = 0;
- pattern[pattern_point] = '\0';
+ else if(key == '\011') { // ^I
+ case_sensitive = !case_sensitive;
+ }
+
+ else if(key == '\025') { // ^U
+ kill_before_cursor(pattern, &cursor_position);
+ }
+
+ else if(key == '\013') { // ^K
+ kill_after_cursor(pattern, &cursor_position);
}
update_screen(¤t_line, &temporary_line, motion,
- nb_lines, lines, pattern);
+ nb_lines, lines, cursor_position, pattern);
- } while(key != '\n' && key != KEY_ENTER && key != '\a');
+ } while(key != '\n' && key != KEY_ENTER && key != '\007'); // ^G
echo();
- curs_set(1);
+ // curs_set(1);
endwin();
//////////////////////////////////////////////////////////////////////
}
out.flush();
}
-
+ } else {
+ cout << "Aborted." << endl;
}
for(int l = 0; l < nb_lines; l++) {
}
delete[] lines;
+ delete[] title;
exit(0);
}
projects / selector.git / blobdiff