*/
// 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 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;
int error_flash = 0;
#define COLOR_MODELINE 1
-#define COLOR_HIGHLIGHTED_LINE 2
+#define COLOR_FOCUS_LINE 2
+#define COLOR_ERROR 3
+
+int attr_modeline, attr_focus_line, attr_error;
//////////////////////////////////////////////////////////////////////
memset(&newtio, 0, sizeof(newtio));
// Set input mode (non-canonical, *no echo*,...)
tcsetattr(STDIN_FILENO, TCSANOW, &newtio);
- char control_q = '\021';
+ const char control_q = '\021';
// Put the selected string in the tty input buffer
- for(char *k = string; *k; k++) {
- if(add_control_qs) {
+ 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);
}
//////////////////////////////////////////////////////////////////////
-void update_screen(int *current_line, int *temporary_line, int motion,
+void update_screen(int *current_focus_line, int *temporary_line, int motion,
int nb_lines, char **lines,
int cursor_position,
char *pattern) {
int nb_printed_lines = 0;
- clear();
use_default_colors();
addstr("\n");
if(matcher.regexp_error) {
- addstr("[regexp error]");
+ attron(attr_error);
+ addnstr("Regexp syntax error", console_width);
+ attroff(attr_error);
} else if(nb_lines > 0) {
- int new_line;
- if(match(lines[*current_line], &matcher)) {
- new_line = *current_line;
+ int new_focus_line;
+ if(match(lines[*current_focus_line], &matcher)) {
+ new_focus_line = *current_focus_line;
} else {
- new_line = next_visible(*current_line, nb_lines, lines, &matcher);
- if(new_line < 0) {
- new_line = previous_visible(*current_line, nb_lines, lines, &matcher);
+ new_focus_line = next_visible(*current_focus_line, nb_lines, lines, &matcher);
+ if(new_focus_line < 0) {
+ new_focus_line = previous_visible(*current_focus_line, nb_lines, lines, &matcher);
}
}
// If we found a visible line and we should move, let's move
- if(new_line >= 0 && motion != 0) {
- int l = new_line;
+ if(new_focus_line >= 0 && motion != 0) {
+ int l = new_focus_line;
if(motion > 0) {
// We want to go down, let's find the first visible line below
for(int m = 0; l >= 0 && m < motion; m++) {
l = next_visible(l, nb_lines, lines, &matcher);
if(l >= 0) {
- new_line = l;
+ new_focus_line = l;
}
}
} else {
for(int m = 0; l >= 0 && m < -motion; m++) {
l = previous_visible(l, nb_lines, lines, &matcher);
if(l >= 0) {
- new_line = l;
+ new_focus_line = l;
}
}
}
}
- // Here new_line is either a line number matching the patterns, or -1
+ // Here new_focus_line is either a line number matching the patterns, or -1
- if(new_line >= 0) {
+ if(new_focus_line >= 0) {
- int first_line = new_line, last_line = new_line, nb_match = 1;
+ int first_line = new_focus_line, last_line = new_focus_line, nb_match = 1;
// We find the first and last line to show, so that the total of
// visible lines between them (them included) is console_height-1
// We fill the rest of the line with blanks if this is the
// highlighted line
- if(l == new_line) {
+ if(l == new_focus_line) {
while(k < console_width) {
buffer[k++] = ' ';
}
buffer[k++] = '\n';
buffer[k++] = '\0';
+ clrtoeol();
+
// Highlight the highlighted line ...
- if(l == new_line) {
- if(with_colors) {
- attron(COLOR_PAIR(COLOR_HIGHLIGHTED_LINE));
- addnstr(buffer, console_width);
- attroff(COLOR_PAIR(COLOR_HIGHLIGHTED_LINE));
- } else {
- attron(A_STANDOUT);
- addnstr(buffer, console_width);
- attroff(A_STANDOUT);
- }
+ if(l == new_focus_line) {
+ attron(attr_focus_line);
+ addnstr(buffer, console_width);
+ attroff(attr_focus_line);
} else {
addnstr(buffer, console_width);
}
}
if(motion != 0) {
- *current_line = new_line;
+ *current_focus_line = new_focus_line;
}
}
- *temporary_line = new_line;
+ *temporary_line = new_focus_line;
if(nb_printed_lines == 0) {
- addnstr("[no selection]\n", console_width);
+ attron(attr_error);
+ addnstr("No selection", console_width);
+ attroff(attr_error);
}
} else {
- addnstr("[empty choice]\n", console_width);
+ attron(attr_error);
+ addnstr("Empty choice", console_width);
+ attroff(attr_error);
}
+ clrtobot();
+
// Draw the modeline
move(0, 0);
- if(with_colors) {
- attron(COLOR_PAIR(COLOR_MODELINE));
- } else {
- attron(A_REVERSE);
- }
+ attron(attr_modeline);
for(int k = 0; k < console_width; k++) buffer[k] = ' ';
buffer[console_width] = '\0';
move(0, cursor_x);
- if(with_colors) {
- attroff(COLOR_PAIR(COLOR_MODELINE));
- } else {
- attroff(A_REVERSE);
- }
+ attroff(attr_modeline);
// We are done
<< endl
<< " -h show this help" << endl
<< " -v inject the selected line in the tty" << endl
+ << " -w quote control characters with ^Qs when using -v" << endl
<< " -d remove duplicated lines" << endl
<< " -b remove the bash history line prefix" << endl
<< " -z remove the zsh history line prefix" << 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
+ << " -- all following arguments are filenames" << endl
<< " -t <title>" << endl
<< " add a title in the modeline" << endl
<< " -c <fg modeline> <bg modeline> <fg highlight> <bg highlight>" << endl
char pattern[buffer_size];
pattern[0] = '\0';
+
int cursor_position;
cursor_position = 0;
// So that the arrow keys work
keypad(stdscr, TRUE);
- if(with_colors) {
+ attr_error = A_STANDOUT;
+ attr_modeline = A_REVERSE;
+ attr_focus_line = A_STANDOUT;
- if(has_colors()) {
+ if(with_colors && has_colors()) {
- start_color();
+ start_color();
- if(color_fg_modeline < 0 || color_fg_modeline >= COLORS ||
- color_bg_modeline < 0 || color_bg_modeline >= COLORS ||
- color_fg_highlight < 0 || color_bg_highlight >= COLORS ||
- color_bg_highlight < 0 || color_bg_highlight >= COLORS) {
- echo();
- endwin();
- cerr << "Color numbers have to be between 0 and " << COLORS - 1 << "." << endl;
- exit(1);
- }
+ if(color_fg_modeline < 0 || color_fg_modeline >= COLORS ||
+ color_bg_modeline < 0 || color_bg_modeline >= COLORS ||
+ color_fg_highlight < 0 || color_bg_highlight >= COLORS ||
+ color_bg_highlight < 0 || color_bg_highlight >= COLORS) {
+ echo();
+ endwin();
+ cerr << "Color numbers have to be between 0 and " << COLORS - 1 << "." << endl;
+ exit(1);
+ }
- init_pair(COLOR_MODELINE, color_fg_modeline, color_bg_modeline);
- init_pair(COLOR_HIGHLIGHTED_LINE, color_fg_highlight, color_bg_highlight);
+ init_pair(COLOR_MODELINE, color_fg_modeline, color_bg_modeline);
+ init_pair(COLOR_FOCUS_LINE, color_fg_highlight, color_bg_highlight);
+ init_pair(COLOR_ERROR, COLOR_WHITE, COLOR_RED);
+
+ attr_modeline = COLOR_PAIR(COLOR_MODELINE);
+ attr_focus_line = COLOR_PAIR(COLOR_FOCUS_LINE);
+ attr_error = COLOR_PAIR(COLOR_ERROR);
- } else {
- with_colors = 0;
- }
}
int key;
- int current_line = 0, temporary_line = 0;
+ int current_focus_line = 0, temporary_line = 0;
- update_screen(¤t_line, &temporary_line, 0, nb_lines, labels, cursor_position, pattern);
+ update_screen(¤t_focus_line, &temporary_line, 0,
+ nb_lines, labels, cursor_position, pattern);
do {
}
else if(key == KEY_HOME) {
- current_line = 0;
+ current_focus_line = 0;
}
else if(key == KEY_END) {
- current_line = nb_lines - 1;
+ current_focus_line = nb_lines - 1;
}
else if(key == KEY_NPAGE) {
kill_after_cursor(pattern, &cursor_position);
}
- update_screen(¤t_line, &temporary_line, motion,
+ else if(key == '\014') { // ^L
+ // I suspect that we may sometime mess up the display
+ clear();
+ }
+
+ update_screen(¤t_focus_line, &temporary_line, motion,
nb_lines, labels, cursor_position, pattern);
} while(key != '\007' && // ^G