X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.cc;h=ccc615850d5ea07c110fffb96369e049c845ee45;hb=5fe2c9acdc088859478437ef120042455480b5a6;hp=9c863a4851fcb583d1c104b9cb5119aa69a37d3f;hpb=da5be31b219ede348c3ac884768e39d6d169d7fd;p=selector.git diff --git a/selector.cc b/selector.cc index 9c863a4..ccc6158 100644 --- a/selector.cc +++ b/selector.cc @@ -176,7 +176,9 @@ void free_matcher(matcher_t *matcher) { } } -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); @@ -208,6 +210,65 @@ void initialize_matcher(int use_regexp, int case_sensitive, matcher_t *matcher, } } +////////////////////////////////////////////////////////////////////// +// 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) { @@ -230,6 +291,7 @@ int next_visible(int current_line, int nb_lines, char **lines, matcher_t *matche 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]; @@ -379,32 +441,53 @@ void update_screen(int *current_line, int *temporary_line, int motion, // 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); + + // There must be a more elegant way of moving the cursor at a + // location met during display + + int cursor_x = 0; + + if(title) { + addstr(title); + addstr(" "); + cursor_x += strlen(title) + 1; + } + + sprintf(buffer, "%d/%d ", nb_printed_lines, nb_lines); + addstr(buffer); + cursor_x += strlen(buffer); + + addnstr(pattern, cursor_position); + cursor_x += cursor_position; + + if(pattern[cursor_position]) { + addstr(pattern + cursor_position); + } else { + addstr(" "); + } + + if(use_regexp) { + addstr(" [regexp]"); + } + + move(0, cursor_x); + if(with_colors) { - attron(COLOR_PAIR(1)); - addnstr(buffer, console_width); attroff(COLOR_PAIR(1)); } else { - attron(A_REVERSE); - addnstr(buffer, console_width); attroff(A_REVERSE); } @@ -416,6 +499,78 @@ void update_screen(int *current_line, int *temporary_line, int motion, ////////////////////////////////////////////////////////////////////// +void read_file(const char *input_filename, + int nb_lines_max, int *nb_lines, char **lines, + int hash_table_size, int *hash_table) { + + char buffer[buffer_size], raw_line[buffer_size];; + + ifstream file(input_filename); + + if(file.fail()) { + cerr << "Can not open " << input_filename << endl; + exit(1); + } + + while(*nb_lines < nb_lines_max && !file.eof()) { + + file.getline(raw_line, buffer_size); + + if(raw_line[0]) { + + if(file.fail()) { + cerr << "Line too long:" << endl; + cerr << raw_line << endl; + exit(1); + } + + char *s, *t; + const char *u; + + s = buffer; + t = raw_line; + while(*t) { + u = unctrl(*t++); + while(*u) { *s++ = *u++; } + } + *s = '\0'; + + s = buffer; + + if(zsh_history && *s == ':') { + while(*s && *s != ';') s++; + if(*s == ';') s++; + } + + if(bash_history && (*s == ' ' || (*s >= '0' && *s <= '9'))) { + while(*s == ' ' || (*s >= '0' && *s <= '9')) s++; + } + + int dup; + + if(hash_table) { + dup = test_and_add(s, *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); + } 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 + lines[*nb_lines] = lines[dup]; + lines[dup] = 0; + } + + (*nb_lines)++; + } + } +} + +////////////////////////////////////////////////////////////////////// + int main(int argc, char **argv) { if(!ttyname(STDIN_FILENO)) { @@ -423,7 +578,6 @@ int main(int argc, char **argv) { exit(1); } - char buffer[buffer_size], raw_line[buffer_size];; int color_fg_modeline, color_bg_modeline; int color_fg_highlight, color_bg_highlight; @@ -441,8 +595,9 @@ int main(int argc, char **argv) { int i = 1; int error = 0, show_help = 0; + int rest_are_files = 0; - while(!error && !show_help && i < argc) { + while(!error && !show_help && i < argc && argv[i][0] == '-' && !rest_are_files) { if(strcmp(argv[i], "-o") == 0) { check_opt(argc, argv, i, 1, ""); @@ -525,13 +680,18 @@ int main(int argc, char **argv) { i += 5; } + else if(strcmp(argv[i], "--") == 0) { + rest_are_files = 1; + i++; + } + else if(strcmp(argv[i], "-h") == 0) { show_help = 1; i++; } else { - cerr << "Unknown argument " << argv[i] << "." << endl; + cerr << "Unknown option " << argv[i] << "." << endl; error = 1; } } @@ -542,7 +702,7 @@ int main(int argc, char **argv) { << "Written by Francois Fleuret ." << endl << endl - << "Usage: " << argv[0] << " [options] -f " << endl + << "Usage: " << argv[0] << " [options] [ [ ...]]" << endl << endl << " -h show this help" << endl << " -v inject the selected line in the tty" << endl @@ -553,6 +713,7 @@ int main(int argc, char **argv) { << " -e start in regexp mode" << endl << " -a case sensitive" << endl << " -m monochrome mode" << endl + << " -- rest of the arguments are filenames" << endl << " -t " << endl << " add a title in the modeline" << endl << " -c <fg modeline> <bg modeline> <fg highlight> <bg highlight>" << endl @@ -570,20 +731,7 @@ int main(int argc, char **argv) { char **lines = new char *[nb_lines_max]; - if(!input_filename[0]) { - cerr << "You must specify a input file with -f." << endl; - exit(1); - } - int nb_lines = 0; - - ifstream file(input_filename); - - if(file.fail()) { - cerr << "Can not open " << input_filename << endl; - return 1; - } - int hash_table_size = nb_lines_max * 10; int *hash_table = 0; @@ -591,60 +739,22 @@ int main(int argc, char **argv) { hash_table = new_hash_table(hash_table_size); } - while(nb_lines < nb_lines_max && !file.eof()) { - - file.getline(raw_line, buffer_size); - - if(raw_line[0]) { - - if(file.fail()) { - cerr << "Line too long:" << endl; - cerr << raw_line << endl; - exit(1); - } - - char *s, *t; - const char *u; - - s = buffer; - t = raw_line; - while(*t) { - u = unctrl(*t++); - while(*u) { *s++ = *u++; } - } - *s = '\0'; - - s = buffer; - - if(zsh_history && *s == ':') { - while(*s && *s != ';') s++; - if(*s == ';') s++; - } - - if(bash_history && (*s == ' ' || (*s >= '0' && *s <= '9'))) { - while(*s == ' ' || (*s >= '0' && *s <= '9')) s++; - } - - int dup; - - if(hash_table) { - dup = test_and_add(s, nb_lines, lines, hash_table, hash_table_size); - } else { - dup = -1; - } + // if(i == argc && !input_filename[0]) { + // cerr << "You must provide a filename." << endl; + // exit(1); + // } - if(dup < 0) { - lines[nb_lines] = new char[strlen(s) + 1]; - strcpy(lines[nb_lines], s); - } 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 - lines[nb_lines] = lines[dup]; - lines[dup] = 0; - } + if(input_filename[0]) { + read_file(input_filename, + nb_lines_max, &nb_lines, lines, + hash_table_size, hash_table); + } - nb_lines++; - } + while(i < argc) { + read_file(argv[i], + nb_lines_max, &nb_lines, lines, + hash_table_size, hash_table); + i++; } delete[] hash_table; @@ -657,10 +767,11 @@ int main(int argc, char **argv) { lines[n++] = lines[k]; } } + nb_lines = n; if(inverse_order) { - for(int i = 0; i < nb_lines/2; i++) { + for(int i = 0; i < nb_lines / 2; i++) { char *s = lines[nb_lines - 1 - i]; lines[nb_lines - 1 - i] = lines[i]; lines[i] = s; @@ -669,8 +780,8 @@ int main(int argc, char **argv) { 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 @@ -680,7 +791,7 @@ int main(int argc, char **argv) { noecho(); // Hide the cursor - curs_set(0); + // curs_set(0); // So that the arrow keys work keypad(stdscr, TRUE); @@ -693,13 +804,14 @@ int main(int argc, char **argv) { color_fg_highlight < 0 || color_bg_highlight >= COLORS || color_bg_highlight < 0 || color_bg_highlight >= COLORS) { echo(); - curs_set(1); + // curs_set(1); endwin(); cerr << "Color numbers have to be between 0 and " << COLORS - 1 << "." << endl; exit(1); } 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; } @@ -708,7 +820,7 @@ int main(int argc, char **argv) { 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); do { @@ -716,17 +828,19 @@ int main(int argc, char **argv) { 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 == '' || key == '' || - key == KEY_DC || key == '') { - if(pattern_point > 0) { - pattern_point--; - pattern[pattern_point] = '\0'; - } + else if(key == KEY_BACKSPACE || + key == '\010' || // ^H + key == '\177') { // ^? + backspace_char(pattern, &cursor_position); + } + + else if(key == KEY_DC || + key == '\004') { // ^D + delete_char(pattern, &cursor_position); } else if(key == KEY_HOME) { @@ -745,30 +859,53 @@ int main(int argc, char **argv) { motion = -10; } - else if(key == KEY_DOWN || key == '') { + else if(key == KEY_DOWN || + key == '\016') { // ^N motion = 1; } - else if(key == KEY_UP || key == '') { + else if(key == KEY_UP || + key == '\020') { // ^P motion = -1; } - else if(key == '') { + else if(key == KEY_LEFT || + key == '\002') { // ^B + if(cursor_position > 0) cursor_position--; + } + + else if(key == KEY_RIGHT || + key == '\006') { // ^F + if(pattern[cursor_position]) cursor_position++; + } + + else if(key == '\001') { // ^A + cursor_position = 0; + } + + else if(key == '\005') { // ^E + cursor_position = strlen(pattern); + } + + else if(key == '\022') { // ^R use_regexp = !use_regexp; } - else if(key == '') { - pattern_point = 0; - pattern[pattern_point] = '\0'; + else if(key == '\025') { // ^U + kill_before_cursor(pattern, &cursor_position); + } + + else if(key == '\013') { // ^K + 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 != ''); + } while(key != '\n' && key != KEY_ENTER && key != '\007'); // ^G echo(); - curs_set(1); + // curs_set(1); endwin(); //////////////////////////////////////////////////////////////////////