//////////////////////////////////////////////////////////////////////
// A quick and dirty hash table
+// The table itself stores index of the strings 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;
result = new int[hash_table_size];
return result;
}
+// 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) {
unsigned int code = 0;
code = code % hash_table_size;
while(hash_table[code] >= 0) {
+ // There is a string with that code
if(strcmp(new_string, strings[hash_table[code]]) == 0) {
+ // It is the same string, we keep a copy of the stored index
int result = hash_table[code];
+ // Put the new one
hash_table[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;
}
+ // This string was not already in there, store the index in the
+ // table and return -1
hash_table[code] = new_index;
-
return -1;
}
}
}
-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);
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);
}
lines[nb_lines] = new char[strlen(s) + 1];
strcpy(lines[nb_lines], s);
} else {
- // We do not allocate a new string but use the pointer to the
- // first occurence of it
+ // 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;
}
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 ^@
+ // \001 ^A
+ // ...
+ // \032 ^Z
+ // \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
+ int c = cursor_position;
+ char t = pattern[c], u;
+ while(t) {
+ c++;
+ u = pattern[c];
+ pattern[c] = t;
+ t = u;
+ }
+ c++;
+ pattern[c] = '\0';
+ pattern[cursor_position++] = key;
+ }
+
+ else if(key == KEY_BACKSPACE || key == '\010' || key == '\177') {
+ if(cursor_position > 0) {
+ if(pattern[cursor_position]) {
+ int c = cursor_position-1;
+ while(pattern[c]) {
+ pattern[c] = pattern[c+1];
+ c++;
+ }
+ } else {
+ pattern[cursor_position - 1] = '\0';
+ }
+ cursor_position--;
+ }
}
- 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_DC || key == '\004') {
+ if(pattern[cursor_position]) {
+ int c = cursor_position;
+ while(pattern[c]) {
+ pattern[c] = pattern[c+1];
+ c++;
+ }
}
}
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') {
+ int s = 0;
+ while(pattern[cursor_position + s]) {
+ pattern[s] = pattern[cursor_position + s];
+ s++;
+ }
+ pattern[s] = '\0';
+ cursor_position = 0;
+ }
+
+ else if(key == '\013') {
+ pattern[cursor_position] = '\0';
}
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);
projects / selector.git / blobdiff