int use_regexp = 0;
int case_sensitive = 0;
char *title = 0;
+int error_flash = 0;
#define COLOR_MODELINE 1
#define COLOR_HIGHLIGHTED_LINE 2
return result;
}
+void error_feedback() {
+ if(error_flash) {
+ flash();
+ } else {
+ beep();
+ }
+}
+
//////////////////////////////////////////////////////////////////////
// A quick and dirty hash table
int test_and_add(char *new_string, int new_index,
char **strings, int *hash_table, int hash_table_size) {
+
unsigned int code = 0;
// This is my recipe. I checked, it seems to work (as long as
}
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);
}
}
buffer[c] = buffer[c+1];
c++;
}
- }
+ } else error_feedback();
}
void backspace_char(char *buffer, int *position) {
}
(*position)--;
- }
+ } else error_feedback();
}
void insert_char(char *buffer, int *position, char character) {
c++;
buffer[c] = '\0';
buffer[(*position)++] = character;
- }
+ } else error_feedback();
}
void kill_before_cursor(char *buffer, int *position) {
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");
}
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) {
+ while(*t == ' ') t++;
+ while(*t >= '0' && *t <= '9') t++;
+ while(*t == ' ') 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
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);
<< " -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;
}
else if(key == KEY_LEFT ||
key == '\002') { // ^B
if(cursor_position > 0) cursor_position--;
+ else error_feedback();
}
else if(key == KEY_RIGHT ||
key == '\006') { // ^F
if(pattern[cursor_position]) cursor_position++;
+ else error_feedback();
}
else if(key == '\001') { // ^A
update_screen(¤t_line, &temporary_line, motion,
nb_lines, lines, cursor_position, pattern);
- } while(key != '\n' && key != KEY_ENTER && key != '\007'); // ^G
+ } while(key != '\007' && // ^G
+ key != '\033' && // ^[ (escape)
+ key != '\n' &&
+ key != KEY_ENTER);
echo();
endwin();