*/
// 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 ${HISTSIZE} <(history)
-#include <fstream>
-#include <iostream>
+// #include <fstream>
+// #include <iostream>
#include <stdio.h>
#include <stdlib.h>
+#include <unistd.h>
#include <string.h>
#include <ncurses.h>
#include <fcntl.h>
#include <sys/ioctl.h>
#include <termios.h>
#include <regex.h>
+#include <locale.h>
using namespace std;
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;
int case_sensitive = 0;
char *title = 0;
+int error_flash = 0;
-#define COLOR_MODELINE 1
-#define COLOR_HIGHLIGHTED_LINE 2
+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);
+ 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 check_opt(int argc, char **argv, int n_opt, int n, const char *help) {
if(n_opt + n >= argc) {
- cerr << "Missing argument for " << argv[n_opt] << "."
- << " "
- << "Expecting " << help << "."
- << endl;
+ fprintf(stderr, "Missing argument for %s, expecting %s.\n",
+ argv[n_opt], help);
exit(1);
}
}
} else error = 1;
if(error) {
- cerr << "Value `" << string << "' is not a positive integer." << endl;
+ fprintf(stderr, "Value `%s' is not a positive integer.\n", string);
exit(1);
}
}
void error_feedback() {
- flash();
+ if(error_flash) {
+ flash();
+ } else {
+ beep();
+ }
}
//////////////////////////////////////////////////////////////////////
// A quick and dirty hash table
-// The table itself stores index of the strings in a char
+// The table itself stores indexes of the strings taken in a char
// **table. When a string is added, if it was already in the table,
// the new index replaces the previous one.
// the previous index it had.
int test_and_add(char *new_string, int new_index,
- char **strings, int *hash_table, int hash_table_size) {
+ 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);
}
}
//////////////////////////////////////////////////////////////////////
-void update_screen(int *current_line, int *temporary_line, int motion,
+// The value passed to this routine in current_focus_line is the index
+// of the line we should have highlited if there was no motion and if
+// it matched the matcher. So, the line actually highlighted is the
+// first one matching the matcher in that order: (1)
+// current_focus_line after motion, (2) the first with a greater
+// index, (3) the first with a lesser index.
+
+// The index of the line actually shown highlighted is written in
+// displayed_focus_line (it can be -1)
+
+// If there is a motion and a line is actually shown highlighted, its
+// value is written in current_focus_line.
+
+void update_screen(int *current_focus_line, int *displayed_focus_line,
+ int motion,
int nb_lines, char **lines,
int cursor_position,
char *pattern) {
initialize_matcher(use_regexp, case_sensitive, &matcher, pattern);
- // We now take care of printing the lines per se
-
int console_width = getmaxx(stdscr);
int console_height = getmaxy(stdscr);
- // First, we find a visible line. In priority: The current, or the
- // first visible after it, or the first visible before it.
+ // First, we find a visible line.
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 pattern, 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 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) {
+ 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 we are on a focused line and we moved, this become the new
+ // focus line
+
if(motion != 0) {
- *current_line = new_line;
+ *current_focus_line = new_focus_line;
}
}
- *temporary_line = new_line;
+ *displayed_focus_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
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);
+ FILE *file = fopen(input_filename, "r");
- if(file.fail()) {
- cerr << "Can not open " << input_filename << endl;
+ if(!file) {
+ fprintf(stderr, "Can not open `%s'.\n", input_filename);
exit(1);
}
- while(*nb_lines < nb_lines_max && !file.eof()) {
+ int start = 0, end = 0;
- file.getline(raw_line, buffer_size);
+ while(*nb_lines < nb_lines_max && (end > start || !feof(file))) {
+ int eol = start;
+ while(eol < end && raw_line[eol] != '\n') eol++;
- if(raw_line[0]) {
-
- if(file.fail()) {
- cerr << "Line too long:" << endl;
- cerr << raw_line << endl;
- exit(1);
+ if(eol == end) {
+ for(int k = 0; k < end - start; k++) {
+ raw_line[k] = raw_line[k + start];
}
+ end -= start;
+ eol -= start;
+ start = 0;
+ end += fread(raw_line + end, sizeof(char), buffer_size - end, file);
+ while(eol < end && raw_line[eol] != '\n') eol++;
+ }
- char *s, *t;
- const char *u;
+ if(eol == buffer_size) {
+ raw_line[buffer_size - 1] = '\0';
+ fprintf(stderr, "Line too long:\n");
+ fprintf(stderr, raw_line);
+ fprintf(stderr, "\n");
+ exit(1);
+ }
- s = buffer;
- t = raw_line;
- while(*t) {
- u = unctrl(*t++);
- while(*u) { *s++ = *u++; }
- }
- *s = '\0';
+ raw_line[eol] = '\0';
- s = buffer;
+ char *t = raw_line + start;
- if(zsh_history && *s == ':') {
- while(*s && *s != ';') s++;
- if(*s == ';') s++;
- }
+ // Remove the zsh history prefix
- if(bash_history && (*s == ' ' || (*s >= '0' && *s <= '9'))) {
- while(*s == ' ' || (*s >= '0' && *s <= '9')) s++;
- }
+ if(zsh_history && *t == ':') {
+ while(*t && *t != ';') t++;
+ if(*t == ';') t++;
+ }
- int dup;
+ // Remove the bash history prefix
- if(hash_table) {
- dup = test_and_add(s, *nb_lines, lines, hash_table, hash_table_size);
- } else {
- dup = -1;
- }
+ if(bash_history) {
+ while(*t == ' ') t++;
+ while(*t >= '0' && *t <= '9') t++;
+ while(*t == ' ') t++;
+ }
- if(dup < 0) {
- lines[*nb_lines] = new char[strlen(s) + 1];
- strcpy(lines[*nb_lines], s);
- } 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
- lines[*nb_lines] = lines[dup];
- lines[dup] = 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(t, *nb_lines, lines, hash_table, hash_table_size);
+ } else {
+ dup = -1;
+ }
- (*nb_lines)++;
+ if(dup < 0) {
+ 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
+ lines[*nb_lines] = lines[dup];
+ lines[dup] = 0;
}
+
+ (*nb_lines)++;
+
+ start = eol + 1;
}
}
int main(int argc, char **argv) {
if(!ttyname(STDIN_FILENO)) {
- cerr << "The standard input is not a tty." << endl;
+ fprintf(stderr, "The standard input is not a tty.\n");
exit(1);
}
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);
}
else {
- cerr << "Unknown option " << argv[i] << "." << endl;
+ fprintf(stderr, "Unknown option %s.\n", argv[i]);
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] [<filename1> [<filename2> ...]]" << endl
- << endl
- << " -h show this help" << endl
- << " -v inject the selected line in the tty" << endl
- << " -d remove duplicated lines" << endl
- << " -b remove the bash history line prefix" << endl
- << " -z remove the zsh history line prefix" << endl
- << " -i invert the order of lines" << endl
- << " -e start in regexp mode" << endl
- << " -a case sensitive" << endl
- << " -m monochrome mode" << endl
- << " -- rest of the arguments are filenames" << 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
- << " 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;
-
+ fprintf(stderr, "Selector version %s-R%s\n", VERSION, REVISION_NUMBER);
+ fprintf(stderr, "Written by Francois Fleuret <francois@fleuret.org>.\n");
+ fprintf(stderr, "Usage: %s [options] [<filename1> [<filename2> ...]]\n", argv[0]);
+ fprintf(stderr, "\n");
+ fprintf(stderr, " -h show this help\n");
+ fprintf(stderr, " -v inject the selected line in the tty\n");
+ fprintf(stderr, " -w quote control characters with ^Qs when using -v\n");
+ fprintf(stderr, " -d remove duplicated lines\n");
+ fprintf(stderr, " -b remove the bash history line prefix\n");
+ fprintf(stderr, " -z remove the zsh history line prefix\n");
+ fprintf(stderr, " -i invert the order of lines\n");
+ fprintf(stderr, " -e start in regexp mode\n");
+ fprintf(stderr, " -a start in case sensitive mode\n");
+ fprintf(stderr, " -m monochrome mode\n");
+ fprintf(stderr, " -q make a flash instead of a beep on an edition error\n");
+ fprintf(stderr, " -- all following arguments are filenames\n");
+ fprintf(stderr, " -t <title>\n");
+ fprintf(stderr, " add a title in the modeline\n");
+ fprintf(stderr, " -c <fg modeline> <bg modeline> <fg highlight> <bg highlight>\n");
+ fprintf(stderr, " set the display colors\n");
+ fprintf(stderr, " -o <output filename>\n");
+ fprintf(stderr, " set a file to write the selected line to\n");
+ fprintf(stderr, " -s <pattern separator>\n");
+ fprintf(stderr, " set the symbol to separate substrings in the pattern\n");
+ fprintf(stderr, " -x <label separator>\n");
+ fprintf(stderr, " set the symbol to terminate the label\n");
+ fprintf(stderr, " -l <max number of lines>\n");
+ fprintf(stderr, " set the maximum number of lines to take into account\n");
+ fprintf(stderr, "\n");
exit(error);
}
}
}
+ // 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;
// Here we start to display with curse
initscr();
-
+ cbreak();
noecho();
+ // nonl();
+ intrflush(stdscr, FALSE);
// 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();
+ fprintf(stderr, "Color numbers have to be between 0 and %d.\n", COLORS - 1);
+ 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(1, color_fg_modeline, color_bg_modeline);
+ attr_modeline = COLOR_PAIR(1);
+
+ init_pair(2, color_fg_highlight, color_bg_highlight);
+ attr_focus_line = COLOR_PAIR(2);
+
+ init_pair(3, COLOR_WHITE, COLOR_RED);
+ attr_error = COLOR_PAIR(3);
- } else {
- with_colors = 0;
- }
}
int key;
- int current_line = 0, temporary_line = 0;
+ int current_focus_line = 0, displayed_focus_line = 0;
- update_screen(¤t_line, &temporary_line, 0, nb_lines, lines, cursor_position, pattern);
+ update_screen(¤t_focus_line, &displayed_focus_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,
- nb_lines, lines, cursor_position, pattern);
+ else if(key == '\014') { // ^L
+ // I suspect that we may sometime mess up the display
+ clear();
+ }
+
+ update_screen(¤t_focus_line, &displayed_focus_line,
+ motion,
+ 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();
if((key == KEY_ENTER || key == '\n')) {
- if(output_to_vt_buffer) {
- if(temporary_line >= 0 && temporary_line < nb_lines) {
- inject_into_tty_buffer(lines[temporary_line]);
+ char *t;
+
+ if(displayed_focus_line >= 0 && displayed_focus_line < nb_lines) {
+ t = lines[displayed_focus_line];
+ if(label_separator) {
+ while(*t && *t != label_separator) t++;
+ if(*t) t++;
}
+ } else {
+ t = 0;
+ }
+
+ if(output_to_vt_buffer && t) {
+ inject_into_tty_buffer(t);
}
if(output_filename[0]) {
- ofstream out(output_filename);
- if(out.fail()) {
- cerr << "Can not open " << output_filename << " for writing." << endl;
- exit(1);
- } else {
- if(temporary_line >= 0 && temporary_line < nb_lines) {
- out << lines[temporary_line] << endl;
- } else {
- out << endl;
+ FILE *out = fopen(output_filename, "w");
+ if(out) {
+ if(t) {
+ fprintf(out, t);
}
+ fprintf(out, "\n");
+ } else {
+ fprintf(stderr, "Can not open %s for writing.\n", output_filename);
+ exit(1);
}
- out.flush();
+ fclose(out);
}
+
} else {
- cout << "Aborted." << endl;
+ printf("Aborted.\n");
}
for(int l = 0; l < nb_lines; l++) {
delete[] lines[l];
+ delete[] labels[l];
}
+ delete[] labels;
delete[] lines;
delete[] title;
projects / selector.git / blobdiff