*/
// 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 zsh_history = 0;
+int bash_history = 0;
int inverse_order = 0;
int remove_duplicates = 0;
int use_regexp = 0;
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
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
int nb_printed_lines = 0;
- clear();
use_default_colors();
addstr("\n");
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);
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;
t = raw_line;
// Remove the zsh history prefix
if(zsh_history && *t == ':') {
- while(*t && *t != ';') s++;
+ while(*t && *t != ';') t++;
if(*t == ';') t++;
}
// Remove the bash history prefix
- if(bash_history && (*t == ' ' || (*t >= '0' && *t <= '9'))) {
- while(*t == ' ' || (*t >= '0' && *t <= '9')) t++;
- }
-
- // Copy the string while transforming the ctrl characters into
- // printable characters
-
- s = buffer;
-
- while(*t) {
- u = unctrl(*t++);
- while(*u) { *s++ = *u++; }
+ if(bash_history) {
+ while(*t == ' ') t++;
+ while(*t >= '0' && *t <= '9') t++;
+ while(*t == ' ') t++;
}
- *s = '\0';
// 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(buffer, *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(buffer) + 1];
- strcpy(lines[*nb_lines], buffer);
+ 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], "-a") == 0) {
+ case_sensitive = 1;
+ i++;
}
else if(strcmp(argv[i], "-t") == 0) {
<< " 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;