Fixed the control character bug (the returned line is not transformed
to printable characters) and added two options: -x to specify the
character to define the end of the label, and -w to add ^Q in between
characters when doing tty injection.
select the modeline and highlight color numbers
.IP "\fB-v\fP" 10
inject the selected line into the tty input buffer
select the modeline and highlight color numbers
.IP "\fB-v\fP" 10
inject the selected line into the tty input buffer
+.IP "\fB-w\fP" 10
+add ^Q between characters during tty injection to quote control characters
.IP "\fB-o <output filename>\fP" 10
write the selected line into the specified file
.IP "\fB-s <pattern separator>\fP" 10
specify the symbol to separate the substrings in the search pattern
.IP "\fB-o <output filename>\fP" 10
write the selected line into the specified file
.IP "\fB-s <pattern separator>\fP" 10
specify the symbol to separate the substrings in the search pattern
+.IP "\fB-x <label separator>\fP" 10
+specify the symbol to separate the label from the rest of the line
.IP "\fB-l <max number of lines>\fP" 10
specify the maximum number of lines to take into account
.IP "\fB-f <input filename>\fP" 10
.IP "\fB-l <max number of lines>\fP" 10
specify the maximum number of lines to take into account
.IP "\fB-f <input filename>\fP" 10
int nb_lines_max = 1000;
char pattern_separator = ';';
int nb_lines_max = 1000;
char pattern_separator = ';';
+char label_separator = '\0';
int output_to_vt_buffer = 0;
int output_to_vt_buffer = 0;
int with_colors = 1;
int zsh_history = 0, bash_history = 0;
int inverse_order = 0;
int with_colors = 1;
int zsh_history = 0, bash_history = 0;
int inverse_order = 0;
// Set input mode (non-canonical, *no echo*,...)
tcsetattr(STDIN_FILENO, TCSANOW, &newtio);
// Put the selected string in the tty input buffer
// Set input mode (non-canonical, *no echo*,...)
tcsetattr(STDIN_FILENO, TCSANOW, &newtio);
// Put the selected string in the tty input buffer
+ char control_q = '\021';
for(char *k = string; *k; k++) {
for(char *k = string; *k; k++) {
+ if(add_control_qs) {
+ ioctl(STDIN_FILENO, TIOCSTI, &control_q);
+ }
ioctl(STDIN_FILENO, TIOCSTI, k);
}
// Restore the old settings
ioctl(STDIN_FILENO, TIOCSTI, k);
}
// Restore the old settings
int nb_lines_max, int *nb_lines, char **lines,
int hash_table_size, int *hash_table) {
int nb_lines_max, int *nb_lines, char **lines,
int hash_table_size, int *hash_table) {
- char buffer[buffer_size], raw_line[buffer_size];;
+ char raw_line[buffer_size];;
ifstream file(input_filename);
ifstream file(input_filename);
- char *s, *t;
- const char *u;
t = raw_line;
// Remove the zsh history prefix
if(zsh_history && *t == ':') {
t = raw_line;
// Remove the zsh history prefix
if(zsh_history && *t == ':') {
- while(*t && *t != ';') s++;
+ while(*t && *t != ';') t++;
- // Copy the string while transforming the ctrl characters into
- // printable characters
-
- s = buffer;
-
- while(*t) {
- u = unctrl(*t++);
- while(*u) { *s++ = *u++; }
- }
- *s = '\0';
-
// Check for duplicates with the hash table and insert the line
// in the list if necessary
int dup;
if(hash_table) {
// Check for duplicates with the hash table and insert the line
// in the list if necessary
int dup;
if(hash_table) {
- dup = test_and_add(buffer, *nb_lines, lines, hash_table, hash_table_size);
+ dup = test_and_add(t, *nb_lines, lines, hash_table, hash_table_size);
} else {
dup = -1;
}
if(dup < 0) {
} else {
dup = -1;
}
if(dup < 0) {
- lines[*nb_lines] = new char[strlen(buffer) + 1];
- strcpy(lines[*nb_lines], buffer);
+ lines[*nb_lines] = new char[strlen(t) + 1];
+ strcpy(lines[*nb_lines], t);
} else {
// The string was already in there, so we do not allocate a
// new string but use the pointer to the first occurence of it
} else {
// The string was already in there, so we do not allocate a
// new string but use the pointer to the first occurence of it
+ else if(strcmp(argv[i], "-x") == 0) {
+ check_opt(argc, argv, i, 1, "<label separator>");
+ label_separator = argv[i+1][0];
+ i += 2;
+ }
+
else if(strcmp(argv[i], "-v") == 0) {
output_to_vt_buffer = 1;
i++;
}
else if(strcmp(argv[i], "-v") == 0) {
output_to_vt_buffer = 1;
i++;
}
+ else if(strcmp(argv[i], "-w") == 0) {
+ add_control_qs = 1;
+ i++;
+ }
+
else if(strcmp(argv[i], "-m") == 0) {
with_colors = 0;
i++;
else if(strcmp(argv[i], "-m") == 0) {
with_colors = 0;
i++;
<< " set a file to write the selected line to" << endl
<< " -s <pattern separator>" << endl
<< " set the symbol to separate substrings in the pattern" << endl
<< " set a file to write the selected line to" << endl
<< " -s <pattern separator>" << endl
<< " set the symbol to separate substrings in the pattern" << endl
+ << " -x <label separator>" << endl
+ << " set the symbol to terminate the label" << endl
<< " -l <max number of lines>" << endl
<< " set the maximum number of lines to take into account" << endl
<< endl;
<< " -l <max number of lines>" << endl
<< " set the maximum number of lines to take into account" << endl
<< endl;
+ // Build the labels from the strings, take only the part before the
+ // label_separator and transform control characters to printable
+ // ones
+
+ char **labels = new char *[nb_lines];
+ for(int l = 0; l < nb_lines; l++) {
+ char *s, *t;
+ const char *u;
+ t = lines[l];
+ int e = 0;
+ while(*t && *t != label_separator) {
+ u = unctrl(*t++);
+ e += strlen(u);
+ }
+ labels[l] = new char[e + 1];
+ t = lines[l];
+ s = labels[l];
+ while(*t && *t != label_separator) {
+ u = unctrl(*t++);
+ while(*u) { *s++ = *u++; }
+ }
+ *s = '\0';
+ }
+
char pattern[buffer_size];
pattern[0] = '\0';
int cursor_position;
char pattern[buffer_size];
pattern[0] = '\0';
int cursor_position;
int key;
int current_line = 0, temporary_line = 0;
int key;
int current_line = 0, temporary_line = 0;
- update_screen(¤t_line, &temporary_line, 0, nb_lines, lines, cursor_position, pattern);
+ update_screen(¤t_line, &temporary_line, 0, nb_lines, labels, cursor_position, pattern);
}
update_screen(¤t_line, &temporary_line, motion,
}
update_screen(¤t_line, &temporary_line, motion,
- nb_lines, lines, cursor_position, pattern);
+ nb_lines, labels, cursor_position, pattern);
} while(key != '\007' && // ^G
key != '\033' && // ^[ (escape)
} while(key != '\007' && // ^G
key != '\033' && // ^[ (escape)
for(int l = 0; l < nb_lines; l++) {
delete[] lines[l];
for(int l = 0; l < nb_lines; l++) {
delete[] lines[l];
delete[] lines;
delete[] title;
delete[] lines;
delete[] title;