*/
// To use it as a super-history-search for bash:
-// selector -q -b -i -d -v -w -l 10000 <(history)
+// selector -q -b -i -d -v -w -l ${HISTSIZE} <(history)
#include <fstream>
#include <iostream>
#include <stdio.h>
#include <stdlib.h>
+#include <unistd.h>
#include <string.h>
#include <ncurses.h>
#include <fcntl.h>
char *title = 0;
int error_flash = 0;
-#define COLOR_MODELINE 1
-#define COLOR_FOCUS_LINE 2
-#define COLOR_ERROR 3
-
int attr_modeline, attr_focus_line, attr_error;
//////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////
// A quick and dirty hash table
-// The table itself stores index of the strings in a char
+// The table itself stores indexes of the strings taken in a char
// **table. When a string is added, if it was already in the table,
// the new index replaces the previous one.
// the previous index it had.
int test_and_add(char *new_string, int new_index,
- char **strings, int *hash_table, int hash_table_size) {
+ char **strings,
+ int *hash_table, int hash_table_size) {
unsigned int code = 0;
//////////////////////////////////////////////////////////////////////
-void update_screen(int *current_focus_line, int *temporary_line, int motion,
+// The value passed to this routine in current_focus_line is the index
+// of the line we should have highlited if there was no motion and if
+// it matched the matcher. So, the line actually highlighted is the
+// first one matching the matcher in that order: (1)
+// current_focus_line after motion, (2) the first with a greater
+// index, (3) the first with a lesser index.
+
+// The index of the line actually shown highlighted is written in
+// displayed_focus_line (it can be -1)
+
+// If there is a motion and a line is actually shown highlighted, its
+// value is written in current_focus_line.
+
+void update_screen(int *current_focus_line, int *displayed_focus_line,
+ int motion,
int nb_lines, char **lines,
int cursor_position,
char *pattern) {
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.
+ // First, we find a visible line.
int nb_printed_lines = 0;
use_default_colors();
+
addstr("\n");
if(matcher.regexp_error) {
}
}
- // Here new_focus_line is either a line number matching the patterns, or -1
+ // Here new_focus_line is either a line number matching the pattern, or -1
if(new_focus_line >= 0) {
}
}
+ // If we are on a focused line and we moved, this become the new
+ // focus line
+
if(motion != 0) {
*current_focus_line = new_focus_line;
}
}
- *temporary_line = new_focus_line;
+ *displayed_focus_line = new_focus_line;
if(nb_printed_lines == 0) {
attron(attr_error);
// Here we start to display with curse
initscr();
-
+ cbreak();
noecho();
+ // nonl();
+ intrflush(stdscr, FALSE);
// So that the arrow keys work
keypad(stdscr, TRUE);
exit(1);
}
- init_pair(COLOR_MODELINE, color_fg_modeline, color_bg_modeline);
- init_pair(COLOR_FOCUS_LINE, color_fg_highlight, color_bg_highlight);
- init_pair(COLOR_ERROR, COLOR_WHITE, COLOR_RED);
+ init_pair(1, color_fg_modeline, color_bg_modeline);
+ attr_modeline = COLOR_PAIR(1);
+
+ init_pair(2, color_fg_highlight, color_bg_highlight);
+ attr_focus_line = COLOR_PAIR(2);
- attr_modeline = COLOR_PAIR(COLOR_MODELINE);
- attr_focus_line = COLOR_PAIR(COLOR_FOCUS_LINE);
- attr_error = COLOR_PAIR(COLOR_ERROR);
+ init_pair(3, COLOR_WHITE, COLOR_RED);
+ attr_error = COLOR_PAIR(3);
}
int key;
- int current_focus_line = 0, temporary_line = 0;
+ int current_focus_line = 0, displayed_focus_line = 0;
- update_screen(¤t_focus_line, &temporary_line, 0,
+ update_screen(¤t_focus_line, &displayed_focus_line,
+ 0,
nb_lines, labels, cursor_position, pattern);
do {
clear();
}
- update_screen(¤t_focus_line, &temporary_line, motion,
+ update_screen(¤t_focus_line, &displayed_focus_line,
+ motion,
nb_lines, labels, cursor_position, pattern);
} while(key != '\007' && // ^G
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]);
+ char *t;
+
+ if(displayed_focus_line >= 0 && displayed_focus_line < nb_lines) {
+ t = lines[displayed_focus_line];
+ if(label_separator) {
+ while(*t && *t != label_separator) t++;
+ if(*t) t++;
}
+ } else {
+ t = 0;
+ }
+
+ if(output_to_vt_buffer && t) {
+ inject_into_tty_buffer(t);
}
if(output_filename[0]) {
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;
+ if(t) {
+ out << t << endl;
} else {
out << endl;
}
}
out.flush();
}
+
} else {
cout << "Aborted." << endl;
}
projects / selector.git / blobdiff