*
*/
-// To use it as a super-history-search:
-// ./selector -v -f ${HISTFILE}
+// 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
#define VERSION "1.0"
+const int buffer_size = 1024;
+
// Yeah, global variables!
-int buffer_size = 1024;
int nb_lines_max = 10000;
char pattern_separator = ';';
int output_to_vt_buffer = 0;
int with_colors = 1;
-int zsh_history = 0;
+int zsh_history = 0, bash_history = 0;
+int inverse_order = 0;
//////////////////////////////////////////////////////////////////////
void inject_into_tty_buffer(char *line) {
char *tty = ttyname(STDIN_FILENO);
- int fd = open(tty, O_WRONLY);
+ int fd = open(tty, O_RDWR);
struct termios oldtio, newtio;
void update_screen(int *current_line, int *temporary_line, int motion,
int nb_lines, char **lines,
- char *pattern_list,
- int no_blink) {
+ char *pattern_list) {
char buffer[buffer_size];
}
}
- if(!no_blink) {
- clear();
- }
+ clear();
use_default_colors();
// We fill the rest of the line with blanks if either we did
// not clear() or if this is the highlighted line
- if(no_blink || l == new_line) {
+ if(l == new_line) {
while(k < console_width) {
buffer[k++] = ' ';
}
nb_printed_lines++;
}
- if(no_blink) { // Erase the rest of the window. That's slightly ugly.
- int k = 0;
- while(k < console_width) {
- buffer[k++] = ' ';
- }
- buffer[k++] = '\n';
- buffer[k++] = '\0';
- for(int l = nb_printed_lines; l < console_height; l++) {
- addnstr(buffer, console_width);
- }
- }
-
// Draw the modeline
sprintf(buffer, "%d/%d pattern: %s",
int main(int argc, char **argv) {
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;
- color_fg_modeline = COLOR_WHITE;
- color_bg_modeline = COLOR_BLACK;
+ 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, "");
- strcpy(output_filename, "/tmp/selector.out");
+ strcpy(output_filename, "");
int i = 1;
while(i < argc) {
+
if(strcmp(argv[i], "-o") == 0) {
check_opt(argc, argv, i, 1, "<output filename>");
strncpy(output_filename, argv[i+1], buffer_size);
i += 2;
}
- else if(strcmp(argv[i], "-b") == 0) {
- no_blink = 1;
+ else if(strcmp(argv[i], "-i") == 0) {
+ inverse_order = 1;
i++;
}
i++;
}
+ else if(strcmp(argv[i], "-b") == 0) {
+ bash_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]);
<< " [-v]"
<< " [-m]"
<< " [-z]"
+ << " [-i]"
<< " [-c <fg modeline> <bg modeline> <fg highlight> <bg highlight>]"
<< " [-o <output filename>]"
<< " [-s <pattern separator>]"
exit(1);
}
+ int nb_lines = 0;
+
ifstream file(input_filename);
if(file.fail()) {
return 1;
}
- int nb_lines = 0;
while(nb_lines < nb_lines_max && !file.eof()) {
file.getline(buffer, buffer_size);
- 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++;
+ if(strcmp(buffer, "") != 0) {
+ char *s = buffer;
+ if(zsh_history && *s == ':') {
+ while(*s && *s != ';') s++;
+ if(*s == ';') s++;
+ }
+
+ if(bash_history && (*s == ' ' || (*s >= '0' && *s <= '9'))) {
+ while(*s == ' ' || (*s >= '0' && *s <= '9')) s++;
+ }
+
+ lines[nb_lines] = new char[strlen(s) + 1];
+ strcpy(lines[nb_lines], s);
+ nb_lines++;
+ }
+ }
+
+ if(inverse_order) {
+ for(int i = 0; i < nb_lines/2; i++) {
+ char *s = lines[nb_lines - 1 - i];
+ lines[nb_lines - 1 - i] = lines[i];
+ lines[i] = s;
+ }
}
char patterns[buffer_size];
int key;
int current_line = 0, temporary_line = 0;
- update_screen(¤t_line, &temporary_line, 0, nb_lines, lines, patterns, no_blink);
+ update_screen(¤t_line, &temporary_line, 0, nb_lines, lines, patterns);
do {
patterns[patterns_point] = '\0';
}
- else if(key == KEY_BACKSPACE || key == KEY_DC || key == '\b') {
+ else if(key == KEY_BACKSPACE || key == '\b' ||
+ key == KEY_DC || key == '\ 4') {
if(patterns_point > 0) {
patterns_point--;
patterns[patterns_point] = '\0';
}
update_screen(¤t_line, &temporary_line, motion,
- nb_lines, lines, patterns, no_blink);
+ nb_lines, lines, patterns);
} while(key != '\n' && key != KEY_ENTER && key != '\a');
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]);
}
- } else {
+ }
+
+ if(output_filename[0]) {
ofstream out(output_filename);
if(out.fail()) {
cerr << "Can not open " << output_filename << " for writing." << endl;
}
out.flush();
}
+
}
for(int l = 0; l < nb_lines; l++) {