*/
// To use it as a super-history-search for bash:
-// alias h='selector -d -i -b -v -f <(history)'
+// selector -q -b -i -d -v -w -l 10000 <(history)
#include <fstream>
#include <iostream>
int nb_lines_max = 1000;
char pattern_separator = ';';
+char label_separator = '\0';
int output_to_vt_buffer = 0;
+int add_control_qs = 0;
int with_colors = 1;
int zsh_history = 0, bash_history = 0;
int inverse_order = 0;
int use_regexp = 0;
int case_sensitive = 0;
char *title = 0;
+int error_flash = 0;
#define COLOR_MODELINE 1
#define COLOR_HIGHLIGHTED_LINE 2
memset(&newtio, 0, sizeof(newtio));
// Set input mode (non-canonical, *no echo*,...)
tcsetattr(STDIN_FILENO, TCSANOW, &newtio);
+ const char control_q = '\021';
// Put the selected string in the tty input buffer
- for(char *k = string; *k; k++) {
+ for(const char *k = string; *k; k++) {
+ if(add_control_qs && !(*k >= ' ' && *k <= '~')) {
+ // Add ^Q to quote control characters
+ ioctl(STDIN_FILENO, TIOCSTI, &control_q);
+ }
ioctl(STDIN_FILENO, TIOCSTI, k);
}
// Restore the old settings
}
void error_feedback() {
- flash();
+ if(error_flash) {
+ flash();
+ } else {
+ beep();
+ }
}
//////////////////////////////////////////////////////////////////////
int test_and_add(char *new_string, int new_index,
char **strings, int *hash_table, int hash_table_size) {
+
unsigned int code = 0;
// This is my recipe. I checked, it seems to work (as long as
}
void free_matcher(matcher_t *matcher) {
- if(matcher->nb_patterns >= 0) {
+ if(matcher->nb_patterns < 0) {
+ if(!matcher->regexp_error) regfree(&matcher->preg);
+ } else {
delete[] matcher->splitted_patterns;
delete[] matcher->patterns;
- } else {
- if(!matcher->regexp_error) regfree(&matcher->preg);
}
}
int nb_printed_lines = 0;
- clear();
use_default_colors();
addstr("\n");
int first_line = new_line, last_line = new_line, nb_match = 1;
// We find the first and last line to show, so that the total of
- // visible lines between them (them include) is console_height - 1
+ // visible lines between them (them included) is console_height-1
while(nb_match < console_height-1 && (first_line > 0 || last_line < nb_lines - 1)) {
k++;
}
- // We fill the rest of the line with blanks if either we did
- // not clear() or if this is the highlighted line
+ // We fill the rest of the line with blanks if this is the
+ // highlighted line
if(l == new_line) {
while(k < console_width) {
buffer[k++] = '\n';
buffer[k++] = '\0';
+ clrtoeol();
+
// Highlight the highlighted line ...
if(l == new_line) {
addnstr("[empty choice]\n", console_width);
}
+ clrtobot();
+
// Draw the modeline
move(0, 0);
}
if(use_regexp || case_sensitive) {
- addstr("[");
+ addstr(" [");
if(use_regexp) {
addstr("regexp");
}
int nb_lines_max, int *nb_lines, char **lines,
int hash_table_size, int *hash_table) {
- char buffer[buffer_size], raw_line[buffer_size];;
+ char raw_line[buffer_size];;
ifstream file(input_filename);
exit(1);
}
- char *s, *t;
- const char *u;
+ char *t;
- s = buffer;
t = raw_line;
- while(*t) {
- u = unctrl(*t++);
- while(*u) { *s++ = *u++; }
- }
- *s = '\0';
- s = buffer;
+ // Remove the zsh history prefix
- if(zsh_history && *s == ':') {
- while(*s && *s != ';') s++;
- if(*s == ';') s++;
+ if(zsh_history && *t == ':') {
+ while(*t && *t != ';') t++;
+ if(*t == ';') t++;
}
- if(bash_history && (*s == ' ' || (*s >= '0' && *s <= '9'))) {
- while(*s == ' ' || (*s >= '0' && *s <= '9')) s++;
+ // Remove the bash history prefix
+
+ if(bash_history) {
+ while(*t == ' ') t++;
+ while(*t >= '0' && *t <= '9') t++;
+ while(*t == ' ') t++;
}
+ // Check for duplicates with the hash table and insert the line
+ // in the list if necessary
+
int dup;
if(hash_table) {
- dup = test_and_add(s, *nb_lines, lines, hash_table, hash_table_size);
+ dup = test_and_add(t, *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);
+ lines[*nb_lines] = new char[strlen(t) + 1];
+ strcpy(lines[*nb_lines], t);
} 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
i += 2;
}
+ else if(strcmp(argv[i], "-x") == 0) {
+ check_opt(argc, argv, i, 1, "<label separator>");
+ label_separator = argv[i+1][0];
+ i += 2;
+ }
+
else if(strcmp(argv[i], "-v") == 0) {
output_to_vt_buffer = 1;
i++;
}
+ else if(strcmp(argv[i], "-w") == 0) {
+ add_control_qs = 1;
+ i++;
+ }
+
else if(strcmp(argv[i], "-m") == 0) {
with_colors = 0;
i++;
}
+ else if(strcmp(argv[i], "-q") == 0) {
+ error_flash = 1;
+ i++;
+ }
+
else if(strcmp(argv[i], "-f") == 0) {
check_opt(argc, argv, i, 1, "<input filename>");
strncpy(input_filename, argv[i+1], buffer_size);
<< " -e start in regexp mode" << endl
<< " -a case sensitive" << endl
<< " -m monochrome mode" << endl
+ << " -q make a flash instead of a beep on an edition error" << endl
<< " -- rest of the arguments are filenames" << endl
<< " -t <title>" << endl
<< " add a title in the modeline" << endl
<< " set a file to write the selected line to" << endl
<< " -s <pattern separator>" << endl
<< " set the symbol to separate substrings in the pattern" << endl
+ << " -x <label separator>" << endl
+ << " set the symbol to terminate the label" << endl
<< " -l <max number of lines>" << endl
<< " set the maximum number of lines to take into account" << endl
<< endl;
}
}
+ // Build the labels from the strings, take only the part before the
+ // label_separator and transform control characters to printable
+ // ones
+
+ char **labels = new char *[nb_lines];
+ for(int l = 0; l < nb_lines; l++) {
+ char *s, *t;
+ const char *u;
+ t = lines[l];
+ int e = 0;
+ while(*t && *t != label_separator) {
+ u = unctrl(*t++);
+ e += strlen(u);
+ }
+ labels[l] = new char[e + 1];
+ t = lines[l];
+ s = labels[l];
+ while(*t && *t != label_separator) {
+ u = unctrl(*t++);
+ while(*u) { *s++ = *u++; }
+ }
+ *s = '\0';
+ }
+
char pattern[buffer_size];
pattern[0] = '\0';
+
int cursor_position;
cursor_position = 0;
int key;
int current_line = 0, temporary_line = 0;
- update_screen(¤t_line, &temporary_line, 0, nb_lines, lines, cursor_position, pattern);
+ update_screen(¤t_line, &temporary_line, 0,
+ nb_lines, labels, cursor_position, pattern);
do {
kill_after_cursor(pattern, &cursor_position);
}
+ else if(key == '\014') { // ^L
+ // I suspect that we may sometime mess up the display
+ clear();
+ }
+
update_screen(¤t_line, &temporary_line, motion,
- nb_lines, lines, cursor_position, pattern);
+ nb_lines, labels, cursor_position, pattern);
- } while(key != '\n' && key != KEY_ENTER && key != '\007'); // ^G
+ } while(key != '\007' && // ^G
+ key != '\033' && // ^[ (escape)
+ key != '\n' &&
+ key != KEY_ENTER);
echo();
endwin();
for(int l = 0; l < nb_lines; l++) {
delete[] lines[l];
+ delete[] labels[l];
}
+ delete[] labels;
delete[] lines;
delete[] title;
projects / selector.git / blobdiff