X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.cc;h=99a9057cf2a64289cc8f7383e08ee72be6471137;hb=ed0a1fe13a90d9e96145bdcf1a13695e0eeb3a54;hp=ebe528e315e5b07200cd61589d2725d32ceaf518;hpb=bf323e43f1f63a67f6b8bf9ad4ec90057891320b;p=selector.git diff --git a/selector.cc b/selector.cc index ebe528e..99a9057 100644 --- a/selector.cc +++ b/selector.cc @@ -55,6 +55,7 @@ int remove_duplicates = 0; int use_regexp = 0; int case_sensitive = 0; char *title = 0; +int error_flash = 0; #define COLOR_MODELINE 1 #define COLOR_HIGHLIGHTED_LINE 2 @@ -108,7 +109,11 @@ int string_to_positive_integer(char *string) { } void error_feedback() { - flash(); + if(error_flash) { + flash(); + } else { + beep(); + } } ////////////////////////////////////////////////////////////////////// @@ -195,11 +200,11 @@ int match(char *string, matcher_t *matcher) { } void free_matcher(matcher_t *matcher) { - if(matcher->nb_patterns >= 0) { + if(matcher->nb_patterns < 0) { + if(!matcher->regexp_error) regfree(&matcher->preg); + } else { delete[] matcher->splitted_patterns; delete[] matcher->patterns; - } else { - if(!matcher->regexp_error) regfree(&matcher->preg); } } @@ -383,7 +388,7 @@ void update_screen(int *current_line, int *temporary_line, int motion, int first_line = new_line, last_line = new_line, nb_match = 1; // We find the first and last line to show, so that the total of - // visible lines between them (them include) is console_height - 1 + // visible lines between them (them included) is console_height-1 while(nb_match < console_height-1 && (first_line > 0 || last_line < nb_lines - 1)) { @@ -420,8 +425,8 @@ void update_screen(int *current_line, int *temporary_line, int motion, k++; } - // We fill the rest of the line with blanks if either we did - // not clear() or if this is the highlighted line + // We fill the rest of the line with blanks if this is the + // highlighted line if(l == new_line) { while(k < console_width) { @@ -507,7 +512,7 @@ void update_screen(int *current_line, int *temporary_line, int motion, } if(use_regexp || case_sensitive) { - addstr("["); + addstr(" ["); if(use_regexp) { addstr("regexp"); } @@ -565,36 +570,46 @@ void read_file(const char *input_filename, char *s, *t; const char *u; - s = buffer; t = raw_line; - while(*t) { - u = unctrl(*t++); - while(*u) { *s++ = *u++; } + + // Remove the zsh history prefix + + if(zsh_history && *t == ':') { + while(*t && *t != ';') s++; + if(*t == ';') t++; } - *s = '\0'; - s = buffer; + // Remove the bash history prefix - if(zsh_history && *s == ':') { - while(*s && *s != ';') s++; - if(*s == ';') s++; + if(bash_history && (*t == ' ' || (*t >= '0' && *t <= '9'))) { + while(*t == ' ' || (*t >= '0' && *t <= '9')) t++; } - if(bash_history && (*s == ' ' || (*s >= '0' && *s <= '9'))) { - while(*s == ' ' || (*s >= '0' && *s <= '9')) s++; + // 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) { - dup = test_and_add(s, *nb_lines, lines, hash_table, hash_table_size); + dup = test_and_add(buffer, *nb_lines, lines, hash_table, hash_table_size); } else { dup = -1; } if(dup < 0) { - lines[*nb_lines] = new char[strlen(s) + 1]; - strcpy(lines[*nb_lines], s); + lines[*nb_lines] = new char[strlen(buffer) + 1]; + strcpy(lines[*nb_lines], buffer); } 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 @@ -659,6 +674,11 @@ int main(int argc, char **argv) { i++; } + else if(strcmp(argv[i], "-q") == 0) { + error_flash = 1; + i++; + } + else if(strcmp(argv[i], "-f") == 0) { check_opt(argc, argv, i, 1, ""); strncpy(input_filename, argv[i+1], buffer_size); @@ -691,8 +711,6 @@ int main(int argc, char **argv) { } else if(strcmp(argv[i], "-a") == 0) { - case_sensitive = 1; - i++; } else if(strcmp(argv[i], "-t") == 0) { @@ -751,6 +769,7 @@ int main(int argc, char **argv) { << " -e start in regexp mode" << endl << " -a case sensitive" << endl << " -m monochrome mode" << endl + << " -q make a flash instead of a beep on an edition error" << endl << " -- rest of the arguments are filenames" << endl << " -t