}
}
-void initialize_matcher(int use_regexp, int case_sensitive, matcher_t *matcher, const char *pattern) {
+void initialize_matcher(int use_regexp, int case_sensitive,
+ matcher_t *matcher, const char *pattern) {
+
if(use_regexp) {
matcher->nb_patterns = -1;
matcher->regexp_error = regcomp(&matcher->preg, pattern, case_sensitive ? 0 : REG_ICASE);
}
}
+//////////////////////////////////////////////////////////////////////
+// Buffer edition
+
+void delete_char(char *buffer, int *position) {
+ if(buffer[*position]) {
+ int c = *position;
+ while(c < buffer_size && buffer[c]) {
+ buffer[c] = buffer[c+1];
+ c++;
+ }
+ }
+}
+
+void backspace_char(char *buffer, int *position) {
+ if(*position > 0) {
+ if(buffer[*position]) {
+ int c = *position - 1;
+ while(buffer[c]) {
+ buffer[c] = buffer[c+1];
+ c++;
+ }
+ } else {
+ buffer[*position - 1] = '\0';
+ }
+
+ (*position)--;
+ }
+}
+
+void insert_char(char *buffer, int *position, char character) {
+ if(strlen(buffer) < buffer_size - 1) {
+ int c = *position;
+ char t = buffer[c], u;
+ while(t) {
+ c++;
+ u = buffer[c];
+ buffer[c] = t;
+ t = u;
+ }
+ c++;
+ buffer[c] = '\0';
+ buffer[(*position)++] = character;
+ }
+}
+
+void kill_before_cursor(char *buffer, int *position) {
+ int s = 0;
+ while(buffer[*position + s]) {
+ buffer[s] = buffer[*position + s];
+ s++;
+ }
+ buffer[s] = '\0';
+ *position = 0;
+}
+
+void kill_after_cursor(char *buffer, int *position) {
+ buffer[*position] = '\0';
+}
+
//////////////////////////////////////////////////////////////////////
int previous_visible(int current_line, int nb_lines, char **lines, matcher_t *matcher) {
void update_screen(int *current_line, int *temporary_line, int motion,
int nb_lines, char **lines,
+ int cursor_position,
char *pattern) {
char buffer[buffer_size];
// Draw the modeline
- if(title) {
- sprintf(buffer, "%s %d/%d pattern: %s%s",
- title,
- nb_printed_lines,
- nb_lines,
- pattern,
- use_regexp ? " [regexp]" : "");
+ move(0, 0);
+ if(with_colors) {
+ attron(COLOR_PAIR(1));
} else {
- sprintf(buffer, "%d/%d pattern: %s%s",
- nb_printed_lines,
- nb_lines,
- pattern,
- use_regexp ? " [regexp]" : "");
+ attron(A_REVERSE);
}
- for(int k = strlen(buffer); k < console_width; k++) buffer[k] = ' ';
+ for(int k = 0; k < console_width; k++) buffer[k] = ' ';
buffer[console_width] = '\0';
+ addnstr(buffer, console_width);
move(0, 0);
+
+ if(title) {
+ addstr(title);
+ addstr(" ");
+ }
+
+ printw("%d/%d ", nb_printed_lines, nb_lines);
+
+ addnstr(pattern, cursor_position);
+
+ // Now we print the cursor. All that mess to have reverse video with
+ // and without color.
+
if(with_colors) {
- attron(COLOR_PAIR(1));
- addnstr(buffer, console_width);
attroff(COLOR_PAIR(1));
+ attron(COLOR_PAIR(3));
+ } else {
+ attroff(A_REVERSE);
+ }
+
+ if(pattern[cursor_position]) {
+ addnstr(&pattern[cursor_position], 1);
+ } else {
+ addstr(" ");
+ }
+
+ if(with_colors) {
+ attroff(COLOR_PAIR(3));
+ attron(COLOR_PAIR(1));
} else {
attron(A_REVERSE);
- addnstr(buffer, console_width);
+ }
+
+ if(pattern[cursor_position]) {
+ addstr(pattern + cursor_position + 1);
+ }
+
+ // Finished printing the cursor
+
+ if(use_regexp) {
+ addstr(" [regexp]");
+ }
+
+ if(with_colors) {
+ attroff(COLOR_PAIR(1));
+ } else {
attroff(A_REVERSE);
}
char pattern[buffer_size];
pattern[0] = '\0';
- int pattern_point;
- pattern_point = 0;
+ int cursor_position;
+ cursor_position = 0;
//////////////////////////////////////////////////////////////////////
// Here we start to display with curse
}
init_pair(1, color_fg_modeline, color_bg_modeline);
init_pair(2, color_fg_highlight, color_bg_highlight);
+ init_pair(3, color_bg_modeline, color_fg_modeline);
} else {
with_colors = 0;
}
int key;
int current_line = 0, temporary_line = 0;
- update_screen(¤t_line, &temporary_line, 0, nb_lines, lines, pattern);
+ update_screen(¤t_line, &temporary_line, 0, nb_lines, lines, cursor_position, pattern);
+
+ // ^@ \000
+ // ^A \001
+ // ...
+ // ^Z \032
+ // ^[ \033
+ // ^\ \034
+ // ^] \035
+ // ^^ \036
+ // ^_ \037
+ // ^? \177
do {
int motion = 0;
- if(key >= ' ' && key <= '~') {
- pattern[pattern_point++] = key;
- pattern[pattern_point] = '\0';
+ if(key >= ' ' && key <= '~') { // Insert character
+ insert_char(pattern, &cursor_position, key);
}
- else if(key == KEY_BACKSPACE || key == '\b' || key == '\7f' ||
- key == KEY_DC || key == '\ 4') {
- if(pattern_point > 0) {
- pattern_point--;
- pattern[pattern_point] = '\0';
- }
+ else if(key == KEY_BACKSPACE || key == '\010' || key == '\177') {
+ backspace_char(pattern, &cursor_position);
+ }
+
+ else if(key == KEY_DC || key == '\004') {
+ delete_char(pattern, &cursor_position);
}
else if(key == KEY_HOME) {
motion = -10;
}
- else if(key == KEY_DOWN || key == '\ e') {
+ else if(key == KEY_DOWN || key == '\014') {
motion = 1;
}
- else if(key == KEY_UP || key == '\10') {
+ else if(key == KEY_UP || key == '\016') {
motion = -1;
}
- else if(key == '\12') {
+ else if(key == KEY_LEFT || key == '\002') {
+ if(cursor_position > 0) cursor_position--;
+ }
+
+ else if(key == KEY_RIGHT || key == '\006') {
+ if(pattern[cursor_position]) cursor_position++;
+ }
+
+ else if(key == '\001') {
+ cursor_position = 0;
+ }
+
+ else if(key == '\005') {
+ cursor_position = strlen(pattern);
+ }
+
+ else if(key == '\022') {
use_regexp = !use_regexp;
}
- else if(key == '\15') {
- pattern_point = 0;
- pattern[pattern_point] = '\0';
+ else if(key == '\025') {
+ kill_before_cursor(pattern, &cursor_position);
+ }
+
+ else if(key == '\013') {
+ kill_after_cursor(pattern, &cursor_position);
}
update_screen(¤t_line, &temporary_line, motion,
- nb_lines, lines, pattern);
+ nb_lines, lines, cursor_position, pattern);
- } while(key != '\n' && key != KEY_ENTER && key != '\a');
+ } while(key != '\n' && key != KEY_ENTER && key != '\007');
echo();
curs_set(1);