// Yeah, global variables!
-int nb_lines_max = 10000;
+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;
//////////////////////////////////////////////////////////////////////
// This looks severely Linux-only ...
void inject_into_tty_buffer(char *line) {
- char *tty = ttyname(STDIN_FILENO);
- int fd = open(tty, O_RDWR);
-
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);
+ tcgetattr(STDIN_FILENO,&oldtio);
+ memset(&newtio, 0, sizeof(newtio));
+ // Set input mode (non-canonical, *no echo*,...)
+ tcsetattr(STDIN_FILENO,TCSANOW, &newtio);
+ // Put the selected line in the tty input buffer
+ for(char *k = line; *k; k++) {
+ ioctl(STDIN_FILENO, TIOCSTI, k);
}
+ // Restore the old settings
+ tcsetattr(STDIN_FILENO,TCSANOW, &oldtio);
}
//////////////////////////////////////////////////////////////////////
void update_screen(int *current_line, int *temporary_line, int motion,
int nb_lines, char **lines,
- char *pattern_list,
- int no_blink) {
+ char *pattern_list) {
char buffer[buffer_size];
}
}
- if(!no_blink) {
- clear();
- }
+ clear();
use_default_colors();
addstr("\n");
- int nb_printed_lines = 1;
+ int nb_printed_lines = 0;
// Here new_line is either a line number matching the patterns, or -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) {
+ if(l == new_line) {
while(k < console_width) {
buffer[k++] = ' ';
}
*temporary_line = new_line;
- if(nb_printed_lines == 1) {
+ if(nb_printed_lines == 0) {
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++] = ' ';
- }
- buffer[k++] = '\n';
- buffer[k++] = '\0';
- for(int l = nb_printed_lines; l < console_height; l++) {
- addnstr(buffer, console_width);
- }
}
// Draw the modeline
sprintf(buffer, "%d/%d pattern: %s",
- nb_printed_lines - 1,
+ nb_printed_lines,
nb_lines,
pattern_list);
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;
i += 2;
}
- // else if(strcmp(argv[i], "-b") == 0) {
- // no_blink = 1;
- // i++;
- // }
-
else if(strcmp(argv[i], "-i") == 0) {
inverse_order = 1;
i++;
i++;
}
+ else if(strcmp(argv[i], "-r") == 0) {
+ remove_duplicates = 1;
+ i++;
+ }
+
else if(strcmp(argv[i], "-l") == 0) {
check_opt(argc, argv, i, 1, "<maximum number of lines>");
nb_lines_max = atoi(argv[i+1]);
<< " [-h]"
<< " [-v]"
<< " [-m]"
+ << " [-r]"
<< " [-z]"
<< " [-i]"
<< " [-c <fg modeline> <bg modeline> <fg highlight> <bg highlight>]"
}
}
+ char **lines = new char *[nb_lines_max];
+
if(!input_filename[0]) {
cerr << "You must specify a input file with -f." << endl;
exit(1);
while(*s == ' ' || (*s >= '0' && *s <= '9')) s++;
}
- lines[nb_lines] = new char[strlen(s) + 1];
- strcpy(lines[nb_lines], s);
- nb_lines++;
+ if(!remove_duplicates || nb_lines == 0 || strcmp(lines[nb_lines - 1], s)) {
+ lines[nb_lines] = new char[strlen(s) + 1];
+ strcpy(lines[nb_lines], s);
+ nb_lines++;
+ }
}
}
int key;
int current_line = 0, temporary_line = 0;
- update_screen(¤t_line, &temporary_line, 0, nb_lines, lines, patterns, no_blink);
+ update_screen(¤t_line, &temporary_line, 0, nb_lines, lines, patterns);
do {
patterns[patterns_point] = '\0';
}
- else if(key == KEY_BACKSPACE || key == KEY_DC || key == '\b') {
+ else if(key == KEY_BACKSPACE || key == '\b' || key == '\7f' ||
+ key == KEY_DC || key == '\ 4') {
if(patterns_point > 0) {
patterns_point--;
patterns[patterns_point] = '\0';
}
update_screen(¤t_line, &temporary_line, motion,
- nb_lines, lines, patterns, no_blink);
+ nb_lines, lines, patterns);
} while(key != '\n' && key != KEY_ENTER && key != '\a');
endwin();
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]);
}
out.flush();
}
+
}
for(int l = 0; l < nb_lines; l++) {
delete[] lines[l];
}
+ delete[] lines;
exit(0);
}