int use_regexp = 0;
int case_sensitive = 0;
char *title = 0;
+int error_flash = 0;
#define COLOR_MODELINE 1
#define COLOR_HIGHLIGHTED_LINE 2
}
void error_feedback() {
- flash();
+ if(error_flash) {
+ flash();
+ } else {
+ beep();
+ }
}
//////////////////////////////////////////////////////////////////////
}
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);
}
}
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)) {
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) {
}
if(use_regexp || case_sensitive) {
- addstr("[");
+ addstr(" [");
if(use_regexp) {
addstr("regexp");
}
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, "<input filename>");
strncpy(input_filename, argv[i+1], buffer_size);
}
else if(strcmp(argv[i], "-a") == 0) {
- case_sensitive = 1;
- i++;
}
else if(strcmp(argv[i], "-t") == 0) {
<< " -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 <title>" << endl
<< " add a title in the modeline" << endl
keypad(stdscr, TRUE);
if(with_colors) {
+
if(has_colors()) {
+
start_color();
+
if(color_fg_modeline < 0 || color_fg_modeline >= COLORS ||
color_bg_modeline < 0 || color_bg_modeline >= COLORS ||
color_fg_highlight < 0 || color_bg_highlight >= COLORS ||
cerr << "Color numbers have to be between 0 and " << COLORS - 1 << "." << endl;
exit(1);
}
- init_pair(COLOR_MODELINE , color_fg_modeline, color_bg_modeline);
+
+ init_pair(COLOR_MODELINE, color_fg_modeline, color_bg_modeline);
init_pair(COLOR_HIGHLIGHTED_LINE, color_fg_highlight, color_bg_highlight);
+
} else {
with_colors = 0;
}