X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.cc;h=31bf262b48248d9032531c2655e6086c8c6534b1;hb=5096c70784d53b70db47028d7ebc766f8c02f0bf;hp=e21025fff7a54ef51d3d5e160779f834f7f76382;hpb=db57909a08ce6bf9ce426f37a383f7ab0678f171;p=selector.git diff --git a/selector.cc b/selector.cc index e21025f..31bf262 100644 --- a/selector.cc +++ b/selector.cc @@ -24,7 +24,7 @@ // To use it as a super-history-search for bash: // -// alias h='./selector -i -b -v -f <(history)' +// alias h='selector -d -i -b -v -f <(history)' // This software is highly Linux-specific, but I would be glad to get // patches to make it work on other OS @@ -104,20 +104,27 @@ 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 + // hash_table_size is not a multiple of 387433 that should be okay) + for(int k = 0; new_string[k]; k++) { - code += int(new_string[k]) << (8 * k%4); + code = code * 387433 + (unsigned int) (new_string[k]); } code = code % hash_table_size; while(hash_table[code] >= 0) { - if(strcmp(new_string, strings[hash_table[code]]) == 0) return 1; + if(strcmp(new_string, strings[hash_table[code]]) == 0) { + int result = hash_table[code]; + hash_table[code] = new_index; + return result; + } code = (code + 1) % hash_table_size; } hash_table[code] = new_index; - return 0; + return -1; } ////////////////////////////////////////////////////////////////////// @@ -204,12 +211,12 @@ 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, - char *pattern_list) { + char *pattern) { char buffer[buffer_size]; matcher_t matcher; - initialize_matcher(use_regexp, &matcher, pattern_list); + initialize_matcher(use_regexp, &matcher, pattern); // We now take care of printing the lines per se @@ -355,7 +362,7 @@ void update_screen(int *current_line, int *temporary_line, int motion, sprintf(buffer, "%d/%d pattern: %s%s", nb_printed_lines, nb_lines, - pattern_list, + pattern, use_regexp ? " [regexp]" : ""); for(int k = strlen(buffer); k < console_width; k++) buffer[k] = ' '; @@ -381,7 +388,13 @@ void update_screen(int *current_line, int *temporary_line, int motion, ////////////////////////////////////////////////////////////////////// int main(int argc, char **argv) { - char buffer[buffer_size]; + + if(!ttyname(STDIN_FILENO)) { + cerr << "The standard input is not a tty." << endl; + exit(1); + } + + char buffer[buffer_size], raw_line[buffer_size];; int color_fg_modeline, color_bg_modeline; int color_fg_highlight, color_bg_highlight; @@ -398,7 +411,9 @@ int main(int argc, char **argv) { strcpy(output_filename, ""); int i = 1; - while(i < argc) { + int error = 0, show_help = 0; + + while(!error && !show_help && i < argc) { if(strcmp(argv[i], "-o") == 0) { check_opt(argc, argv, i, 1, ""); @@ -433,13 +448,13 @@ int main(int argc, char **argv) { i++; } - else if(strcmp(argv[i], "-z") == 0) { - zsh_history = 1; + else if(strcmp(argv[i], "-b") == 0) { + bash_history = 1; i++; } - else if(strcmp(argv[i], "-b") == 0) { - bash_history = 1; + else if(strcmp(argv[i], "-z") == 0) { + zsh_history = 1; i++; } @@ -468,33 +483,42 @@ int main(int argc, char **argv) { i += 5; } + else if(strcmp(argv[i], "-h") == 0) { + show_help = 1; + i++; + } + else { - cerr << "Selector version " << VERSION - << endl - << "Written by Francois Fleuret " - << endl - << argv[0] - << " [-h]" - << " [-v]" - << " [-m]" - << " [-d]" - << " [-e]" - << " [-z]" - << " [-i]" - << " [-c ]" - << " [-o ]" - << " [-s ]" - << " [-l ]" - << " -f " - << endl; - if(strcmp(argv[i], "-h") == 0) { - exit(0); - } else { - exit(1); - } + cerr << "Unknown argument " << argv[i] << "." << endl; + error = 1; } } + if(show_help || error) { + cerr << "Selector version " << VERSION << "-R" << REVISION_NUMBER + << endl + << "Written by Francois Fleuret ." + << endl + << endl + << argv[0] + << " [-h]" + << " [-v]" + << " [-m]" + << " [-d]" + << " [-e]" + << " [-b]" + << " [-z]" + << " [-i]" + << " [-c ]" + << " [-o ]" + << " [-s ]" + << " [-l ]" + << " -f " + << endl; + + exit(error); + } + char **lines = new char *[nb_lines_max]; if(!input_filename[0]) { @@ -519,9 +543,23 @@ int main(int argc, char **argv) { } while(nb_lines < nb_lines_max && !file.eof()) { - file.getline(buffer, buffer_size); - if(strcmp(buffer, "") != 0) { - char *s = buffer; + + file.getline(raw_line, buffer_size); + + if(strcmp(raw_line, "") != 0) { + + 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++; @@ -532,16 +570,40 @@ int main(int argc, char **argv) { while(*s == ' ' || (*s >= '0' && *s <= '9')) s++; } - if(!hash_table || !test_and_add(s, nb_lines, lines, hash_table, hash_table_size)) { + 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); - nb_lines++; + } else { + // 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++; } } delete[] hash_table; + // Now remove the null strings + + int n = 0; + for(int k = 0; k < nb_lines; k++) { + if(lines[k]) { + lines[n++] = lines[k]; + } + } + nb_lines = n; + if(inverse_order) { for(int i = 0; i < nb_lines/2; i++) { char *s = lines[nb_lines - 1 - i]; @@ -550,13 +612,24 @@ int main(int argc, char **argv) { } } - char patterns[buffer_size]; - patterns[0] = '\0'; - int patterns_point; - patterns_point = 0; + char pattern[buffer_size]; + pattern[0] = '\0'; + int pattern_point; + pattern_point = 0; + + ////////////////////////////////////////////////////////////////////// + // Here we start to display with curse initscr(); + noecho(); + + // Hide the cursor + curs_set(0); + + // So that the arrow keys work + keypad(stdscr, TRUE); + if(with_colors) { if(has_colors()) { start_color(); @@ -577,14 +650,10 @@ int main(int argc, char **argv) { } } - noecho(); - curs_set(0); // Hide the cursor - keypad(stdscr, TRUE); // So that the arrow keys work - int key; int current_line = 0, temporary_line = 0; - update_screen(¤t_line, &temporary_line, 0, nb_lines, lines, patterns); + update_screen(¤t_line, &temporary_line, 0, nb_lines, lines, pattern); do { @@ -593,15 +662,15 @@ int main(int argc, char **argv) { int motion = 0; if(key >= ' ' && key <= '~') { - patterns[patterns_point++] = key; - patterns[patterns_point] = '\0'; + pattern[pattern_point++] = key; + pattern[pattern_point] = '\0'; } else if(key == KEY_BACKSPACE || key == '' || key == '' || key == KEY_DC || key == '') { - if(patterns_point > 0) { - patterns_point--; - patterns[patterns_point] = '\0'; + if(pattern_point > 0) { + pattern_point--; + pattern[pattern_point] = '\0'; } } @@ -621,6 +690,10 @@ int main(int argc, char **argv) { motion = -10; } + else if(key == KEY_DOWN || key == '') { + motion = 1; + } + else if(key == KEY_UP || key == '') { motion = -1; } @@ -629,12 +702,13 @@ int main(int argc, char **argv) { use_regexp = !use_regexp; } - else if(key == KEY_DOWN || key == '') { - motion = 1; + else if(key == '') { + pattern_point = 0; + pattern[pattern_point] = '\0'; } update_screen(¤t_line, &temporary_line, motion, - nb_lines, lines, patterns); + nb_lines, lines, pattern); } while(key != '\n' && key != KEY_ENTER && key != ''); @@ -642,6 +716,9 @@ int main(int argc, char **argv) { curs_set(1); endwin(); + ////////////////////////////////////////////////////////////////////// + // Here we come back to standard display + if((key == KEY_ENTER || key == '\n')) { if(output_to_vt_buffer) {