*/
// To use it as a super-history-search for bash:
-//
-// alias h='./selector -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
+// alias h='selector -d -i -b -v -f <(history)'
#include <fstream>
#include <iostream>
//////////////////////////////////////////////////////////////////////
-// 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
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
+ // hash_table_size is not a multiple of 387433 that should be okay)
+
for(int k = 0; new_string[k]; k++) {
- code += int(new_string[k]) << (8 * k%4);
+ code = code * 387433 + (unsigned int) (new_string[k]);
}
code = code % hash_table_size;
while(hash_table[code] >= 0) {
- if(strcmp(new_string, strings[hash_table[code]]) == 0) return 1;
+ if(strcmp(new_string, strings[hash_table[code]]) == 0) {
+ int result = hash_table[code];
+ hash_table[code] = new_index;
+ return result;
+ }
code = (code + 1) % hash_table_size;
}
hash_table[code] = new_index;
- return 0;
+ return -1;
}
//////////////////////////////////////////////////////////////////////
void update_screen(int *current_line, int *temporary_line, int motion,
int nb_lines, char **lines,
- char *pattern_list) {
+ char *pattern) {
char buffer[buffer_size];
matcher_t matcher;
- initialize_matcher(use_regexp, &matcher, pattern_list);
+ initialize_matcher(use_regexp, &matcher, pattern);
// We now take care of printing the lines per se
sprintf(buffer, "%d/%d pattern: %s%s",
nb_printed_lines,
nb_lines,
- pattern_list,
+ pattern,
use_regexp ? " [regexp]" : "");
for(int k = strlen(buffer); k < console_width; k++) buffer[k] = ' ';
//////////////////////////////////////////////////////////////////////
int main(int argc, char **argv) {
- char buffer[buffer_size];
+
+ if(!ttyname(STDIN_FILENO)) {
+ cerr << "The standard input is not a tty." << endl;
+ exit(1);
+ }
+
+ char buffer[buffer_size], raw_line[buffer_size];;
int color_fg_modeline, color_bg_modeline;
int color_fg_highlight, color_bg_highlight;
strcpy(output_filename, "");
int i = 1;
- while(i < argc) {
+ int error = 0, show_help = 0;
+
+ while(!error && !show_help && i < argc) {
if(strcmp(argv[i], "-o") == 0) {
check_opt(argc, argv, i, 1, "<output filename>");
i++;
}
- else if(strcmp(argv[i], "-z") == 0) {
- zsh_history = 1;
+ else if(strcmp(argv[i], "-b") == 0) {
+ bash_history = 1;
i++;
}
- else if(strcmp(argv[i], "-b") == 0) {
- bash_history = 1;
+ else if(strcmp(argv[i], "-z") == 0) {
+ zsh_history = 1;
i++;
}
i += 5;
}
+ else if(strcmp(argv[i], "-h") == 0) {
+ show_help = 1;
+ i++;
+ }
+
else {
- cerr << "Selector version " << VERSION
- << endl
- << "Written by Francois Fleuret <francois@fleuret.org>"
- << endl
- << argv[0]
- << " [-h]"
- << " [-v]"
- << " [-m]"
- << " [-d]"
- << " [-e]"
- << " [-z]"
- << " [-i]"
- << " [-c <fg modeline> <bg modeline> <fg highlight> <bg highlight>]"
- << " [-o <output filename>]"
- << " [-s <pattern separator>]"
- << " [-l <max number of lines>]"
- << " -f <input filename>"
- << endl;
- if(strcmp(argv[i], "-h") == 0) {
- exit(0);
- } else {
- exit(1);
- }
+ cerr << "Unknown argument " << argv[i] << "." << endl;
+ error = 1;
}
}
+ if(show_help || error) {
+ cerr << "Selector version " << VERSION << "-R" << REVISION_NUMBER
+ << endl
+ << "Written by Francois Fleuret <francois@fleuret.org>."
+ << endl
+ << endl
+ << "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
+ << " -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
+ << " -c <fg modeline> <bg modeline> <fg highlight> <bg highlight>" << endl
+ << " set the display colors" << endl
+ << " -o <output filename>" << 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
+ << " -l <max number of lines>" << endl
+ << " set the maximum number of lines to take into account" << endl
+ << endl;
+
+ exit(error);
+ }
+
char **lines = new char *[nb_lines_max];
if(!input_filename[0]) {
}
while(nb_lines < nb_lines_max && !file.eof()) {
- file.getline(buffer, buffer_size);
- if(strcmp(buffer, "") != 0) {
- char *s = buffer;
+
+ file.getline(raw_line, buffer_size);
+
+ if(strcmp(raw_line, "") != 0) {
+
+ 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++;
while(*s == ' ' || (*s >= '0' && *s <= '9')) s++;
}
- if(!hash_table || !test_and_add(s, nb_lines, lines, hash_table, hash_table_size)) {
+ 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);
- nb_lines++;
+ } 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;
}
+
+ nb_lines++;
}
}
delete[] hash_table;
+ // Now remove the null strings
+
+ int n = 0;
+ for(int k = 0; k < nb_lines; k++) {
+ if(lines[k]) {
+ lines[n++] = lines[k];
+ }
+ }
+ nb_lines = n;
+
if(inverse_order) {
for(int i = 0; i < nb_lines/2; i++) {
char *s = lines[nb_lines - 1 - i];
}
}
- char patterns[buffer_size];
- patterns[0] = '\0';
- int patterns_point;
- patterns_point = 0;
+ char pattern[buffer_size];
+ pattern[0] = '\0';
+ int pattern_point;
+ pattern_point = 0;
+
+ //////////////////////////////////////////////////////////////////////
+ // Here we start to display with curse
initscr();
+ noecho();
+
+ // Hide the cursor
+ curs_set(0);
+
+ // So that the arrow keys work
+ keypad(stdscr, TRUE);
+
if(with_colors) {
if(has_colors()) {
start_color();
}
}
- noecho();
- curs_set(0); // Hide the cursor
- keypad(stdscr, TRUE); // So that the arrow keys work
-
int key;
int current_line = 0, temporary_line = 0;
- update_screen(¤t_line, &temporary_line, 0, nb_lines, lines, patterns);
+ update_screen(¤t_line, &temporary_line, 0, nb_lines, lines, pattern);
do {
int motion = 0;
if(key >= ' ' && key <= '~') {
- patterns[patterns_point++] = key;
- patterns[patterns_point] = '\0';
+ pattern[pattern_point++] = key;
+ pattern[pattern_point] = '\0';
}
else if(key == KEY_BACKSPACE || key == '\b' || key == '\7f' ||
key == KEY_DC || key == '\ 4') {
- if(patterns_point > 0) {
- patterns_point--;
- patterns[patterns_point] = '\0';
+ if(pattern_point > 0) {
+ pattern_point--;
+ pattern[pattern_point] = '\0';
}
}
motion = -10;
}
+ else if(key == KEY_DOWN || key == '\ e') {
+ motion = 1;
+ }
+
else if(key == KEY_UP || key == '\10') {
motion = -1;
}
use_regexp = !use_regexp;
}
- else if(key == KEY_DOWN || key == '\ e') {
- motion = 1;
+ else if(key == '\15') {
+ pattern_point = 0;
+ pattern[pattern_point] = '\0';
}
update_screen(¤t_line, &temporary_line, motion,
- nb_lines, lines, patterns);
+ nb_lines, lines, pattern);
} while(key != '\n' && key != KEY_ENTER && key != '\a');
curs_set(1);
endwin();
+ //////////////////////////////////////////////////////////////////////
+ // Here we come back to standard display
+
if((key == KEY_ENTER || key == '\n')) {
if(output_to_vt_buffer) {