X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.cc;h=2990c7214bc881b4f2c81795e28322f03da0d0a3;hb=09b911cc2eb670c0abd47e58017de5d2c03010b7;hp=2664dd7768359fda1f39a66de46f1aa1a1c64a47;hpb=2e6257964d214b205e798891487f7d8489c7f406;p=selector.git
diff --git a/selector.cc b/selector.cc
index 2664dd7..2990c72 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
@@ -46,9 +46,41 @@ using namespace std;
// Yeah, global variables!
int buffer_size = 1024;
-int nb_lines_max = 1000;
+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);
+ }
+}
//////////////////////////////////////////////////////////////////////
@@ -126,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.
@@ -172,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) {
@@ -231,9 +263,15 @@ void update_screen(int *current_line, int *temporary_line, int motion,
// 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);
}
@@ -242,12 +280,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++;
@@ -276,9 +315,15 @@ 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
@@ -291,6 +336,15 @@ int main(int argc, char **argv) {
char buffer[buffer_size];
char *lines[nb_lines_max];
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, "");
@@ -315,6 +369,11 @@ int main(int argc, char **argv) {
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);
@@ -326,12 +385,26 @@ int main(int argc, char **argv) {
i++;
}
+ else if(strcmp(argv[i], "-z") == 0) {
+ zsh_history = 1;
+ i++;
+ }
+
else if(strcmp(argv[i], "-l") == 0) {
check_opt(argc, argv, i, 1, "");
nb_lines_max = 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 {
cerr << "Selector version " << VERSION
<< endl
@@ -339,8 +412,10 @@ int main(int argc, char **argv) {
<< endl
<< argv[0]
<< " [-h]"
- << " [-b]"
<< " [-v]"
+ << " [-m]"
+ << " [-z]"
+ << " [-c ]"
<< " [-o