X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=selector.cc;h=0884477098947454448470e22d9674f117f2d0eb;hb=b376894273ad07cae4489e3d219b8fef7cd00da7;hp=7d12606325eef1c1f98e796b000f0cb219fb34cc;hpb=38bc30a889d71f9520aebd772240a06e93f626a5;p=selector.git
diff --git a/selector.cc b/selector.cc
index 7d12606..0884477 100644
--- a/selector.cc
+++ b/selector.cc
@@ -1,50 +1,88 @@
-///////////////////////////////////////////////////////////////////////////
-// 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
- Here is the magical shell script for a smart bash-history. Note that
- the line remains in /tmp/selector.out, which may be a scurity concern.
-
- ./selector -f ~/.bash_history
- OLD_SETTINGS=`stty -g`
- stty -echo raw
- writevt `tty` "`cat /tmp/selector.out`"
- stty ${OLD_SETTINGS}
-
-*/
+#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, int nb_patterns, char **patterns) {
for(int n = 0; n < nb_patterns; n++) {
@@ -53,13 +91,20 @@ int match(char *string, int nb_patterns, char **patterns) {
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, int nb_patterns, char **patterns) {
int line = current_line - 1;
while(line >= 0 && !match(lines[line], nb_patterns, patterns)) line--;
@@ -79,7 +124,7 @@ int next_visible(int current_line, int nb_lines, char **lines, int nb_patterns,
void update_screen(int *current_line, int *temporary_line, int motion,
int nb_lines, char **lines,
char *pattern_list,
- int noblink) {
+ int no_blink) {
char buffer[buffer_size];
@@ -113,8 +158,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.
@@ -132,24 +175,26 @@ void update_screen(int *current_line, int *temporary_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, nb_patterns, patterns);
- 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, nb_patterns, patterns);
- 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();
}
@@ -157,6 +202,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) {
@@ -201,7 +248,10 @@ void update_screen(int *current_line, int *temporary_line, int motion,
k++;
}
- if(noblink || l == new_line) {
+ // 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++] = ' ';
}
@@ -210,10 +260,18 @@ void update_screen(int *current_line, int *temporary_line, int motion,
buffer[k++] = '\n';
buffer[k++] = '\0';
+ // Highlight the highlighted line ...
+
if(l == new_line) {
- attron(COLOR_PAIR(2));
- addnstr(buffer, console_width);
- 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 {
addnstr(buffer, console_width);
}
@@ -222,13 +280,19 @@ void update_screen(int *current_line, int *temporary_line, int motion,
}
}
- *temporary_line = new_line;
if(motion != 0) {
*current_line = new_line;
}
}
- 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) {
buffer[k++] = ' ';
@@ -251,11 +315,19 @@ void update_screen(int *current_line, int *temporary_line, int motion,
buffer[console_width] = '\0';
move(0, 0);
- attron(COLOR_PAIR(1));
- addnstr(buffer, console_width);
- attroff(COLOR_PAIR(1));
+ 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(); // After doing something on the display, we refresh it
+ refresh();
}
//////////////////////////////////////////////////////////////////////
@@ -263,10 +335,19 @@ void update_screen(int *current_line, int *temporary_line, int motion,
int main(int argc, char **argv) {
char buffer[buffer_size];
char *lines[nb_lines_max];
- int noblink = 0;
+ 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;
@@ -283,6 +364,16 @@ int main(int argc, char **argv) {
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);
@@ -290,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++;
}
@@ -300,8 +396,31 @@ 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] << " [-h] [-o