*
*/
-// Here is how to use it as a super-history-search
+// To use it as a super-history-search:
// ./selector -v -f ${HISTFILE}
// This software is highly Linux-specific, but I would be glad to get
char pattern_separator = ';';
int output_to_vt_buffer = 0;
int with_colors = 1;
+int zsh_history = 0;
//////////////////////////////////////////////////////////////////////
-// This looks severly Linux-only ...
+// This looks severely Linux-only ...
void inject_into_tty_buffer(char *line) {
char *tty = ttyname(STDIN_FILENO);
int console_width = getmaxx(stdscr);
int console_height = getmaxy(stdscr);
- int nb_printed_lines = 1;
-
// First, we find a visible line. In priority: The current, or the
// first visible after it, or the first visible before it.
addstr("\n");
+ int nb_printed_lines = 1;
+
// Here new_line is either a line number matching the patterns, or -1
if(new_line >= 0) {
}
}
- *temporary_line = new_line;
if(motion != 0) {
*current_line = new_line;
}
}
+ *temporary_line = new_line;
+
if(nb_printed_lines == 1) {
addnstr("[no selection]\n", console_width);
nb_printed_lines++;
char buffer[buffer_size];
char *lines[nb_lines_max];
int no_blink = 0;
+ int color_fg_modeline, color_bg_modeline;
+ int color_fg_highlight, color_bg_highlight;
- int color_fg_modeline = COLOR_WHITE;
- int color_bg_modeline = COLOR_BLACK;
- int color_fg_highlight = COLOR_BLACK;
- int color_bg_highlight = COLOR_YELLOW;
+ color_fg_modeline = COLOR_WHITE;
+ color_bg_modeline = COLOR_BLACK;
+ color_fg_highlight = COLOR_BLACK;
+ color_bg_highlight = COLOR_YELLOW;
setlocale(LC_ALL, "");
i++;
}
+ else if(strcmp(argv[i], "-z") == 0) {
+ zsh_history = 1;
+ i++;
+ }
+
else if(strcmp(argv[i], "-l") == 0) {
check_opt(argc, argv, i, 1, "<maximum number of lines>");
nb_lines_max = atoi(argv[i+1]);
i += 2;
}
- else if(strcmp(argv[i], "-t") == 0) {
- check_opt(argc, argv, i, 4, "<color fg modeline> <color bg modeline> <color fg highlight> <color bg highlight>");
+ else if(strcmp(argv[i], "-c") == 0) {
+ check_opt(argc, argv, i, 4, "<fg modeline> <bg modeline> <fg highlight> <bg highlight>");
color_fg_modeline = atoi(argv[i+1]);
color_bg_modeline = atoi(argv[i+2]);
color_fg_highlight = atoi(argv[i+3]);
<< endl
<< argv[0]
<< " [-h]"
- << " [-b]"
<< " [-v]"
<< " [-m]"
- << " [-t <color fg modeline> <color bg modeline> <color fg highlight> <color bg highlight>]"
+ << " [-z]"
+ << " [-c <fg modeline> <bg modeline> <fg highlight> <bg highlight>]"
<< " [-o <output filename>]"
<< " [-s <pattern separator>]"
<< " [-l <max number of lines>]"
int nb_lines = 0;
while(nb_lines < nb_lines_max && !file.eof()) {
file.getline(buffer, buffer_size);
- lines[nb_lines] = new char[strlen(buffer) + 1];
- strcpy(lines[nb_lines], buffer);
+ char *s = buffer;
+ if(zsh_history && *s == ':') {
+ s++;
+ while(*s && *s != ';') s++;
+ if(*s == ';') s++;
+ }
+ lines[nb_lines] = new char[strlen(s) + 1];
+ strcpy(lines[nb_lines], s);
nb_lines++;
}
curs_set(1);
endwin();
- if((key == KEY_ENTER || key == '\n') && temporary_line >= 0 && temporary_line < nb_lines) {
+ if((key == KEY_ENTER || key == '\n')) {
if(output_to_vt_buffer) {
- inject_into_tty_buffer(lines[temporary_line]);
+ if(temporary_line >= 0 && temporary_line < nb_lines) {
+ inject_into_tty_buffer(lines[temporary_line]);
+ }
} else {
ofstream out(output_filename);
if(out.fail()) {
cerr << "Can not open " << output_filename << " for writing." << endl;
exit(1);
} else {
- out << lines[temporary_line] << endl;
+ if(temporary_line >= 0 && temporary_line < nb_lines) {
+ out << lines[temporary_line] << endl;
+ } else {
+ out << endl;
+ }
}
out.flush();
}