*/
// To use it as a super-history-search for bash:
-//
// alias h='selector -d -i -b -v -f <(history)'
-// This software is highly Linux-specific, but I would be glad to get
-// patches to make it work on other OS
-
#include <fstream>
#include <iostream>
#define VERSION "1.0"
-const int buffer_size = 1024;
+const int buffer_size = 4096;
// Yeah, global variables!
int inverse_order = 0;
int remove_duplicates = 0;
int use_regexp = 0;
+int case_sensitive = 0;
+char *title = 0;
//////////////////////////////////////////////////////////////////////
-// This looks severely Linux-only ...
-
-void inject_into_tty_buffer(char *line) {
+void inject_into_tty_buffer(char *string) {
struct termios oldtio, newtio;
- tcgetattr(STDIN_FILENO,&oldtio);
+ tcgetattr(STDIN_FILENO, &oldtio);
memset(&newtio, 0, sizeof(newtio));
// Set input mode (non-canonical, *no echo*,...)
tcsetattr(STDIN_FILENO, TCSANOW, &newtio);
- // Put the selected line in the tty input buffer
- for(char *k = line; *k; k++) {
+ // Put the selected string in the tty input buffer
+ for(char *k = string; *k; k++) {
ioctl(STDIN_FILENO, TIOCSTI, k);
}
// Restore the old settings
//////////////////////////////////////////////////////////////////////
// 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) {
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(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]" : "");
+ if(title) {
+ sprintf(buffer, "%s %d/%d pattern: %s%s",
+ title,
+ nb_printed_lines,
+ nb_lines,
+ pattern,
+ use_regexp ? " [regexp]" : "");
+ } else {
+ sprintf(buffer, "%d/%d pattern: %s%s",
+ nb_printed_lines,
+ nb_lines,
+ pattern,
+ use_regexp ? " [regexp]" : "");
+ }
for(int k = strlen(buffer); k < console_width; k++) buffer[k] = ' ';
buffer[console_width] = '\0';
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]);
<< "Usage: " << argv[0] << " [options] -f <file>" << endl
<< endl
<< " -h show this help" << endl
- << " -v inject the selection in the tty" << endl
- << " -m monochrome mode" << endl
+ << " -v inject the selected line in the tty" << endl
<< " -d remove duplicated lines" << endl
- << " -e regexp mode when starting" << endl
<< " -b remove the bash history line prefix" << endl
<< " -z remove the zsh history line prefix" << endl
- << " -i invert the line order" << endl
+ << " -i invert the order of lines" << endl
+ << " -e start in regexp mode" << endl
+ << " -a case sensitive" << endl
+ << " -m monochrome mode" << 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
file.getline(raw_line, buffer_size);
- if(strcmp(raw_line, "") != 0) {
+ if(raw_line[0]) {
+
+ if(file.fail()) {
+ cerr << "Line too long:" << endl;
+ cerr << raw_line << endl;
+ exit(1);
+ }
char *s, *t;
const char *u;
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
+ // 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;
}
}
delete[] lines;
+ delete[] title;
exit(0);
}
projects / selector.git / blobdiff