X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.cc;h=f909ba03120653458ba5df5282c3e592d6fbb1da;hb=18b5fa3a68a27a487b77923604e9de05d6263bf7;hp=93a4611c6b59a66929fb7c09920301e7d910c2d2;hpb=1777ff299211ccf4ff4c71113bb92bd65f0e997c;p=selector.git diff --git a/selector.cc b/selector.cc index 93a4611..f909ba0 100644 --- a/selector.cc +++ b/selector.cc @@ -22,7 +22,7 @@ * */ -// 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 @@ -53,6 +53,36 @@ int with_colors = 1; ////////////////////////////////////////////////////////////////////// +// 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 match(char *string, int nb_patterns, char **patterns) { for(int n = 0; n < nb_patterns; n++) { if(strstr(string, patterns[n]) == 0) return 0; @@ -127,8 +157,6 @@ void update_screen(int *current_line, int *temporary_line, int motion, 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. @@ -173,6 +201,8 @@ void update_screen(int *current_line, int *temporary_line, int motion, addstr("\n"); + int nb_printed_lines = 1; + // Here new_line is either a line number matching the patterns, or -1 if(new_line >= 0) { @@ -249,12 +279,13 @@ void update_screen(int *current_line, int *temporary_line, int motion, } } - *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++; @@ -304,7 +335,15 @@ int main(int argc, char **argv) { 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, ""); @@ -351,10 +390,13 @@ int main(int argc, char **argv) { i += 2; } - else if(strcmp(argv[i], "-t") == 0) { - check_opt(argc, argv, i, 1, ""); - theme = atoi(argv[i+1]); - i += 2; + else if(strcmp(argv[i], "-c") == 0) { + check_opt(argc, argv, i, 4, " "); + 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 { @@ -364,10 +406,9 @@ int main(int argc, char **argv) { << endl << argv[0] << " [-h]" - << " [-b]" << " [-v]" << " [-m]" - << " [-t ]" + << " [-c ]" << " [-o ]" << " [-s ]" << " [-l ]" @@ -411,17 +452,18 @@ int main(int argc, char **argv) { if(with_colors) { if(has_colors()) { 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(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; } @@ -487,30 +529,10 @@ int main(int argc, char **argv) { 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); @@ -518,7 +540,11 @@ int main(int argc, char **argv) { 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(); }