X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.cc;h=b84bd794d424f2c7bd7a7cd2317fae13ea406aef;hb=40e6ea9378f98eac922050a7fad1cc161fe291e5;hp=34ed86bbecc9ea42b511a22908758926ffbef8f9;hpb=35f5674e21b17ae2eaf8f0f8036d27477ef75dc1;p=selector.git
diff --git a/selector.cc b/selector.cc
index 34ed86b..b84bd79 100644
--- a/selector.cc
+++ b/selector.cc
@@ -1,143 +1,900 @@
-///////////////////////////////////////////////////////////////////////////
-// 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 for bash:
+// alias h='selector -d -i -b -v -f <(history)'
-#include
-#include
-#include
#include
+#include
+
+#include
+#include
#include
+#include
+#include
+#include
+#include
+#include
using namespace std;
-const int buffer_size = 1024;
-const int nb_lines_max = 100000;
+#define VERSION "1.0"
+
+const int buffer_size = 4096;
+
+// Yeah, global variables!
+
+int nb_lines_max = 1000;
+char pattern_separator = ';';
+int output_to_vt_buffer = 0;
+int with_colors = 1;
+int zsh_history = 0, bash_history = 0;
+int inverse_order = 0;
+int remove_duplicates = 0;
+int use_regexp = 0;
+int case_sensitive = 0;
+char *title = 0;
+
+//////////////////////////////////////////////////////////////////////
+
+void inject_into_tty_buffer(char *string) {
+ struct termios oldtio, newtio;
+ tcgetattr(STDIN_FILENO, &oldtio);
+ memset(&newtio, 0, sizeof(newtio));
+ // Set input mode (non-canonical, *no echo*,...)
+ tcsetattr(STDIN_FILENO, TCSANOW, &newtio);
+ // Put the selected string in the tty input buffer
+ for(char *k = string; *k; k++) {
+ ioctl(STDIN_FILENO, TIOCSTI, k);
+ }
+ // Restore the old settings
+ tcsetattr(STDIN_FILENO, TCSANOW, &oldtio);
+}
+
+//////////////////////////////////////////////////////////////////////
+
+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;
+ exit(1);
+ }
+}
+
+//////////////////////////////////////////////////////////////////////
+// A quick and dirty hash table
+
+// The table itself stores index of the strings in a char
+// **table. When a string is added, if it was already in the table,
+// the new index replaces the previous one.
+
+int *new_hash_table(int hash_table_size) {
+ int *result;
+ result = new int[hash_table_size];
+ for(int k = 0; k < hash_table_size; k++) {
+ result[k] = -1;
+ }
+ return result;
+}
+
+// Adds new_string in the table, associated to new_index. If this
+// string was not already in the table, returns -1. Otherwise, returns
+// the previous index it had.
+
+int test_and_add(char *new_string, int new_index,
+ char **strings, int *hash_table, int hash_table_size) {
+ unsigned int code = 0;
+
+ // This is my recipe. I checked, it seems to work (as long as
+ // hash_table_size is not a multiple of 387433 that should be okay)
+
+ for(int k = 0; new_string[k]; k++) {
+ code = code * 387433 + (unsigned int) (new_string[k]);
+ }
+
+ code = code % hash_table_size;
+
+ while(hash_table[code] >= 0) {
+ // There is a string with that code
+ if(strcmp(new_string, strings[hash_table[code]]) == 0) {
+ // It is the same string, we keep a copy of the stored index
+ int result = hash_table[code];
+ // Put the new one
+ hash_table[code] = new_index;
+ // And return the previous one
+ return result;
+ }
+ // This collision was not the same string, let's move to the next
+ // in the table
+ code = (code + 1) % hash_table_size;
+ }
+
+ // This string was not already in there, store the index in the
+ // table and return -1
+ hash_table[code] = new_index;
+ return -1;
+}
+
+//////////////////////////////////////////////////////////////////////
+// A matcher matches either with a collection of substrings, or with a
+// regexp
+
+struct matcher_t {
+ regex_t preg;
+ int regexp_error;
+ int nb_patterns;
+ int case_sensitive;
+ char *splitted_patterns, **patterns;
+};
+
+int match(char *string, matcher_t *matcher) {
+ if(matcher->nb_patterns >= 0) {
+ if(matcher->case_sensitive) {
+ for(int n = 0; n < matcher->nb_patterns; n++) {
+ if(strstr(string, matcher->patterns[n]) == 0) return 0;
+ }
+ } else {
+ for(int n = 0; n < matcher->nb_patterns; n++) {
+ if(strcasestr(string, matcher->patterns[n]) == 0) return 0;
+ }
+ }
+ return 1;
+ } else {
+ return regexec(&matcher->preg, string, 0, 0, 0) == 0;
+ }
+}
+
+void free_matcher(matcher_t *matcher) {
+ if(matcher->nb_patterns >= 0) {
+ delete[] matcher->splitted_patterns;
+ delete[] matcher->patterns;
+ } else {
+ if(!matcher->regexp_error) regfree(&matcher->preg);
+ }
+}
+
+void initialize_matcher(int use_regexp, int case_sensitive,
+ matcher_t *matcher, const char *pattern) {
+
+ if(use_regexp) {
+ matcher->nb_patterns = -1;
+ matcher->regexp_error = regcomp(&matcher->preg, pattern, case_sensitive ? 0 : REG_ICASE);
+ } else {
+ matcher->regexp_error = 0;
+ matcher->nb_patterns = 1;
+ matcher->case_sensitive = case_sensitive;
+
+ for(const char *s = pattern; *s; s++) {
+ if(*s == pattern_separator) {
+ matcher->nb_patterns++;
+ }
+ }
+
+ matcher->splitted_patterns = new char[strlen(pattern) + 1];
+ matcher->patterns = new char*[matcher->nb_patterns];
+
+ strcpy(matcher->splitted_patterns, pattern);
+
+ int n = 0;
+ char *last_pattern_start = matcher->splitted_patterns;
+ for(char *s = matcher->splitted_patterns; n < matcher->nb_patterns; s++) {
+ if(*s == pattern_separator || *s == '\0') {
+ *s = '\0';
+ matcher->patterns[n++] = last_pattern_start;
+ last_pattern_start = s + 1;
+ }
+ }
+ }
+}
+
+//////////////////////////////////////////////////////////////////////
+
+int previous_visible(int current_line, int nb_lines, char **lines, matcher_t *matcher) {
+ int line = current_line - 1;
+ while(line >= 0 && !match(lines[line], matcher)) line--;
+ return line;
+}
+
+int next_visible(int current_line, int nb_lines, char **lines, matcher_t *matcher) {
+ int line = current_line + 1;
+ while(line < nb_lines && !match(lines[line], matcher)) line++;
+
+ if(line < nb_lines)
+ return line;
+ else
+ return -1;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+void update_screen(int *current_line, int *temporary_line, int motion,
+ int nb_lines, char **lines,
+ int cursor_position,
+ char *pattern) {
-void build_display(int key, int nb_lines, char **lines, char *regexp) {
char buffer[buffer_size];
- clear(); // Cleaning the window
- refresh(); // After doing something on the display, we refresh it
- int maxx = getmaxx(stdscr);
- int maxy = getmaxy(stdscr);
+ matcher_t matcher;
+
+ initialize_matcher(use_regexp, case_sensitive, &matcher, pattern);
+
+ // We now take care of printing the lines per se
+
+ int console_width = getmaxx(stdscr);
+ int console_height = getmaxy(stdscr);
+
+ // First, we find a visible line. In priority: The current, or the
+ // first visible after it, or the first visible before it.
+
+ int nb_printed_lines = 0;
+
+ clear();
use_default_colors();
- // printw("maxx %d maxy %d key %d\n", maxx, maxy, key);
- printw("\n");
- printw("\n");
- int nb_printed_lines = 2;
- for(int y = 0; nb_printed_lines < maxy && y < nb_lines; y++) {
- if(strstr(lines[y], regexp)) {
- int k = 0;
- while(lines[y][k] && k < buffer_size - 2 && k < maxx) {
- buffer[k] = lines[y][k];
- k++;
- }
- buffer[k++] = '\n';
- buffer[k++] = '\0';
- printw(buffer);
- nb_printed_lines++;
+ addstr("\n");
+
+ if(matcher.regexp_error) {
+ addstr("[regexp error]");
+ } else if(nb_lines > 0) {
+ int new_line;
+ if(match(lines[*current_line], &matcher)) {
+ new_line = *current_line;
+ } else {
+ new_line = next_visible(*current_line, nb_lines, lines, &matcher);
+ if(new_line < 0) {
+ new_line = previous_visible(*current_line, nb_lines, lines, &matcher);
+ }
+ }
+
+ // If we found a visible line and we should move, let's move
+
+ if(new_line >= 0 && motion != 0) {
+ int l = new_line;
+ if(motion > 0) {
+ // We want to go down, let's find the first visible line below
+ for(int m = 0; l >= 0 && m < motion; m++) {
+ l = next_visible(l, nb_lines, lines, &matcher);
+ if(l >= 0) {
+ new_line = l;
+ }
+ }
+ } else {
+ // We want to go up, let's find the first visible line above
+ for(int m = 0; l >= 0 && m < -motion; m++) {
+ l = previous_visible(l, nb_lines, lines, &matcher);
+ if(l >= 0) {
+ new_line = l;
+ }
+ }
+ }
+ }
+
+ // 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], &matcher)) {
+ first_line--;
+ }
+ if(match(lines[first_line], &matcher)) {
+ nb_match++;
+ }
+ }
+
+ if(nb_match < console_height - 1 && last_line < nb_lines - 1) {
+ last_line++;
+ while(last_line < nb_lines - 1 && !match(lines[last_line], &matcher)) {
+ last_line++;
+ }
+
+ if(match(lines[last_line], &matcher)) {
+ nb_match++;
+ }
+ }
+ }
+
+ // Now we display them
+
+ for(int l = first_line; l <= last_line; l++) {
+ if(match(lines[l], &matcher)) {
+ int k = 0;
+
+ while(lines[l][k] && k < buffer_size - 2 && k < console_width - 2) {
+ buffer[k] = lines[l][k];
+ k++;
+ }
+
+ // We fill the rest of the line with blanks if either we did
+ // not clear() or if this is the highlighted line
+
+ if(l == new_line) {
+ while(k < console_width) {
+ buffer[k++] = ' ';
+ }
+ }
+
+ buffer[k++] = '\n';
+ buffer[k++] = '\0';
+
+ // Highlight the highlighted line ...
+
+ if(l == new_line) {
+ 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 {
+ addnstr(buffer, console_width);
+ }
+
+ nb_printed_lines++;
+ }
+ }
+
+ if(motion != 0) {
+ *current_line = new_line;
+ }
}
+
+ *temporary_line = new_line;
+
+ if(nb_printed_lines == 0) {
+ addnstr("[no selection]\n", console_width);
+ }
+ } else {
+ addnstr("[empty choice]\n", console_width);
}
+
+ // Draw the modeline
+
move(0, 0);
- attron(COLOR_PAIR(1)); // Let's print something in red on black
- printw("%d/%d pattern: %s\n", nb_printed_lines, nb_lines - 2, regexp);
- attroff(COLOR_PAIR(1)); // Let's get back to default colors!
+ if(with_colors) {
+ attron(COLOR_PAIR(1));
+ } else {
+ attron(A_REVERSE);
+ }
+
+ for(int k = 0; k < console_width; k++) buffer[k] = ' ';
+ buffer[console_width] = '\0';
+ addnstr(buffer, console_width);
+
+ move(0, 0);
+
+ if(title) {
+ addstr(title);
+ addstr(" ");
+ }
+
+ printw("%d/%d ", nb_printed_lines, nb_lines);
+
+ addnstr(pattern, cursor_position);
+
+ // Now we print the cursor. All that mess to have reverse video with
+ // and without color.
+
+ if(with_colors) {
+ attroff(COLOR_PAIR(1));
+ attron(COLOR_PAIR(3));
+ } else {
+ attroff(A_REVERSE);
+ }
+
+ if(pattern[cursor_position]) {
+ addnstr(&pattern[cursor_position], 1);
+ } else {
+ addstr(" ");
+ }
+
+ if(with_colors) {
+ attroff(COLOR_PAIR(3));
+ attron(COLOR_PAIR(1));
+ } else {
+ attron(A_REVERSE);
+ }
+
+ if(pattern[cursor_position]) {
+ addstr(pattern + cursor_position + 1);
+ }
+
+ // Finished printing the cursor
+
+ if(use_regexp) {
+ addstr(" [regexp]");
+ }
+
+ if(with_colors) {
+ attroff(COLOR_PAIR(1));
+ } else {
+ attroff(A_REVERSE);
+ }
+
+ // We are done
+
+ refresh();
+ free_matcher(&matcher);
}
-// I should find were this is defined ...
+//////////////////////////////////////////////////////////////////////
int main(int argc, char **argv) {
- int dummy, xpos, ypos;
- char buffer[buffer_size];
- char *lines[nb_lines_max];
+ if(!ttyname(STDIN_FILENO)) {
+ cerr << "The standard input is not a tty." << endl;
+ exit(1);
+ }
- ifstream file(argv[1]);
+ char buffer[buffer_size], raw_line[buffer_size];;
+ int color_fg_modeline, color_bg_modeline;
+ int color_fg_highlight, color_bg_highlight;
- if(argc != 2) {
- cerr << argv[0] << " " << endl;
- return 1;
+ 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, "");
+
+ int i = 1;
+ int error = 0, show_help = 0;
+
+ while(!error && !show_help && i < argc) {
+
+ if(strcmp(argv[i], "-o") == 0) {
+ check_opt(argc, argv, i, 1, "