X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.cc;h=ccc615850d5ea07c110fffb96369e049c845ee45;hb=5fe2c9acdc088859478437ef120042455480b5a6;hp=31a73e529b75f7e67a8ce7d277a17bbd4d20a9dc;hpb=a416200cd1ee1d5e4534fca77821b17cf0c8ac37;p=selector.git diff --git a/selector.cc b/selector.cc index 31a73e5..ccc6158 100644 --- a/selector.cc +++ b/selector.cc @@ -442,6 +442,7 @@ void update_screen(int *current_line, int *temporary_line, int motion, // Draw the modeline move(0, 0); + if(with_colors) { attron(COLOR_PAIR(1)); } else { @@ -454,48 +455,36 @@ void update_screen(int *current_line, int *temporary_line, int motion, 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; } - printw("%d/%d ", nb_printed_lines, nb_lines); + sprintf(buffer, "%d/%d ", nb_printed_lines, nb_lines); + addstr(buffer); + cursor_x += strlen(buffer); addnstr(pattern, cursor_position); - - // Now we print the cursor. All that mess to have reverse video with - // and without color. - - if(with_colors) { - attroff(COLOR_PAIR(1)); - attron(COLOR_PAIR(3)); - } else { - attroff(A_REVERSE); - } + cursor_x += cursor_position; if(pattern[cursor_position]) { - addnstr(&pattern[cursor_position], 1); + addstr(pattern + cursor_position); } else { addstr(" "); } - if(with_colors) { - attroff(COLOR_PAIR(3)); - attron(COLOR_PAIR(1)); - } else { - attron(A_REVERSE); - } - - if(pattern[cursor_position]) { - addstr(pattern + cursor_position + 1); - } - - // Finished printing the cursor - if(use_regexp) { addstr(" [regexp]"); } + move(0, cursor_x); + if(with_colors) { attroff(COLOR_PAIR(1)); } else { @@ -510,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)) { @@ -517,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; @@ -535,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, ""); @@ -619,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; } } @@ -636,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 @@ -647,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 @@ -664,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; @@ -685,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(i == argc && !input_filename[0]) { + // cerr << "You must provide a filename." << endl; + // exit(1); + // } - 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; - } + 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; @@ -775,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); @@ -788,7 +804,7 @@ 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); @@ -844,12 +860,12 @@ int main(int argc, char **argv) { } else if(key == KEY_DOWN || - key == '\014') { // ^N + key == '\016') { // ^N motion = 1; } else if(key == KEY_UP || - key == '\016') { // ^P + key == '\020') { // ^P motion = -1; } @@ -889,7 +905,7 @@ int main(int argc, char **argv) { } while(key != '\n' && key != KEY_ENTER && key != '\007'); // ^G echo(); - curs_set(1); + // curs_set(1); endwin(); //////////////////////////////////////////////////////////////////////