X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=selector.git;a=blobdiff_plain;f=selector.c;h=72f1aa14b52768c108fca3f69413771fd2a802ef;hp=ddddb112f95f0f6f596365354154950388401b80;hb=df265bb4dd467140eccb177e6fc05f100699b203;hpb=5f6df6ed91c745f06cdaec8983a7b1485994da39 diff --git a/selector.c b/selector.c index ddddb11..72f1aa1 100644 --- a/selector.c +++ b/selector.c @@ -571,7 +571,6 @@ int next_visible(int current_line, int nb_lines, char **lines, /*********************************************************************/ void print_string_with_switches(char *buffer, int line_width, - int console_width, int nb_patterns, int *switches) { int w, current = 0, next; if(switches) { @@ -590,10 +589,10 @@ void print_string_with_switches(char *buffer, int line_width, } } if(current < line_width) { - addnstr(buffer + current, console_width - current); + addnstr(buffer + current, line_width - current); } } else { - addnstr(buffer, console_width); + addnstr(buffer, line_width); } } @@ -741,36 +740,36 @@ void update_screen(int *current_focus_line, int *displayed_focus_line, if(l == new_focus_line) { if(show_long_lines && k >= console_width) { - if(console_width >= 4) { - buffer[console_width - 4] = ' '; - buffer[console_width - 3] = '.'; - buffer[console_width - 2] = '.'; - buffer[console_width - 1] = '.'; - } + attron(attr_focus_line); + print_string_with_switches(buffer, console_width-1, + nb_switches / 2, switches); + /* attron(attr_error); */ + addnstr("\\", 1); + /* attroff(attr_error); */ + attroff(attr_focus_line); } else { while(k < console_width) { buffer[k++] = ' '; } + attron(attr_focus_line); + print_string_with_switches(buffer, k, + nb_switches / 2, switches); + attroff(attr_focus_line); } - attron(attr_focus_line); - print_string_with_switches(buffer, k, console_width, - nb_switches / 2, switches); - attroff(attr_focus_line); } else { if(show_long_lines && k >= console_width) { - if(console_width >= 4) { - buffer[console_width - 4] = ' '; - buffer[console_width - 3] = '.'; - buffer[console_width - 2] = '.'; - buffer[console_width - 1] = '.'; - } + print_string_with_switches(buffer, console_width-1, + nb_switches / 2, switches); + attron(attr_focus_line); + addnstr("\\", 1); + attroff(attr_focus_line); } else { buffer[k++] = '\n'; buffer[k++] = '\0'; - } - print_string_with_switches(buffer, k, console_width, - nb_switches / 2, switches); + print_string_with_switches(buffer, k, + nb_switches / 2, switches); + } } nb_printed_lines++;