// 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);
}
//////////////////////////////////////////////////////////////////////
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
}
}
- if(last_line < nb_lines - 1) {
+ if(nb_match < console_height - 1 && last_line < nb_lines - 1) {
last_line++;
while(last_line < nb_lines - 1 && !match(lines[last_line], nb_patterns, patterns)) {
last_line++;
*temporary_line = new_line;
- if(nb_printed_lines == 1) {
+ if(nb_printed_lines == 0) {
addnstr("[no selection]\n", console_width);
- nb_printed_lines++;
}
// Draw the modeline
sprintf(buffer, "%d/%d pattern: %s",
- nb_printed_lines - 1,
+ nb_printed_lines,
nb_lines,
pattern_list);
while(*s == ' ' || (*s >= '0' && *s <= '9')) s++;
}
- /*
-
- // This is supposed to remove any duplicates, not only
- // successive ones. However, it is O(N^2), we should use
- // hash-codes
-
- int keep = 1;
-
- if(remove_duplicates) {
- for(int k = 0; keep && k < nb_lines; k++) {
- keep &= strcmp(lines[k], s);
- }
- }
-
- if(keep) {
- 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);
patterns[patterns_point] = '\0';
}
- else if(key == KEY_BACKSPACE || key == '\b' ||
+ else if(key == KEY_BACKSPACE || key == '\b' || key == '\7f' ||
key == KEY_DC || key == '\ 4') {
if(patterns_point > 0) {
patterns_point--;