X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.cc;h=9c669f78e0dba5f161abf52b49720d7f93c1fd22;hb=8c08e0c2af99b1855d857c29c84b81bef5ef3de5;hp=0278589a8914ecf788b3798c48088479a2ed4489;hpb=55f0e8ae89c54546a16a308c1a2080d16a89b811;p=selector.git diff --git a/selector.cc b/selector.cc index 0278589..9c669f7 100644 --- a/selector.cc +++ b/selector.cc @@ -23,12 +23,8 @@ */ // To use it as a super-history-search for bash: -// // 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 - #include #include @@ -60,16 +56,14 @@ int use_regexp = 0; ////////////////////////////////////////////////////////////////////// -// This looks severely Linux-only ... - -void inject_into_tty_buffer(char *line) { +void inject_into_tty_buffer(char *string) { struct termios oldtio, newtio; - tcgetattr(STDIN_FILENO,&oldtio); + tcgetattr(STDIN_FILENO, &oldtio); memset(&newtio, 0, sizeof(newtio)); // Set input mode (non-canonical, *no echo*,...) tcsetattr(STDIN_FILENO, TCSANOW, &newtio); - // Put the selected line in the tty input buffer - for(char *k = line; *k; k++) { + // Put the selected string in the tty input buffer + for(char *k = string; *k; k++) { ioctl(STDIN_FILENO, TIOCSTI, k); } // Restore the old settings @@ -114,13 +108,17 @@ int test_and_add(char *new_string, int new_index, 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; } ////////////////////////////////////////////////////////////////////// @@ -207,12 +205,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 @@ -358,7 +356,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] = ' '; @@ -384,7 +382,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; @@ -438,13 +442,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++; } @@ -487,21 +491,27 @@ int main(int argc, char **argv) { if(show_help || error) { cerr << "Selector version " << VERSION << "-R" << REVISION_NUMBER << endl - << "Written by Francois Fleuret " + << "Written by Francois Fleuret ." << endl - << argv[0] - << " [-h]" - << " [-v]" - << " [-m]" - << " [-d]" - << " [-e]" - << " [-z]" - << " [-i]" - << " [-c ]" - << " [-o ]" - << " [-s ]" - << " [-l ]" - << " -f " + << endl + << "Usage: " << argv[0] << " [options] -f " << endl + << endl + << " -h show this help" << endl + << " -v inject the selected line in the tty" << endl + << " -d remove duplicated lines" << endl + << " -b remove the bash history line prefix" << endl + << " -z remove the zsh history line prefix" << endl + << " -i invert the order of lines" << endl + << " -e start in regexp mode" << endl + << " -m monochrome mode" << endl + << " -c " << endl + << " set the display colors" << endl + << " -o " << endl + << " set a file to write the selected line to" << endl + << " -s " << endl + << " set the symbol to separate substrings in the pattern" << endl + << " -l " << endl + << " set the maximum number of lines to take into account" << endl << endl; exit(error); @@ -531,9 +541,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(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++; @@ -544,16 +568,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]; @@ -562,13 +610,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(); @@ -589,14 +648,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 { @@ -605,15 +660,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'; } } @@ -633,6 +688,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; } @@ -642,16 +701,12 @@ int main(int argc, char **argv) { } else if(key == '') { - patterns_point = 0; - patterns[patterns_point] = '\0'; - } - - else if(key == KEY_DOWN || key == '') { - motion = 1; + 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 != ''); @@ -659,6 +714,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) {