*
*/
-// 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
int nb_lines_max = 10000;
char pattern_separator = ';';
int output_to_vt_buffer = 0;
-int with_colors = 0;
+int with_colors = 1;
+int zsh_history = 0;
+
+//////////////////////////////////////////////////////////////////////
+
+// This looks severely Linux-only ...
+
+void inject_into_tty_buffer(char *line) {
+ char *tty = ttyname(STDIN_FILENO);
+ int fd = open(tty, O_WRONLY);
+
+ struct termios oldtio, newtio;
+
+ if (fd >= 0) {
+ // Save current port settings
+ tcgetattr(fd,&oldtio);
+ memset(&newtio, 0, sizeof(newtio));
+ // Set input mode (non-canonical, *no echo*,...)
+ tcflush(fd, TCIFLUSH);
+ tcsetattr(fd,TCSANOW, &newtio);
+ // Put the selected line in the tty input buffer
+ for(char *k = line; *k; k++) {
+ ioctl(fd, TIOCSTI, k);
+ }
+ // Restore the old settings
+ tcsetattr(fd,TCSANOW, &oldtio);
+ close(fd);
+ } else {
+ cerr << "Can not open " << tty << "." << endl;
+ exit(1);
+ }
+}
//////////////////////////////////////////////////////////////////////
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 theme = 0;
+ int color_fg_modeline, color_bg_modeline;
+ int color_fg_highlight, color_bg_highlight;
+
+ color_fg_modeline = COLOR_WHITE;
+ color_bg_modeline = COLOR_BLACK;
+ color_fg_highlight = COLOR_BLACK;
+ color_bg_highlight = COLOR_YELLOW;
+
+ setlocale(LC_ALL, "");
char input_filename[buffer_size], output_filename[buffer_size];
strcpy(input_filename, "");
i++;
}
+ else if(strcmp(argv[i], "-m") == 0) {
+ with_colors = 0;
+ i++;
+ }
+
else if(strcmp(argv[i], "-f") == 0) {
check_opt(argc, argv, i, 1, "<input filename>");
strncpy(input_filename, argv[i+1], buffer_size);
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, 1, "<color theme number>");
- theme = atoi(argv[i+1]);
- i += 2;
+ 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]);
+ color_bg_highlight = atoi(argv[i+4]);
+ i += 5;
}
else {
<< endl
<< argv[0]
<< " [-h]"
- << " [-b]"
<< " [-v]"
- << " [-t <color theme number>]"
+ << " [-m]"
+ << " [-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++;
}
initscr();
- if(has_colors()) {
- with_colors = 1;
- start_color();
- switch(theme) {
- default:
- case 0:
- init_pair(1, COLOR_WHITE, COLOR_GREEN);
- init_pair(2, COLOR_BLACK, COLOR_YELLOW);
- break;
- case 1:
- init_pair(1, COLOR_BLACK, COLOR_GREEN);
- init_pair(2, COLOR_BLACK, COLOR_YELLOW);
- break;
+ if(with_colors) {
+ if(has_colors()) {
+ 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();
+ curs_set(1);
+ endwin();
+ cerr << "Color numbers have to be between 0 and " << COLORS - 1 << "." << endl;
+ exit(1);
+ }
+ init_pair(1, color_fg_modeline, color_bg_modeline);
+ init_pair(2, color_fg_highlight, color_bg_highlight);
+ } else {
+ with_colors = 0;
}
}
int motion = 0;
- if(key >= ' ' && key <= 'z') {
+ if(key >= ' ' && key <= '~') {
patterns[patterns_point++] = key;
patterns[patterns_point] = '\0';
}
update_screen(¤t_line, &temporary_line, motion,
nb_lines, lines, patterns, no_blink);
+
} while(key != '\n' && key != KEY_ENTER && key != '\a');
echo();
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) {
- char *tty = ttyname(STDIN_FILENO);
- int fd = open(tty, O_WRONLY);
-
- struct termios oldtio, newtio;
-
- if (fd >= 0) {
- // Save current port settings
- tcgetattr(fd,&oldtio);
- bzero(&newtio, sizeof(newtio));
- // Set input mode (non-canonical, *no echo*,...)
- tcflush(fd, TCIFLUSH);
- tcsetattr(fd,TCSANOW, &newtio);
- // Put the selected line in the tty input buffer
- for(char *k = lines[temporary_line]; *k; k++) {
- ioctl(fd, TIOCSTI, k);
- }
- // Restore the old settings
- tcsetattr(fd,TCSANOW, &oldtio);
- close(fd);
- } else {
- cerr << "Can not open " << tty << "." << endl;
- exit(1);
+ if(temporary_line >= 0 && temporary_line < nb_lines) {
+ inject_into_tty_buffer(lines[temporary_line]);
}
} else {
ofstream out(output_filename);
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();
}
delete[] lines[l];
}
- curs_set(1);
- endwin();
-
exit(0);
}