From 2d1696c3f298576c111fb085bab6f930d017f46e Mon Sep 17 00:00:00 2001 From: Francois Fleuret Date: Sat, 14 Mar 2009 11:51:39 +0100 Subject: [PATCH] Removed all the no-blink hacks, which did not work anyway. --- selector.cc | 36 +++++++++--------------------------- 1 file changed, 9 insertions(+), 27 deletions(-) diff --git a/selector.cc b/selector.cc index 56e6a23..0062a3b 100644 --- a/selector.cc +++ b/selector.cc @@ -126,8 +126,7 @@ int next_visible(int current_line, int nb_lines, char **lines, int nb_patterns, void update_screen(int *current_line, int *temporary_line, int motion, int nb_lines, char **lines, - char *pattern_list, - int no_blink) { + char *pattern_list) { char buffer[buffer_size]; @@ -197,9 +196,7 @@ void update_screen(int *current_line, int *temporary_line, int motion, } } - if(!no_blink) { - clear(); - } + clear(); use_default_colors(); @@ -254,7 +251,7 @@ void update_screen(int *current_line, int *temporary_line, int motion, // We fill the rest of the line with blanks if either we did // not clear() or if this is the highlighted line - if(no_blink || l == new_line) { + if(l == new_line) { while(k < console_width) { buffer[k++] = ' '; } @@ -295,18 +292,6 @@ void update_screen(int *current_line, int *temporary_line, int motion, nb_printed_lines++; } - if(no_blink) { // Erase the rest of the window. That's slightly ugly. - int k = 0; - while(k < console_width) { - buffer[k++] = ' '; - } - buffer[k++] = '\n'; - buffer[k++] = '\0'; - for(int l = nb_printed_lines; l < console_height; l++) { - addnstr(buffer, console_width); - } - } - // Draw the modeline sprintf(buffer, "%d/%d pattern: %s", @@ -338,7 +323,6 @@ void update_screen(int *current_line, int *temporary_line, int motion, int main(int argc, char **argv) { char buffer[buffer_size]; char *lines[nb_lines_max]; - int no_blink = 0; int color_fg_modeline, color_bg_modeline; int color_fg_highlight, color_bg_highlight; @@ -385,11 +369,6 @@ int main(int argc, char **argv) { i += 2; } - // else if(strcmp(argv[i], "-b") == 0) { - // no_blink = 1; - // i++; - // } - else if(strcmp(argv[i], "-i") == 0) { inverse_order = 1; i++; @@ -520,7 +499,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, patterns, no_blink); + update_screen(¤t_line, &temporary_line, 0, nb_lines, lines, patterns); do { @@ -533,7 +512,8 @@ int main(int argc, char **argv) { patterns[patterns_point] = '\0'; } - else if(key == KEY_BACKSPACE || key == KEY_DC || key == '') { + else if(key == KEY_BACKSPACE || key == '' || + key == KEY_DC || key == '') { if(patterns_point > 0) { patterns_point--; patterns[patterns_point] = '\0'; @@ -565,7 +545,7 @@ int main(int argc, char **argv) { } update_screen(¤t_line, &temporary_line, motion, - nb_lines, lines, patterns, no_blink); + nb_lines, lines, patterns); } while(key != '\n' && key != KEY_ENTER && key != ''); @@ -574,6 +554,7 @@ int main(int argc, char **argv) { endwin(); if((key == KEY_ENTER || key == '\n')) { + if(output_to_vt_buffer) { if(temporary_line >= 0 && temporary_line < nb_lines) { inject_into_tty_buffer(lines[temporary_line]); @@ -594,6 +575,7 @@ int main(int argc, char **argv) { } out.flush(); } + } for(int l = 0; l < nb_lines; l++) { -- 2.39.5