* selector is a simple command line utility for selection of strings
* with a dynamic pattern-matching.
*
- * Copyright (c) 2009 Francois Fleuret
+ * Copyright (c) 2009-2015 Francois Fleuret
* Written by Francois Fleuret <francois@fleuret.org>
*
* This file is part of selector.
/*
To use it as a super-history-search for bash:
- selector -q -b -i -d -v -w -l ${HISTSIZE} <(history)
+ selector --bash <(history)
*/
#include <stdio.h>
#include <stdlib.h>
+#include <sys/stat.h>
#include <unistd.h>
#include <string.h>
+#include <errno.h>
#include <ncurses.h>
#include <fcntl.h>
#include <sys/ioctl.h>
#include <termios.h>
#include <regex.h>
#include <locale.h>
+#include <getopt.h>
+#include <limits.h>
-#define VERSION "1.0"
+#define VERSION "1.1.8"
-const int buffer_size = 4096;
+#define BUFFER_SIZE 16384
/* Yeah, global variables! */
-int nb_lines_max = 1000;
-char pattern_separator = ';';
-char label_separator = '\0';
-int output_to_vt_buffer = 0;
-int add_control_qs = 0;
-int with_colors = 1;
-int zsh_history = 0;
-int bash_history = 0;
-int inverse_order = 0;
-int remove_duplicates = 0;
-int use_regexp = 0;
-int case_sensitive = 0;
-char *title = 0;
-int error_flash = 0;
-
-int attr_modeline, attr_focus_line, attr_error;
+int global_nb_lines_max = 1000;
+char global_pattern_separator = ';';
+char global_label_separator = '\0';
+int global_output_to_vt_buffer = 0;
+int global_add_control_qs = 0;
+int global_with_colors = 1;
+int global_zsh_history = 0;
+int global_bash_history = 0;
+int global_inverse_order = 0;
+int global_remove_duplicates = 0;
+int global_use_regexp = 0;
+int global_case_sensitive = 0;
+char *global_title = 0;
+regex_t *global_prefix_regexp = 0;
+int global_error_flash = 0;
+int global_upper_caps_makes_case_sensitive = 0;
+int global_show_long_lines = 0;
+int global_show_hits = 0;
+
+int global_attr_modeline, global_attr_focus_line, global_attr_error, global_attr_hits;
+
+/********************************************************************/
+
+/* malloc with error checking. */
+
+void *safe_malloc(size_t n) {
+ void *p = malloc(n);
+ if(!p && n != 0) {
+ fprintf(stderr,
+ "selector: cannot allocate memory: %s\n", strerror(errno));
+ exit(EXIT_FAILURE);
+ }
+ return p;
+}
/*********************************************************************/
-void inject_into_tty_buffer(char *string) {
+void inject_into_tty_buffer(char *string, int add_control_qs) {
struct termios oldtio, newtio;
const char *k;
+ const char control_q = '\021';
tcgetattr(STDIN_FILENO, &oldtio);
memset(&newtio, 0, sizeof(newtio));
/* Set input mode (non-canonical, *no echo*,...) */
tcsetattr(STDIN_FILENO, TCSANOW, &newtio);
- const char control_q = '\021';
/* Put the selected string in the tty input buffer */
for(k = string; *k; k++) {
if(add_control_qs && !(*k >= ' ' && *k <= '~')) {
/*********************************************************************/
-void check_opt(int argc, char **argv, int n_opt, int n, const char *help) {
- if(n_opt + n >= argc) {
- fprintf(stderr, "Missing argument for %s, expecting %s.\n",
- argv[n_opt], help);
- exit(1);
- }
-}
-
-int string_to_positive_integer(char *string) {
- int error = 0;
- int result = 0;
+void str_to_positive_integers(char *string, int *values, int nb) {
+ int current_value, got_one;
char *s;
+ int n;
- if(*string) {
- for(s = string; *s; s++) {
- if(*s >= '0' && *s <= '9') {
- result = result * 10 + (int) (*s - '0');
- } else error = 1;
+ n = 0;
+ current_value = 0;
+ got_one = 0;
+ s = string;
+
+ while(1) {
+ if(*s >= '0' && *s <= '9') {
+ current_value = current_value * 10 + (int) (*s - '0');
+ got_one = 1;
+ } else if(*s == ',' || *s == '\0') {
+ if(got_one) {
+ if(n < nb) {
+ values[n++] = current_value;
+ if(*s == '\0') {
+ if(n == nb) {
+ return;
+ } else {
+ fprintf(stderr,
+ "selector: Missing value in `%s'.\n", string);
+ exit(EXIT_FAILURE);
+ }
+ }
+ current_value = 0;
+ got_one = 0;
+ } else {
+ fprintf(stderr,
+ "selector: Too many values in `%s'.\n", string);
+ exit(EXIT_FAILURE);
+ }
+ } else {
+ fprintf(stderr,
+ "selector: Empty value in `%s'.\n", string);
+ exit(EXIT_FAILURE);
+ }
+ } else {
+ fprintf(stderr,
+ "selector: Syntax error in `%s'.\n", string);
+ exit(EXIT_FAILURE);
}
- } else error = 1;
-
- if(error) {
- fprintf(stderr, "Value `%s' is not a positive integer.\n", string);
- exit(1);
+ s++;
}
-
- return result;
}
void error_feedback() {
- if(error_flash) {
+ if(global_error_flash) {
flash();
} else {
beep();
}
}
-/*********************************************************************
- A quick and dirty hash table
+void usage(FILE *out) {
+
+ fprintf(out, "Selector version %s (%s)\n", VERSION, UNAME);
+ fprintf(out, "Written by Francois Fleuret <francois@fleuret.org>.\n");
+ fprintf(out, "\n");
+ fprintf(out, "Usage: selector [options] [<filename1> [<filename2> ...]]\n");
+ fprintf(out, "\n");
+ fprintf(out, " -h, --help\n");
+ fprintf(out, " show this help\n");
+ fprintf(out, " -v, --inject-in-tty\n");
+ fprintf(out, " inject the selected line in the tty\n");
+ fprintf(out, " -w, --add-control-qs\n");
+ fprintf(out, " quote control characters with ^Qs when using -v\n");
+ fprintf(out, " -d, --remove-duplicates\n");
+ fprintf(out, " remove duplicated lines\n");
+ fprintf(out, " -b, --remove-bash-prefix\n");
+ fprintf(out, " remove the bash history line prefix\n");
+ fprintf(out, " -z, --remove-zsh-prefix\n");
+ fprintf(out, " remove the zsh history line prefix\n");
+ fprintf(out, " -i, --revert-order\n");
+ fprintf(out, " invert the order of lines\n");
+ fprintf(out, " -e, --regexp\n");
+ fprintf(out, " start in regexp mode\n");
+ fprintf(out, " -a, --case-sensitive\n");
+ fprintf(out, " start in case sensitive mode\n");
+ fprintf(out, " -j, --show-long-lines\n");
+ fprintf(out, " print a long-line indicator at the end of truncated lines\n");
+ fprintf(out, " -y, --show-hits\n");
+ fprintf(out, " highlight the matching substrings\n");
+ fprintf(out, " -u, --upper-case-makes-case-sensitive\n");
+ fprintf(out, " using an upper case character in the matching string makes\n");
+ fprintf(out, " the matching case-sensitive\n");
+ fprintf(out, " -m, --monochrome\n");
+ fprintf(out, " monochrome mode\n");
+ fprintf(out, " -q, --no-beep\n");
+ fprintf(out, " make a flash instead of a beep on an edition error\n");
+ fprintf(out, " --bash\n");
+ fprintf(out, " setting for bash history search, same as -b -i -d -v -w -l ${HISTSIZE}\n");
+ fprintf(out, " --delete-regexp <regexp>\n");
+ fprintf(out, " deletes in every line the portion matching the regexp\n");
+ fprintf(out, " --\n");
+ fprintf(out, " all following arguments are filenames\n");
+ fprintf(out, " -t <title>, --title <title>\n");
+ fprintf(out, " add a title in the modeline\n");
+ fprintf(out, " -r <pattern>, --pattern <pattern>\n");
+ fprintf(out, " set an initial pattern\n");
+ fprintf(out, " -c <colors>, --colors <colors>\n");
+ fprintf(out, " set the display colors with an argument of the form\n");
+ fprintf(out, " <fg_modeline>,<bg_modeline>,<fg_highlight>,<bg_highlight>\n");
+ fprintf(out, " -o <output filename>, --output-file <output filename>\n");
+ fprintf(out, " set a file to write the selected line to\n");
+ fprintf(out, " -s <pattern separator>, --pattern-separator <pattern separator>\n");
+ fprintf(out, " set the symbol to separate substrings in the pattern\n");
+ fprintf(out, " -x <label separator>, --label-separator <label separator>\n");
+ fprintf(out, " set the character to separate the label to show from the\n");
+ fprintf(out, " string to return\n");
+ fprintf(out, " -l <max number of lines>, --number-of-lines <max number of lines>\n");
+ fprintf(out, " set the maximum number of lines to take into account\n");
+ fprintf(out, "\n");
+}
+
+/*********************************************************************/
+
+/* A quick and dirty hash table */
+
+#define MAGIC_HASH_MULTIPLIER 387433
- 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 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. */
-int *new_hash_table(int hash_table_size) {
- int *result, k;
- result = (int *) malloc(hash_table_size * sizeof(int));
- for(k = 0; k < hash_table_size; k++) {
- result[k] = -1;
+struct hash_table_t {
+ int size;
+ int *entries;
+};
+
+struct hash_table_t *new_hash_table(int size) {
+ int k;
+ struct hash_table_t *hash_table;
+
+ hash_table = safe_malloc(sizeof(struct hash_table_t));
+
+ hash_table->size = size;
+ hash_table->entries = safe_malloc(hash_table->size * sizeof(int));
+
+ for(k = 0; k < hash_table->size; k++) {
+ hash_table->entries[k] = -1;
}
- return result;
+
+ return hash_table;
+}
+
+void free_hash_table(struct hash_table_t *hash_table) {
+ free(hash_table->entries);
+ free(hash_table);
}
/* Adds new_string in the table, associated to new_index. If this
string was not already in the table, returns -1. Otherwise, returns
the previous index it had. */
-int test_and_add(char *new_string, int new_index,
- char **strings,
- int *hash_table, int hash_table_size) {
+int add_and_get_previous_index(struct hash_table_t *hash_table,
+ const char *new_string, int new_index,
+ char **strings) {
- unsigned int code = 0;
+ unsigned int code = 0, start;
int k;
/* This is my recipe. I checked, it seems to work (as long as
- hash_table_size is not a multiple of 387433 that should be
- okay) */
+ hash_table->size is not a multiple of MAGIC_HASH_MULTIPLIER that
+ should be okay) */
for(k = 0; new_string[k]; k++) {
- code = code * 387433 + (unsigned int) (new_string[k]);
+ code = code * MAGIC_HASH_MULTIPLIER + (unsigned int) (new_string[k]);
}
- code = code % hash_table_size;
+ code = code % hash_table->size;
+ start = code;
- while(hash_table[code] >= 0) {
+ while(hash_table->entries[code] >= 0) {
/* There is a string with that code */
- if(strcmp(new_string, strings[hash_table[code]]) == 0) {
+ if(strcmp(new_string, strings[hash_table->entries[code]]) == 0) {
/* It is the same string, we keep a copy of the stored index */
- int result = hash_table[code];
+ int result = hash_table->entries[code];
/* Put the new one */
- hash_table[code] = new_index;
+ hash_table->entries[code] = new_index;
/* And return the previous one */
return result;
}
/* This collision was not the same string, let's move to the next
in the table */
- code = (code + 1) % hash_table_size;
+ code = (code + 1) % hash_table->size;
+ /* We came back to our original code, which means that the table
+ is full */
+ if(code == start) {
+ fprintf(stderr,
+ "Full hash table (that should not happen)\n");
+ exit(EXIT_FAILURE);
+ }
}
/* This string was not already in there, store the index in the
table and return -1 */
- hash_table[code] = new_index;
+ hash_table->entries[code] = new_index;
return -1;
}
A matcher matches either with a collection of substrings, or with a
regexp */
-typedef struct {
+struct matcher {
regex_t preg;
int regexp_error;
int nb_patterns;
int case_sensitive;
char *splitted_patterns, **patterns;
-} matcher_t;
+};
+
+/* Routine to add an interval to a sorted list of intervals
+ extremities. Returns the resulting number of extremities.
+
+ This routine is an effing nightmare */
+
+int add_interval(int n, int *switches, int start, int end) {
+ int f, g, k;
-int match(char *string, matcher_t *matcher) {
+ if(start == end) { return n; }
+
+ f = 0;
+ while(f < n && switches[f] <= start) { f++; }
+ g = f;
+ while(g < n && switches[g] <= end) { g++; }
+
+ if(f == n) {
+ /* switches[f-1] start end */
+ /* XXXXXXXXXXXX| */
+ switches[f] = start;
+ switches[f+1] = end;
+ return n + 2;
+ }
+
+ if(f % 2) {
+
+ if(g % 2) {
+ /* switches[f-1] start switches[f] switches[g-1] end switches[g] */
+ /* |XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX| ... |XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX| */
+ for(k = f; k < n; k++) { switches[k] = switches[k + (g - f)]; }
+ return n - (g - f);
+ } else {
+ /* switches[f-1] start switches[f] switches[g-1] end switches[g] */
+ /* |XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX| ... XXXXXXXXXXXX| |XXXXXXXXXX */
+ switches[g - 1] = end;
+ for(k = f; k < n; k++) { switches[k] = switches[k + ((g - 1) - f)]; }
+ return n - ((g - 1) - f);
+ }
+
+ } else {
+
+ if(f == g) {
+ /* switches[f-1] start end switches[f] */
+ /* XXXXXXXXXXXX| |XXXXXXXXXX */
+ for(k = n - 1; k >= f; k--) {
+ switches[k + 2] = switches[k];
+ }
+ switches[f] = start;
+ switches[f + 1] = end;
+ return n + 2;
+ }
+
+ if(g % 2) {
+ /* switches[f-1] start switches[f] switches[g-1] end switches[g] */
+ /* XXXXXXXXXXXX| |XXXXXXXXXX ... |XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX| */
+ switches[f] = start;
+ for(k = f + 1; k < n; k++) { switches[k] = switches[k + (g - (f + 1))]; }
+ return n - (g - (f + 1));
+ } else {
+ /* switches[f-1] start switches[f] switches[g-1] end switches[g] */
+ /* XXXXXXXXXXXX| |XXXXXXXXXX ... XXXXXXXXXXXX| |XXXXXXXXXX */
+ switches[f] = start;
+ switches[g - 1] = end;
+ for(k = f + 1; k < n; k++) { switches[k] = switches[k + ((g - 1) - (f + 1))]; }
+ return n - ((g - 1) - (f + 1));
+ }
+ }
+}
+
+int match(struct matcher *matcher, char *string, int *nb_switches, int *switches) {
int n;
+ char *where;
+ regmatch_t matches;
+
+ if(nb_switches) { *nb_switches = 0; }
+
if(matcher->nb_patterns >= 0) {
if(matcher->case_sensitive) {
for(n = 0; n < matcher->nb_patterns; n++) {
- if(strstr(string, matcher->patterns[n]) == 0) return 0;
+ if((where = strstr(string, matcher->patterns[n])) == 0) return 0;
+ if(switches) {
+ *nb_switches = add_interval(*nb_switches, switches,
+ (int) (where - string),
+ (int) (where - string) + strlen(matcher->patterns[n]));
+ }
}
} else {
for(n = 0; n < matcher->nb_patterns; n++) {
- if(strcasestr(string, matcher->patterns[n]) == 0) return 0;
+ if((where = strcasestr(string, matcher->patterns[n])) == 0) return 0;
+ if(switches) {
+ *nb_switches = add_interval(*nb_switches, switches,
+ (int) (where - string),
+ (int) (where - string) + strlen(matcher->patterns[n]));
+ }
}
}
return 1;
} else {
- return regexec(&matcher->preg, string, 0, 0, 0) == 0;
+ if(switches) {
+ if(regexec(&matcher->preg, string, 1, &matches, 0) == 0) {
+ *nb_switches = 2;
+ switches[0] = matches.rm_so;
+ switches[1] = matches.rm_eo;
+ return 1;
+ } else {
+ return 0;
+ }
+ } else {
+ return regexec(&matcher->preg, string, 0, 0, 0) == 0;
+ }
}
}
-void free_matcher(matcher_t *matcher) {
+void free_matcher(struct matcher *matcher) {
if(matcher->nb_patterns < 0) {
if(!matcher->regexp_error) regfree(&matcher->preg);
} else {
}
}
-void initialize_matcher(int use_regexp, int case_sensitive,
- matcher_t *matcher, const char *pattern) {
+void initialize_matcher(struct matcher *matcher,
+ int use_regexp, int case_sensitive,
+ const char *pattern) {
const char *s;
- char *t;
+ char *t, *last_pattern_start;
+ int n;
if(use_regexp) {
+ matcher->case_sensitive = case_sensitive;
matcher->nb_patterns = -1;
- matcher->regexp_error = regcomp(&matcher->preg, pattern, case_sensitive ? 0 : REG_ICASE);
+ matcher->regexp_error = regcomp(&matcher->preg, pattern,
+ case_sensitive ? 0 : REG_ICASE);
} else {
matcher->regexp_error = 0;
matcher->nb_patterns = 1;
+
+ if(global_upper_caps_makes_case_sensitive) {
+ for(s = pattern; *s && !case_sensitive; s++) {
+ case_sensitive = (*s >= 'A' && *s <= 'Z');
+ }
+ }
+
matcher->case_sensitive = case_sensitive;
for(s = pattern; *s; s++) {
- if(*s == pattern_separator) {
+ if(*s == global_pattern_separator) {
matcher->nb_patterns++;
}
}
- matcher->splitted_patterns = (char *) malloc((strlen(pattern) + 1) * sizeof(char));
- matcher->patterns = (char **) malloc(matcher->nb_patterns * sizeof(char *));
+ matcher->splitted_patterns =
+ safe_malloc((strlen(pattern) + 1) * sizeof(char));
+
+ matcher->patterns =
+ safe_malloc(matcher->nb_patterns * sizeof(char *));
strcpy(matcher->splitted_patterns, pattern);
- int n = 0;
- char *last_pattern_start = matcher->splitted_patterns;
+ n = 0;
+ last_pattern_start = matcher->splitted_patterns;
for(t = matcher->splitted_patterns; n < matcher->nb_patterns; t++) {
- if(*t == pattern_separator || *t == '\0') {
+ if(*t == global_pattern_separator || *t == '\0') {
*t = '\0';
matcher->patterns[n++] = last_pattern_start;
last_pattern_start = t + 1;
void delete_char(char *buffer, int *position) {
if(buffer[*position]) {
int c = *position;
- while(c < buffer_size && buffer[c]) {
+ while(c < BUFFER_SIZE && buffer[c]) {
buffer[c] = buffer[c+1];
c++;
}
}
void insert_char(char *buffer, int *position, char character) {
- if(strlen(buffer) < buffer_size - 1) {
+ if(strlen(buffer) < BUFFER_SIZE - 1) {
int c = *position;
char t = buffer[c], u;
while(t) {
/*********************************************************************/
-int previous_visible(int current_line, int nb_lines, char **lines, matcher_t *matcher) {
+int previous_visible(int current_line, char **lines, struct matcher *matcher) {
int line = current_line - 1;
- while(line >= 0 && !match(lines[line], matcher)) line--;
+ while(line >= 0 && !match(matcher, lines[line], 0, 0)) line--;
return line;
}
-int next_visible(int current_line, int nb_lines, char **lines, matcher_t *matcher) {
+int next_visible(int current_line, int nb_lines, char **lines,
+ struct matcher *matcher) {
int line = current_line + 1;
- while(line < nb_lines && !match(lines[line], matcher)) line++;
+ while(line < nb_lines && !match(matcher, lines[line], 0, 0)) line++;
if(line < nb_lines)
return line;
/*********************************************************************/
-/* The value passed to this routine in current_focus_line is the index
- of the line we should have highlighted 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.
+void print_string_with_switches(char *buffer, int line_width,
+ int nb_patterns, int *switches) {
+ int w, current = 0, next;
+ if(switches) {
+ for(w = 0; w < nb_patterns && switches[2 * w] < line_width; w++) {
+ if(switches[2 * w] < switches[2 * w + 1]) {
+ next = switches[2 * w];
+ if(next > line_width) { next = line_width; }
+ if(next > current) { addnstr(buffer + current, next - current); }
+ attron(global_attr_hits);
+ current = next;
+ next = switches[2 * w + 1];
+ if(next > line_width) { next = line_width; }
+ if(next > current) { addnstr(buffer + current, next - current); }
+ attroff(global_attr_hits);
+ current = next;
+ }
+ }
+ if(current < line_width) {
+ addnstr(buffer + current, line_width - current);
+ }
+ } else {
+ addnstr(buffer, line_width);
+ }
+}
+
+/* The line highlighted is the first one matching the matcher in that
+ order: (1) current_focus_line after motion, if it does not match,
+ then (2) the first with a greater index, if none matches, then (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)
+ displayed_focus_line (it can be -1 if no line at all matches the
+ matcher)
If there is a motion and a line is actually shown highlighted, its
value is written in current_focus_line. */
int nb_lines, char **lines,
int cursor_position,
char *pattern) {
-
- char buffer[buffer_size];
- matcher_t matcher;
+ int *switches;
+ char buffer[BUFFER_SIZE];
+ struct matcher matcher;
int k, l, m;
+ int console_width, console_height;
+ int nb_printed_lines = 0;
+ int cursor_x;
+ int nb_switches;
- initialize_matcher(use_regexp, case_sensitive, &matcher, pattern);
+ initialize_matcher(&matcher, global_use_regexp, global_case_sensitive, pattern);
- int console_width = getmaxx(stdscr);
- int console_height = getmaxy(stdscr);
+ if(global_show_hits) {
+ if(matcher.nb_patterns >= 0) {
+ switches = safe_malloc(sizeof(int) * matcher.nb_patterns * 2);
+ } else {
+ switches = safe_malloc(sizeof(int) * 2);
+ }
+ } else {
+ switches = 0;
+ }
- int nb_printed_lines = 0;
+ console_width = getmaxx(stdscr);
+ console_height = getmaxy(stdscr);
use_default_colors();
+ /* Add an empty line where we will print the modeline at the end */
+
addstr("\n");
- /* First, we find a visible line. */
+ /* If the regexp is erroneous, print a message saying so */
if(matcher.regexp_error) {
- attron(attr_error);
+ attron(global_attr_error);
addnstr("Regexp syntax error", console_width);
- attroff(attr_error);
- } else if(nb_lines > 0) {
+ attroff(global_attr_error);
+ }
+
+ /* Else, and we do have lines to select from, find a visible line. */
+
+ else if(nb_lines > 0) {
int new_focus_line;
- if(match(lines[*current_focus_line], &matcher)) {
+ if(match(&matcher, lines[*current_focus_line], 0, 0)) {
new_focus_line = *current_focus_line;
} else {
- new_focus_line = next_visible(*current_focus_line, nb_lines, lines, &matcher);
+ new_focus_line = next_visible(*current_focus_line, nb_lines, lines,
+ &matcher);
if(new_focus_line < 0) {
- new_focus_line = previous_visible(*current_focus_line, nb_lines, lines, &matcher);
+ new_focus_line = previous_visible(*current_focus_line, lines, &matcher);
}
}
} else {
/* We want to go up, let's find the first visible line above */
for(m = 0; l >= 0 && m < -motion; m++) {
- l = previous_visible(l, nb_lines, lines, &matcher);
+ l = previous_visible(l, lines, &matcher);
if(l >= 0) {
new_focus_line = l;
}
}
}
- /* Here new_focus_line is either a line number matching the pattern, or -1 */
+ /* Here new_focus_line is either a line number matching the
+ pattern, or -1 */
if(new_focus_line >= 0) {
- int first_line = new_focus_line, last_line = new_focus_line, nb_match = 1;
+ int first_line = new_focus_line, last_line = new_focus_line;
+ int nb_match = 1;
- /* We find the first and last line to show, so that the total of
- visible lines between them (them included) is
+ /* We find the first and last lines to show, so that the total
+ of visible lines between them (them included) is
console_height-1 */
- while(nb_match < console_height-1 && (first_line > 0 || last_line < nb_lines - 1)) {
+ while(nb_match < console_height-1 &&
+ (first_line > 0 || last_line < nb_lines - 1)) {
if(first_line > 0) {
first_line--;
- while(first_line > 0 && !match(lines[first_line], &matcher)) {
+ while(first_line > 0 && !match(&matcher, lines[first_line], 0, 0)) {
first_line--;
}
- if(match(lines[first_line], &matcher)) {
+ if(match(&matcher, lines[first_line], 0, 0)) {
nb_match++;
}
}
if(nb_match < console_height - 1 && last_line < nb_lines - 1) {
last_line++;
- while(last_line < nb_lines - 1 && !match(lines[last_line], &matcher)) {
+ while(last_line < nb_lines - 1 && !match(&matcher, lines[last_line], 0, 0)) {
last_line++;
}
- if(match(lines[last_line], &matcher)) {
+ if(match(&matcher, lines[last_line], 0, 0)) {
nb_match++;
}
}
/* Now we display them */
for(l = first_line; l <= last_line; l++) {
- if(match(lines[l], &matcher)) {
+ if(match(&matcher, lines[l], &nb_switches, switches)) {
int k = 0;
- while(lines[l][k] && k < buffer_size - 2 && k < console_width - 2) {
+ while(lines[l][k] && k < BUFFER_SIZE - 2 && k < console_width) {
buffer[k] = lines[l][k];
k++;
}
- /* We fill the rest of the line with blanks if this is the
- highlighted line */
-
- if(l == new_focus_line) {
- while(k < console_width) {
- buffer[k++] = ' ';
- }
- }
-
- buffer[k++] = '\n';
- buffer[k++] = '\0';
-
- clrtoeol();
-
/* Highlight the highlighted line ... */
if(l == new_focus_line) {
- attron(attr_focus_line);
- addnstr(buffer, console_width);
- attroff(attr_focus_line);
+ if(global_show_long_lines && k >= console_width) {
+ attron(global_attr_focus_line);
+ print_string_with_switches(buffer, console_width-1,
+ nb_switches / 2, switches);
+ /* attron(global_attr_error); */
+ addnstr("\\", 1);
+ /* attroff(global_attr_error); */
+ attroff(global_attr_focus_line);
+ } else {
+ while(k < console_width) {
+ buffer[k++] = ' ';
+ }
+ attron(global_attr_focus_line);
+ print_string_with_switches(buffer, k,
+ nb_switches / 2, switches);
+ attroff(global_attr_focus_line);
+ }
} else {
- addnstr(buffer, console_width);
+ if(global_show_long_lines && k >= console_width) {
+ print_string_with_switches(buffer, console_width-1,
+ nb_switches / 2, switches);
+ attron(global_attr_focus_line);
+ addnstr("\\", 1);
+ attroff(global_attr_focus_line);
+ } else {
+ if(k < console_width) {
+ buffer[k++] = '\n';
+ buffer[k++] = '\0';
+ }
+ print_string_with_switches(buffer, k,
+ nb_switches / 2, switches);
+ }
}
nb_printed_lines++;
*displayed_focus_line = new_focus_line;
if(nb_printed_lines == 0) {
- attron(attr_error);
+ attron(global_attr_error);
addnstr("No selection", console_width);
- attroff(attr_error);
+ attroff(global_attr_error);
}
- } else {
- attron(attr_error);
+ }
+
+ /* Else, print a message saying that there are no lines to select from */
+
+ else {
+ attron(global_attr_error);
addnstr("Empty choice", console_width);
- attroff(attr_error);
+ attroff(global_attr_error);
}
clrtobot();
move(0, 0);
- attron(attr_modeline);
+ attron(global_attr_modeline);
for(k = 0; k < console_width; k++) buffer[k] = ' ';
buffer[console_width] = '\0';
/* There must be a more elegant way of moving the cursor at a
location met during display */
- int cursor_x = 0;
+ cursor_x = 0;
- if(title) {
- addstr(title);
+ if(global_title) {
+ addstr(global_title);
addstr(" ");
- cursor_x += strlen(title) + 1;
+ cursor_x += strlen(global_title) + 1;
}
sprintf(buffer, "%d/%d ", nb_printed_lines, nb_lines);
addstr(" ");
}
- if(use_regexp || case_sensitive) {
+ /* Add a few info about the mode we are in (regexp and/or case
+ sensitive) */
+
+ if(global_use_regexp || matcher.case_sensitive) {
addstr(" [");
- if(use_regexp) {
+ if(global_use_regexp) {
addstr("regexp");
}
- if(case_sensitive) {
- if(use_regexp) {
+ if(matcher.case_sensitive) {
+ if(global_use_regexp) {
addstr(",");
}
addstr("case");
move(0, cursor_x);
- attroff(attr_modeline);
+ attroff(global_attr_modeline);
/* We are done */
refresh();
+ if(switches) { free(switches); }
free_matcher(&matcher);
}
/*********************************************************************/
-void read_file(const char *input_filename,
- int nb_lines_max, int *nb_lines, char **lines,
- int hash_table_size, int *hash_table) {
-
- char raw_line[buffer_size];
+void store_line(struct hash_table_t *hash_table,
+ char *new_line,
+ int *nb_lines, char **lines) {
+ int dup;
+ char *c, *d;
+ regmatch_t matches;
- FILE *file = fopen(input_filename, "r");
+ /* Remove some parts matching a regexp */
- if(!file) {
- fprintf(stderr, "Can not open `%s'.\n", input_filename);
- exit(1);
+ if(global_prefix_regexp && regexec(global_prefix_regexp, new_line, 1, &matches, 0) == 0) {
+ c = new_line + matches.rm_so;
+ d = new_line + matches.rm_eo;
+ while(*d) { *c++ = *d++; }
+ *c = 0;
}
- int start = 0, end = 0, k;
+ /* Remove the zsh history prefix */
- while(*nb_lines < nb_lines_max && (end > start || !feof(file))) {
- int eol = start;
- while(eol < end && raw_line[eol] != '\n') eol++;
+ if(global_zsh_history && *new_line == ':') {
+ while(*new_line && *new_line != ';') new_line++;
+ if(*new_line == ';') new_line++;
+ }
- if(eol == end) {
- for(k = 0; k < end - start; k++) {
- raw_line[k] = raw_line[k + start];
- }
- end -= start;
- eol -= start;
- start = 0;
- end += fread(raw_line + end, sizeof(char), buffer_size - end, file);
- while(eol < end && raw_line[eol] != '\n') eol++;
- }
+ /* Remove the bash history prefix */
- if(eol == buffer_size) {
- raw_line[buffer_size - 1] = '\0';
- fprintf(stderr, "Line too long (max is %d characters):\n", buffer_size);
- fprintf(stderr, raw_line);
- fprintf(stderr, "\n");
- exit(1);
- }
+ if(global_bash_history) {
+ while(*new_line == ' ') new_line++;
+ while(*new_line >= '0' && *new_line <= '9') new_line++;
+ while(*new_line == ' ') new_line++;
+ }
- raw_line[eol] = '\0';
+ /* Check for duplicates with the hash table and insert the line in
+ the list if necessary */
- char *t = raw_line + start;
+ if(hash_table) {
+ dup = add_and_get_previous_index(hash_table,
+ new_line, *nb_lines, lines);
+ } else {
+ dup = -1;
+ }
- /* Remove the zsh history prefix */
+ if(dup < 0) {
+ lines[*nb_lines] = safe_malloc((strlen(new_line) + 1) * sizeof(char));
+ strcpy(lines[*nb_lines], new_line);
+ } 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 */
+ lines[*nb_lines] = lines[dup];
+ lines[dup] = 0;
+ }
- if(zsh_history && *t == ':') {
- while(*t && *t != ';') t++;
- if(*t == ';') t++;
- }
+ (*nb_lines)++;
+}
- /* Remove the bash history prefix */
+void read_file(struct hash_table_t *hash_table,
+ const char *input_filename,
+ int nb_lines_max, int *nb_lines, char **lines) {
- if(bash_history) {
- while(*t == ' ') t++;
- while(*t >= '0' && *t <= '9') t++;
- while(*t == ' ') t++;
- }
+ char raw_line[BUFFER_SIZE];
+ char *s;
+ FILE *file;
+ int l;
- /* Check for duplicates with the hash table and insert the line in
- the list if necessary */
+ file = fopen(input_filename, "r");
- int dup;
+ if(!file) {
+ fprintf(stderr, "selector: Cannot open `%s'.\n", input_filename);
+ exit(EXIT_FAILURE);
+ }
- if(hash_table) {
- dup = test_and_add(t, *nb_lines, lines, hash_table, hash_table_size);
- } else {
- dup = -1;
+ if(global_label_separator == '\n') {
+ while(*nb_lines < nb_lines_max && fgets(raw_line, BUFFER_SIZE, file)) {
+ l = strlen(raw_line);
+ fgets(raw_line + l, BUFFER_SIZE - l, file);
+ for(s = raw_line + strlen(raw_line) - 1; s > raw_line && *s == '\n'; s--) {
+ *s = '\0';
+ }
+ store_line(hash_table, raw_line, nb_lines, lines);
}
-
- if(dup < 0) {
- lines[*nb_lines] = (char *) malloc((strlen(t) + 1) * sizeof(char));
- 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 */
- lines[*nb_lines] = lines[dup];
- lines[dup] = 0;
+ } else {
+ while(*nb_lines < nb_lines_max && fgets(raw_line, BUFFER_SIZE, file)) {
+ for(s = raw_line + strlen(raw_line) - 1; s > raw_line && *s == '\n'; s--) {
+ *s = '\0';
+ }
+ store_line(hash_table, raw_line, nb_lines, lines);
}
-
- (*nb_lines)++;
-
- start = eol + 1;
}
fclose(file);
/*********************************************************************/
-int main(int argc, char **argv) {
+/* For long options that have no equivalent short option, use a
+ non-character as a pseudo short option, starting with CHAR_MAX + 1. */
+enum {
+ OPT_BASH_MODE = CHAR_MAX + 1,
+ OPT_DELETE_REGEXP = CHAR_MAX + 2
+};
+
+static struct option long_options[] = {
+ { "output-file", 1, 0, 'o' },
+ { "pattern-separator", 1, 0, 's' },
+ { "label-separator", 1, 0, 'x' },
+ { "inject-in-tty", no_argument, 0, 'v' },
+ { "add-control-qs", no_argument, 0, 'w' },
+ { "monochrome", no_argument, 0, 'm' },
+ { "no-beep", no_argument, 0, 'q' },
+ { "revert-order", no_argument, 0, 'i' },
+ { "remove-bash-prefix", no_argument, 0, 'b' },
+ { "remove-zsh-prefix", no_argument, 0, 'z' },
+ { "remove-duplicates", no_argument, 0, 'd' },
+ { "regexp", no_argument, 0, 'e' },
+ { "case-sensitive", no_argument, 0, 'a' },
+ { "show-long-lines", no_argument, 0, 'j'},
+ { "show-hits", no_argument, 0, 'y'},
+ { "upper-case-makes-case-sensitive", no_argument, 0, 'u' },
+ { "title", 1, 0, 't' },
+ { "pattern", 1, 0, 'r' },
+ { "number-of-lines", 1, 0, 'l' },
+ { "colors", 1, 0, 'c' },
+ { "bash", no_argument, 0, OPT_BASH_MODE },
+ { "delete-regexp", 1, 0, OPT_DELETE_REGEXP },
+ { "help", no_argument, 0, 'h' },
+ { 0, 0, 0, 0 }
+};
- if(!ttyname(STDIN_FILENO)) {
- fprintf(stderr, "The standard input is not a tty.\n");
- exit(1);
- }
+int main(int argc, char **argv) {
- char input_filename[buffer_size], output_filename[buffer_size];
- int i, k, l, n;
- int error = 0, show_help = 0;
- int rest_are_files = 0;
+ char output_filename[BUFFER_SIZE];
+ char pattern[BUFFER_SIZE];
+ int c, k, l, n;
+ int cursor_position;
+ int error = 0, show_help = 0, done = 0;
+ int key;
+ int current_focus_line, displayed_focus_line;
+ int colors[4];
int color_fg_modeline, color_bg_modeline;
int color_fg_highlight, color_bg_highlight;
+ char **lines, **labels;
+ int nb_lines;
+ struct hash_table_t *hash_table;
+ char *bash_histsize;
+
+ if(!isatty(STDIN_FILENO)) {
+ fprintf(stderr, "selector: The standard input is not a tty.\n");
+ exit(EXIT_FAILURE);
+ }
+
+ /* Group and others have no access to created files */
+ umask(S_IRWXG | S_IRWXO);
+
+ pattern[0] = '\0';
+
color_fg_modeline = COLOR_WHITE;
color_bg_modeline = COLOR_BLACK;
color_fg_highlight = COLOR_BLACK;
setlocale(LC_ALL, "");
- strcpy(input_filename, "");
strcpy(output_filename, "");
- i = 1;
- while(!error && !show_help && i < argc && argv[i][0] == '-' && !rest_are_files) {
+ while ((c = getopt_long(argc, argv, "o:s:x:vwmqf:ibzdeajyunt:r:l:c:-h",
+ long_options, NULL)) != -1) {
- if(strcmp(argv[i], "-o") == 0) {
- check_opt(argc, argv, i, 1, "<output filename>");
- strncpy(output_filename, argv[i+1], buffer_size);
- i += 2;
- }
+ switch(c) {
- else if(strcmp(argv[i], "-s") == 0) {
- check_opt(argc, argv, i, 1, "<pattern separator>");
- pattern_separator = argv[i+1][0];
- i += 2;
- }
+ case 'o':
+ strncpy(output_filename, optarg, BUFFER_SIZE);
+ break;
- else if(strcmp(argv[i], "-x") == 0) {
- check_opt(argc, argv, i, 1, "<label separator>");
- label_separator = argv[i+1][0];
- i += 2;
- }
+ case 's':
+ global_pattern_separator = optarg[0];
+ break;
- else if(strcmp(argv[i], "-v") == 0) {
- output_to_vt_buffer = 1;
- i++;
- }
+ case 'x':
+ if(strcmp(optarg, "\\n") == 0) {
+ global_label_separator = '\n';
+ } else {
+ global_label_separator = optarg[0];
+ }
+ break;
- else if(strcmp(argv[i], "-w") == 0) {
- add_control_qs = 1;
- i++;
- }
+ case 'v':
+ global_output_to_vt_buffer = 1;
+ break;
- else if(strcmp(argv[i], "-m") == 0) {
- with_colors = 0;
- i++;
- }
+ case 'w':
+ global_add_control_qs = 1;
+ break;
- else if(strcmp(argv[i], "-q") == 0) {
- error_flash = 1;
- i++;
- }
+ case 'm':
+ global_with_colors = 0;
+ break;
- else if(strcmp(argv[i], "-f") == 0) {
- check_opt(argc, argv, i, 1, "<input filename>");
- strncpy(input_filename, argv[i+1], buffer_size);
- i += 2;
- }
+ case 'q':
+ global_error_flash = 1;
+ break;
- else if(strcmp(argv[i], "-i") == 0) {
- inverse_order = 1;
- i++;
- }
+ case 'i':
+ global_inverse_order = 1;
+ break;
- else if(strcmp(argv[i], "-b") == 0) {
- bash_history = 1;
- i++;
- }
+ case 'b':
+ global_bash_history = 1;
+ break;
- else if(strcmp(argv[i], "-z") == 0) {
- zsh_history = 1;
- i++;
- }
+ case 'z':
+ global_zsh_history = 1;
+ break;
- else if(strcmp(argv[i], "-d") == 0) {
- remove_duplicates = 1;
- i++;
- }
+ case 'd':
+ global_remove_duplicates = 1;
+ break;
- else if(strcmp(argv[i], "-e") == 0) {
- use_regexp = 1;
- i++;
- }
+ case 'e':
+ global_use_regexp = 1;
+ break;
- else if(strcmp(argv[i], "-a") == 0) {
- case_sensitive = 1;
- i++;
- }
+ case 'a':
+ global_case_sensitive = 1;
+ break;
- else if(strcmp(argv[i], "-t") == 0) {
- check_opt(argc, argv, i, 1, "<title>");
- free(title);
- title = (char *) malloc((strlen(argv[i+1]) + 1) * sizeof(char));
- strcpy(title, argv[i+1]);
- i += 2;
- }
+ case 'j':
+ global_show_long_lines = 1;
+ break;
- else if(strcmp(argv[i], "-l") == 0) {
- check_opt(argc, argv, i, 1, "<maximum number of lines>");
- nb_lines_max = string_to_positive_integer(argv[i+1]);
- i += 2;
- }
+ case 'y':
+ global_show_hits = 1;
+ break;
- else if(strcmp(argv[i], "-c") == 0) {
- check_opt(argc, argv, i, 4, "<fg modeline> <bg modeline> <fg highlight> <bg highlight>");
- color_fg_modeline = string_to_positive_integer(argv[i + 1]);
- color_bg_modeline = string_to_positive_integer(argv[i + 2]);
- color_fg_highlight = string_to_positive_integer(argv[i + 3]);
- color_bg_highlight = string_to_positive_integer(argv[i + 4]);
- i += 5;
- }
+ case 'u':
+ global_upper_caps_makes_case_sensitive = 1;
+ break;
- else if(strcmp(argv[i], "--") == 0) {
- rest_are_files = 1;
- i++;
- }
+ case 't':
+ free(global_title);
+ global_title = safe_malloc((strlen(optarg) + 1) * sizeof(char));
+ strcpy(global_title, optarg);
+ break;
- else if(strcmp(argv[i], "-h") == 0) {
+ case OPT_DELETE_REGEXP:
+ free(global_prefix_regexp);
+ global_prefix_regexp = safe_malloc(sizeof(*global_prefix_regexp));
+
+ if(regcomp(global_prefix_regexp, optarg, 0)) {
+ fprintf(stderr, "selector: Regexp syntax error `%s'.\n", optarg);
+ exit(EXIT_FAILURE);
+ }
+ break;
+
+ case 'r':
+ strcpy(pattern, optarg);
+ break;
+
+ case 'l':
+ str_to_positive_integers(optarg, &global_nb_lines_max, 1);
+ break;
+
+ case 'c':
+ str_to_positive_integers(optarg, colors, 4);
+ color_fg_modeline = colors[0];
+ color_bg_modeline = colors[1];
+ color_fg_highlight = colors[2];
+ color_bg_highlight = colors[3];
+ break;
+
+ case 'h':
show_help = 1;
- i++;
- }
+ break;
+
+ case OPT_BASH_MODE:
+ /* Same as -c 7,4,0,3 -q */
+ /* color_fg_modeline = 7; */
+ /* color_bg_modeline = 4; */
+ /* color_fg_highlight = 0; */
+ /* color_bg_highlight = 3; */
+ /* error_flash = 1; */
+ /* Same as -b -i -d -v -w */
+ global_bash_history = 1;
+ global_inverse_order = 1;
+ global_remove_duplicates = 1;
+ global_output_to_vt_buffer = 1;
+ global_add_control_qs = 1;
+ bash_histsize = getenv("HISTSIZE");
+ if(bash_histsize) {
+ str_to_positive_integers(bash_histsize, &global_nb_lines_max, 1);
+ }
+ break;
- else {
- fprintf(stderr, "Unknown option %s.\n", argv[i]);
+ default:
error = 1;
+ break;
}
}
- if(show_help || error) {
- fprintf(stderr, "Selector version %s-R%s\n", VERSION, REVISION_NUMBER);
- fprintf(stderr, "Written by Francois Fleuret <francois@fleuret.org>.\n");
- fprintf(stderr, "Usage: %s [options] [<filename1> [<filename2> ...]]\n", argv[0]);
- fprintf(stderr, "\n");
- fprintf(stderr, " -h show this help\n");
- fprintf(stderr, " -v inject the selected line in the tty\n");
- fprintf(stderr, " -w quote control characters with ^Qs when using -v\n");
- fprintf(stderr, " -d remove duplicated lines\n");
- fprintf(stderr, " -b remove the bash history line prefix\n");
- fprintf(stderr, " -z remove the zsh history line prefix\n");
- fprintf(stderr, " -i invert the order of lines\n");
- fprintf(stderr, " -e start in regexp mode\n");
- fprintf(stderr, " -a start in case sensitive mode\n");
- fprintf(stderr, " -m monochrome mode\n");
- fprintf(stderr, " -q make a flash instead of a beep on an edition error\n");
- fprintf(stderr, " -- all following arguments are filenames\n");
- fprintf(stderr, " -t <title>\n");
- fprintf(stderr, " add a title in the modeline\n");
- fprintf(stderr, " -c <fg modeline> <bg modeline> <fg highlight> <bg highlight>\n");
- fprintf(stderr, " set the display colors\n");
- fprintf(stderr, " -o <output filename>\n");
- fprintf(stderr, " set a file to write the selected line to\n");
- fprintf(stderr, " -s <pattern separator>\n");
- fprintf(stderr, " set the symbol to separate substrings in the pattern\n");
- fprintf(stderr, " -x <label separator>\n");
- fprintf(stderr, " set the symbol to terminate the label\n");
- fprintf(stderr, " -l <max number of lines>\n");
- fprintf(stderr, " set the maximum number of lines to take into account\n");
- fprintf(stderr, "\n");
- exit(error);
+ if(error) {
+ usage(stderr);
+ exit(EXIT_FAILURE);
}
- char **lines = (char **) malloc(nb_lines_max * sizeof(char *));
+ if(show_help) {
+ usage(stdout);
+ exit(EXIT_SUCCESS);
+ }
- int nb_lines = 0;
- int hash_table_size = nb_lines_max * 10;
- int *hash_table = 0;
+ lines = safe_malloc(global_nb_lines_max * sizeof(char *));
- if(remove_duplicates) {
- hash_table = new_hash_table(hash_table_size);
- }
+ nb_lines = 0;
- if(input_filename[0]) {
- read_file(input_filename,
- nb_lines_max, &nb_lines, lines,
- hash_table_size, hash_table);
+ if(global_remove_duplicates) {
+ hash_table = new_hash_table(global_nb_lines_max * 10);
+ } else {
+ hash_table = 0;
}
- while(i < argc) {
- read_file(argv[i],
- nb_lines_max, &nb_lines, lines,
- hash_table_size, hash_table);
- i++;
+ while(optind < argc) {
+ read_file(hash_table,
+ argv[optind],
+ global_nb_lines_max, &nb_lines, lines);
+ optind++;
}
- free(hash_table);
+ if(hash_table) {
+ free_hash_table(hash_table);
+ }
/* Now remove the null strings */
nb_lines = n;
- if(inverse_order) {
- for(i = 0; i < nb_lines / 2; i++) {
- char *s = lines[nb_lines - 1 - i];
- lines[nb_lines - 1 - i] = lines[i];
- lines[i] = s;
+ if(global_inverse_order) {
+ for(l = 0; l < nb_lines / 2; l++) {
+ char *s = lines[nb_lines - 1 - l];
+ lines[nb_lines - 1 - l] = lines[l];
+ lines[l] = s;
}
}
label_separator and transform control characters to printable
ones */
- char **labels = (char **) malloc(nb_lines * sizeof(char *));
+ labels = safe_malloc(nb_lines * sizeof(char *));
+
for(l = 0; l < nb_lines; l++) {
char *s, *t;
+ int e = 0;
const char *u;
t = lines[l];
- int e = 0;
- while(*t && *t != label_separator) {
+
+ while(*t && *t != global_label_separator) {
u = unctrl(*t++);
e += strlen(u);
}
- labels[l] = (char *) malloc((e + 1) * sizeof(char));
+
+ labels[l] = safe_malloc((e + 1) * sizeof(char));
t = lines[l];
s = labels[l];
- while(*t && *t != label_separator) {
+ while(*t && *t != global_label_separator) {
u = unctrl(*t++);
while(*u) { *s++ = *u++; }
}
*s = '\0';
}
- char pattern[buffer_size];
- pattern[0] = '\0';
-
- int cursor_position;
cursor_position = 0;
/* Here we start to display with curse */
initscr();
cbreak();
noecho();
- /* nonl(); */
intrflush(stdscr, FALSE);
/* So that the arrow keys work */
keypad(stdscr, TRUE);
- attr_error = A_STANDOUT;
- attr_modeline = A_REVERSE;
- attr_focus_line = A_STANDOUT;
+ global_attr_error = A_STANDOUT;
+ global_attr_modeline = A_REVERSE;
+ global_attr_focus_line = A_STANDOUT;
+ global_attr_hits = A_BOLD;
- if(with_colors && has_colors()) {
+ if(global_with_colors && has_colors()) {
start_color();
color_bg_highlight < 0 || color_bg_highlight >= COLORS) {
echo();
endwin();
- fprintf(stderr, "Color numbers have to be between 0 and %d.\n", COLORS - 1);
- exit(1);
+ fprintf(stderr, "selector: Color numbers have to be between 0 and %d.\n",
+ COLORS - 1);
+ exit(EXIT_FAILURE);
}
init_pair(1, color_fg_modeline, color_bg_modeline);
- attr_modeline = COLOR_PAIR(1);
+ global_attr_modeline = COLOR_PAIR(1);
init_pair(2, color_fg_highlight, color_bg_highlight);
- attr_focus_line = COLOR_PAIR(2);
+ global_attr_focus_line = COLOR_PAIR(2);
init_pair(3, COLOR_WHITE, COLOR_RED);
- attr_error = COLOR_PAIR(3);
+ global_attr_error = COLOR_PAIR(3);
}
- int key;
- int current_focus_line = 0, displayed_focus_line = 0;
+ current_focus_line = 0;
+ displayed_focus_line = 0;
+ cursor_position = strlen(pattern);
update_screen(¤t_focus_line, &displayed_focus_line,
0,
nb_lines, labels, cursor_position, pattern);
do {
+ int motion = 0;
key = getch();
- int motion = 0;
-
if(key >= ' ' && key <= '~') { /* Insert character */
insert_char(pattern, &cursor_position, key);
}
}
else if(key == '\022') { /* ^R */
- use_regexp = !use_regexp;
+ global_use_regexp = !global_use_regexp;
}
else if(key == '\011') { /* ^I */
- case_sensitive = !case_sensitive;
+ global_case_sensitive = !global_case_sensitive;
}
else if(key == '\025') { /* ^U */
}
else if(key == '\014') { /* ^L */
- /* I suspect that we may sometime mess up the display */
+ /* I suspect that we may sometime mess up the display, so ^L is
+ here to force a full refresh */
clear();
}
+ else if(key == '\007' || /* ^G */
+ key == '\033' || /* ^[ (escape) */
+ key == '\n' ||
+ key == KEY_ENTER) {
+ done = 1;
+ }
+
+ else if(key == KEY_RESIZE || key == -1) {
+ /* Do nothing when the tty is resized */
+ }
+
+ else {
+ /* Unknown key */
+ error_feedback();
+ }
+
update_screen(¤t_focus_line, &displayed_focus_line,
motion,
nb_lines, labels, cursor_position, pattern);
- } while(key != '\007' && /* ^G */
- key != '\033' && /* ^[ (escape) */
- key != '\n' &&
- key != KEY_ENTER);
+ } while(!done);
echo();
endwin();
/* Here we come back to standard display */
- if((key == KEY_ENTER || key == '\n')) {
+ if(key == KEY_ENTER || key == '\n') {
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(global_label_separator) {
+ while(*t && *t != global_label_separator) t++;
if(*t) t++;
}
} else {
t = 0;
}
- if(output_to_vt_buffer && t) {
- inject_into_tty_buffer(t);
+ if(global_output_to_vt_buffer && t) {
+ inject_into_tty_buffer(t, global_add_control_qs);
}
if(output_filename[0]) {
FILE *out = fopen(output_filename, "w");
if(out) {
if(t) {
- fprintf(out, t);
+ fprintf(out, "%s", t);
}
fprintf(out, "\n");
} else {
- fprintf(stderr, "Can not open %s for writing.\n", output_filename);
- exit(1);
+ fprintf(stderr,
+ "selector: Cannot open %s for writing.\n",
+ output_filename);
+ exit(EXIT_FAILURE);
}
fclose(out);
}
free(labels);
free(lines);
- free(title);
+ free(global_title);
+
+ if(global_prefix_regexp) {
+ regfree(global_prefix_regexp);
+ free(global_prefix_regexp);
+ }
- exit(0);
+ exit(EXIT_SUCCESS);
}
projects / selector.git / blobdiff