X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.cc;h=2990c7214bc881b4f2c81795e28322f03da0d0a3;hb=09b911cc2eb670c0abd47e58017de5d2c03010b7;hp=cc25520049171e9f67ecd4e6ffb2e954477034f2;hpb=fca0fb9a7bfb0c103501aaa8e00f7f8670693774;p=selector.git diff --git a/selector.cc b/selector.cc index cc25520..2990c72 100644 --- a/selector.cc +++ b/selector.cc @@ -1,57 +1,119 @@ -/////////////////////////////////////////////////////////////////////////// -// START_IP_HEADER // -// // -// This program is free software: you can redistribute it and/or modify // -// it under the terms of the version 3 of the GNU General Public License // -// as published by the Free Software Foundation. // -// // -// This program is distributed in the hope that it will be useful, but // -// WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // -// General Public License for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with this program. If not, see . // -// // -// Written by and Copyright (C) Francois Fleuret // -// Contact for comments & bug reports // -// // -// END_IP_HEADER // -/////////////////////////////////////////////////////////////////////////// +/* + * selector is a simple shell command for selection of strings with a + * dynamic pattern-matching. + * + * Copyright (c) 2009 Francois Fleuret + * Written by Francois Fleuret + * + * This file is part of selector. + * + * selector is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 3 as + * published by the Free Software Foundation. + * + * selector is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with selector. If not, see . + * + */ + +// 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 +// patches to make it work on other OS -#include -#include -#include #include -#include +#include + +#include #include +#include +#include +#include +#include +#include using namespace std; +#define VERSION "1.0" + +// Yeah, global variables! + int buffer_size = 1024; -int nb_lines_max = 100000; +int nb_lines_max = 10000; +char pattern_separator = ';'; +int output_to_vt_buffer = 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 match(char *string, char *regexp) { - return strstr(string, regexp) != 0; +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; + } + return 1; } +////////////////////////////////////////////////////////////////////// + void check_opt(int argc, char **argv, int n_opt, int n, const char *help) { if(n_opt + n >= argc) { - cerr << "Missing argument for " << argv[n_opt] << ". Expecting " << help << "." << endl; + cerr << "Missing argument for " << argv[n_opt] << "." + << " " + << "Expecting " << help << "." + << endl; exit(1); } } -int previous_visible(int current_line, int nb_lines, char **lines, char *regexp) { +////////////////////////////////////////////////////////////////////// + +int previous_visible(int current_line, int nb_lines, char **lines, int nb_patterns, char **patterns) { int line = current_line - 1; - while(line >= 0 && !match(lines[line], regexp)) line--; + while(line >= 0 && !match(lines[line], nb_patterns, patterns)) line--; return line; } -int next_visible(int current_line, int nb_lines, char **lines, char *regexp) { +int next_visible(int current_line, int nb_lines, char **lines, int nb_patterns, char **patterns) { int line = current_line + 1; - while(line < nb_lines && !match(lines[line], regexp)) line++; + while(line < nb_lines && !match(lines[line], nb_patterns, patterns)) line++; if(line < nb_lines) return line; @@ -59,27 +121,53 @@ int next_visible(int current_line, int nb_lines, char **lines, char *regexp) { return -1; } -void update_screen(int *current_line, int motion, +void update_screen(int *current_line, int *temporary_line, int motion, int nb_lines, char **lines, - char *regexp, int noblink) { + char *pattern_list, + int no_blink) { char buffer[buffer_size]; + // We split the pattern list into individual patterns + + int nb_patterns = 1; + + for(char *s = pattern_list; *s; s++) { + if(*s == pattern_separator) { + nb_patterns++; + } + } + + char splitted_patterns[strlen(pattern_list) + 1]; + char *patterns[nb_patterns]; + + strcpy(splitted_patterns, pattern_list); + + int n = 0; + char *last_pattern_start = splitted_patterns; + for(char *s = splitted_patterns; n < nb_patterns; s++) { + if(*s == pattern_separator || *s == '\0') { + *s = '\0'; + patterns[n++] = last_pattern_start; + last_pattern_start = s + 1; + } + } + + // We now take care of printing the lines per se + int console_width = getmaxx(stdscr); int console_height = getmaxy(stdscr); - int nb_printed_lines = 1, last_printer_line = -1; - // First, we find a visible line. In priority: The current, or the // first visible after it, or the first visible before it. int new_line; - if(match(lines[*current_line], regexp)) { + if(match(lines[*current_line], nb_patterns, patterns)) { new_line = *current_line; } else { - new_line = next_visible(*current_line, nb_lines, lines, regexp); + new_line = next_visible(*current_line, nb_lines, lines, nb_patterns, patterns); if(new_line < 0) { - new_line = previous_visible(*current_line, nb_lines, lines, regexp); + new_line = previous_visible(*current_line, nb_lines, lines, nb_patterns, patterns); } } @@ -87,24 +175,26 @@ void update_screen(int *current_line, int motion, if(new_line >= 0 && motion != 0) { int l = new_line; - l += motion; - if(motion > 0) { // We want to go down, let's find the first visible line below - l = next_visible(new_line, nb_lines, lines, regexp); - if(l >= 0) { - new_line = l; + for(int m = 0; l >= 0 && m < motion; m++) { + l = next_visible(l, nb_lines, lines, nb_patterns, patterns); + if(l >= 0) { + new_line = l; + } } } else { // We want to go up, let's find the first visible line above - l = previous_visible(new_line, nb_lines, lines, regexp); - if(l >= 0) { - new_line = l; + for(int m = 0; l >= 0 && m < -motion; m++) { + l = previous_visible(l, nb_lines, lines, nb_patterns, patterns); + if(l >= 0) { + new_line = l; + } } } } - if(!noblink) { + if(!no_blink) { clear(); } @@ -112,47 +202,57 @@ void update_screen(int *current_line, int motion, addstr("\n"); - // Here new_line is either a line number matching the regexp, or -1 + int nb_printed_lines = 1; + + // Here new_line is either a line number matching the patterns, or -1 if(new_line >= 0) { int first_line = new_line, last_line = new_line, nb_match = 1; + // We find the first and last line to show, so that the total of + // visible lines between them (them include) is console_height - 1 + while(nb_match < console_height-1 && (first_line > 0 || last_line < nb_lines - 1)) { if(first_line > 0) { first_line--; - while(first_line > 0 && !match(lines[first_line], regexp)) { + while(first_line > 0 && !match(lines[first_line], nb_patterns, patterns)) { first_line--; } - if(match(lines[first_line], regexp)) { + if(match(lines[first_line], nb_patterns, patterns)) { nb_match++; } } if(last_line < nb_lines - 1) { last_line++; - while(last_line < nb_lines - 1 && !match(lines[last_line], regexp)) { + while(last_line < nb_lines - 1 && !match(lines[last_line], nb_patterns, patterns)) { last_line++; } - if(match(lines[last_line], regexp)) { + if(match(lines[last_line], nb_patterns, patterns)) { nb_match++; } } } + // Now we display them + for(int l = first_line; l <= last_line; l++) { - if(match(lines[l], regexp)) { + if(match(lines[l], nb_patterns, patterns)) { int k = 0; - while(lines[l][k] && k < buffer_size - 2 && k < console_width - 1) { + while(lines[l][k] && k < buffer_size - 2 && k < console_width - 2) { buffer[k] = lines[l][k]; k++; } - if(noblink) { - while(k < console_width - 1) { + // 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) { + while(k < console_width) { buffer[k++] = ' '; } } @@ -160,15 +260,22 @@ void update_screen(int *current_line, int motion, buffer[k++] = '\n'; buffer[k++] = '\0'; + // Highlight the highlighted line ... + if(l == new_line) { - attron(COLOR_PAIR(2)); - addstr(buffer); - attroff(COLOR_PAIR(2)); + if(with_colors) { + attron(COLOR_PAIR(2)); + addnstr(buffer, console_width); + attroff(COLOR_PAIR(2)); + } else { + attron(A_STANDOUT); + addnstr(buffer, console_width); + attroff(A_STANDOUT); + } } else { - addstr(buffer); + addnstr(buffer, console_width); } - last_printer_line = l; nb_printed_lines++; } } @@ -178,38 +285,69 @@ void update_screen(int *current_line, int motion, } } - if(noblink) { // Erase the rest of the window. That's slightly ugly. + *temporary_line = new_line; + + if(nb_printed_lines == 1) { + addnstr("[no selection]\n", console_width); + nb_printed_lines++; + } + + if(no_blink) { // Erase the rest of the window. That's slightly ugly. int k = 0; - while(k < console_width - 1) { + while(k < console_width) { buffer[k++] = ' '; } buffer[k++] = '\n'; buffer[k++] = '\0'; for(int l = nb_printed_lines; l < console_height; l++) { - addstr(buffer); + addnstr(buffer, console_width); } } // Draw the modeline + sprintf(buffer, "%d/%d pattern: %s", + nb_printed_lines - 1, + nb_lines, + pattern_list); + + for(int k = strlen(buffer); k < console_width; k++) buffer[k] = ' '; + buffer[console_width] = '\0'; + move(0, 0); - attron(COLOR_PAIR(1)); - sprintf(buffer, "%d/%d pattern: %s", nb_printed_lines - 1, nb_lines, regexp); - for(int k = strlen(buffer); k < console_width - 1; k++) buffer[k] = ' '; - buffer[console_width-1] = '\0'; - addstr(buffer); - attroff(COLOR_PAIR(1)); - - refresh(); // After doing something on the display, we refresh it + if(with_colors) { + attron(COLOR_PAIR(1)); + addnstr(buffer, console_width); + attroff(COLOR_PAIR(1)); + } else { + attron(A_REVERSE); + addnstr(buffer, console_width); + attroff(A_REVERSE); + } + + // We are done + + refresh(); } +////////////////////////////////////////////////////////////////////// + int main(int argc, char **argv) { char buffer[buffer_size]; char *lines[nb_lines_max]; - int noblink = 1; + 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_highlight = COLOR_BLACK; + color_bg_highlight = COLOR_YELLOW; + + setlocale(LC_ALL, ""); char input_filename[buffer_size], output_filename[buffer_size]; - strcpy(input_filename, "/dev/stdin"); + strcpy(input_filename, ""); strcpy(output_filename, "/tmp/selector.out"); int i = 1; @@ -220,6 +358,22 @@ int main(int argc, char **argv) { i += 2; } + else if(strcmp(argv[i], "-s") == 0) { + check_opt(argc, argv, i, 1, ""); + pattern_separator = argv[i+1][0]; + i += 2; + } + + else if(strcmp(argv[i], "-v") == 0) { + output_to_vt_buffer = 1; + 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, ""); strncpy(input_filename, argv[i+1], buffer_size); @@ -227,7 +381,12 @@ int main(int argc, char **argv) { } else if(strcmp(argv[i], "-b") == 0) { - noblink = 1; + no_blink = 1; + i++; + } + + else if(strcmp(argv[i], "-z") == 0) { + zsh_history = 1; i++; } @@ -237,53 +396,99 @@ int main(int argc, char **argv) { 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 { - cerr << argv[0] << " [-o ] [-b] [-l " + << endl + << argv[0] + << " [-h]" + << " [-v]" + << " [-m]" + << " [-z]" + << " [-c ]" + << " [-o ]" + << " [-s ]" + << " [-l ]" + << " -f " + << endl; + if(strcmp(argv[i], "-h") == 0) { + exit(0); + } else { + exit(1); + } } } + if(!input_filename[0]) { + cerr << "You must specify a input file with -f." << endl; + exit(1); + } + ifstream file(input_filename); if(file.fail()) { - cerr << "Can not open \"" << input_filename << "\"" << endl; + cerr << "Can not open " << input_filename << endl; return 1; } 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 == ':') { + while(*s && *s != ';') s++; + if(*s == ';') s++; + } + lines[nb_lines] = new char[strlen(s) + 1]; + strcpy(lines[nb_lines], s); nb_lines++; } - char regexp[buffer_size]; - regexp[0] = '\0'; - int regexp_point; - regexp_point = 0; + char patterns[buffer_size]; + patterns[0] = '\0'; + int patterns_point; + patterns_point = 0; initscr(); - if(!has_colors()) { - cerr << "No colors." << endl; - return 1; + 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; + } } noecho(); - curs_set(0); - keypad(stdscr, TRUE); - - start_color(); - // init_pair(1, COLOR_WHITE, COLOR_BLACK); - init_pair(1, COLOR_WHITE, COLOR_GREEN); - init_pair(2, COLOR_BLACK, COLOR_YELLOW); + curs_set(0); // Hide the cursor + keypad(stdscr, TRUE); // So that the arrow keys work int key; + int current_line = 0, temporary_line = 0; - int line = 0; - - update_screen(&line, 0, nb_lines, lines, regexp, noblink); + update_screen(¤t_line, &temporary_line, 0, nb_lines, lines, patterns, no_blink); do { @@ -291,18 +496,34 @@ int main(int argc, char **argv) { int motion = 0; - if(key >= ' ' && key <= 'z') { - regexp[regexp_point++] = key; - regexp[regexp_point] = '\0'; + if(key >= ' ' && key <= '~') { + patterns[patterns_point++] = key; + patterns[patterns_point] = '\0'; } else if(key == KEY_BACKSPACE || key == KEY_DC || key == '') { - if(regexp_point > 0) { - regexp_point--; - regexp[regexp_point] = '\0'; + if(patterns_point > 0) { + patterns_point--; + patterns[patterns_point] = '\0'; } } + else if(key == KEY_HOME) { + current_line = 0; + } + + else if(key == KEY_END) { + current_line = nb_lines - 1; + } + + else if(key == KEY_NPAGE) { + motion = 10; + } + + else if(key == KEY_PPAGE) { + motion = -10; + } + else if(key == KEY_UP || key == '') { motion = -1; } @@ -311,24 +532,34 @@ int main(int argc, char **argv) { motion = 1; } - update_screen(&line, motion, nb_lines, lines, regexp, noblink); + update_screen(¤t_line, &temporary_line, motion, + nb_lines, lines, patterns, no_blink); + } while(key != '\n' && key != KEY_ENTER && key != ''); echo(); curs_set(1); endwin(); - ofstream out(output_filename); - if(out.fail()) { - cerr << "Can not open " << output_filename << " for writing." << endl; - exit(1); - } else { - if((key == KEY_ENTER || key == '\n') && line >= 0 && line < nb_lines) { - out << lines[line] << endl; + 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 { - out << endl; + ofstream out(output_filename); + if(out.fail()) { + cerr << "Can not open " << output_filename << " for writing." << endl; + exit(1); + } else { + if(temporary_line >= 0 && temporary_line < nb_lines) { + out << lines[temporary_line] << endl; + } else { + out << endl; + } + } + out.flush(); } - out.flush(); } for(int l = 0; l < nb_lines; l++) {