From 08270e13387994e72b20e123fed9e8b913fc6a0c Mon Sep 17 00:00:00 2001 From: Francois Fleuret Date: Fri, 13 Mar 2009 07:55:07 +0100 Subject: [PATCH] Moved the vt buffer injection to a separate function. Changed the way colors are chosen. Instead of a theme, each color can be set separately. --- selector.1 | 4 +- selector.cc | 108 ++++++++++++++++++++++++++-------------------------- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/selector.1 b/selector.1 index 03b1e03..91e1dc8 100644 --- a/selector.1 +++ b/selector.1 @@ -35,8 +35,8 @@ display help and exits inject the selected line into the tty input buffer .IP "\fB-m\fP" 10 force the monochrome mode -.IP "\fB-t \fP" 10 -select a color them +.IP "\fB-t \fP" 10 +select a color them; each color is a positive number .IP "\fB-o \fP" 10 write the selected line into the specified file .IP "\fB-s \fP" 10 diff --git a/selector.cc b/selector.cc index bec4ed3..f1e60c0 100644 --- a/selector.cc +++ b/selector.cc @@ -53,6 +53,36 @@ int with_colors = 1; ////////////////////////////////////////////////////////////////////// +// This looks severly 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; @@ -304,7 +334,11 @@ int main(int argc, char **argv) { char buffer[buffer_size]; char *lines[nb_lines_max]; int no_blink = 0; - int color_theme = 0; + + int color_fg_modeline = COLOR_WHITE; + int color_bg_modeline = COLOR_BLACK; + int color_fg_highlight = COLOR_BLACK; + int color_bg_highlight = COLOR_YELLOW; setlocale(LC_ALL, ""); @@ -354,9 +388,12 @@ int main(int argc, char **argv) { } else if(strcmp(argv[i], "-t") == 0) { - check_opt(argc, argv, i, 1, ""); - color_theme = atoi(argv[i+1]); - i += 2; + 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 { @@ -369,7 +406,7 @@ int main(int argc, char **argv) { << " [-b]" << " [-v]" << " [-m]" - << " [-t ]" + << " [-t ]" << " [-o ]" << " [-s ]" << " [-l ]" @@ -413,33 +450,18 @@ int main(int argc, char **argv) { if(with_colors) { if(has_colors()) { start_color(); - switch(color_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_WHITE, COLOR_BLACK); - init_pair(2, COLOR_BLACK, COLOR_YELLOW); - break; - case 2: - init_pair(1, COLOR_BLACK, COLOR_GREEN); - init_pair(2, COLOR_BLACK, COLOR_YELLOW); - break; - case 3: - init_pair(1, COLOR_BLACK, COLOR_RED); - init_pair(2, COLOR_BLACK, COLOR_YELLOW); - break; - case 4: - init_pair(1, COLOR_WHITE, COLOR_BLACK); - init_pair(2, COLOR_BLACK, COLOR_BLUE); - break; - case 5: - init_pair(1, COLOR_BLACK, COLOR_MAGENTA); - init_pair(2, COLOR_BLACK, COLOR_CYAN); - 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; } @@ -507,29 +529,7 @@ int main(int argc, char **argv) { if((key == KEY_ENTER || key == '\n') && temporary_line >= 0 && temporary_line < nb_lines) { 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); - 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 = 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); - } + inject_into_tty_buffer(lines[temporary_line]); } else { ofstream out(output_filename); if(out.fail()) { -- 2.39.5