From b8f22b5a434a67c2e64b831b0ef9236ec32e611a Mon Sep 17 00:00:00 2001 From: Francois Fleuret Date: Thu, 12 Mar 2009 19:01:05 +0100 Subject: [PATCH] Added a no-color mode with inverse A_REVERSE and A_STANDOUT for the modeline and the highlighted line respectively. --- selector.cc | 66 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 38 insertions(+), 28 deletions(-) diff --git a/selector.cc b/selector.cc index 807f1a7..8616f1c 100644 --- a/selector.cc +++ b/selector.cc @@ -49,6 +49,7 @@ int buffer_size = 1024; int nb_lines_max = 10000; char pattern_separator = ';'; int output_to_vt_buffer = 0; +int with_colors = 0; ////////////////////////////////////////////////////////////////////// @@ -231,9 +232,15 @@ void update_screen(int *current_line, int *temporary_line, int motion, // Highlight the highlighted line ... if(l == new_line) { - attron(COLOR_PAIR(2)); - addnstr(buffer, console_width); - attroff(COLOR_PAIR(2)); + if(with_colors) { + attron(COLOR_PAIR(2)); + addnstr(buffer, console_width); + attroff(COLOR_PAIR(2)); + } else { + attron(A_STANDOUT); + addnstr(buffer, console_width); + attroff(A_STANDOUT); + } } else { addnstr(buffer, console_width); } @@ -276,9 +283,15 @@ void update_screen(int *current_line, int *temporary_line, int motion, buffer[console_width] = '\0'; move(0, 0); - attron(COLOR_PAIR(1)); - addnstr(buffer, console_width); - attroff(COLOR_PAIR(1)); + if(with_colors) { + attron(COLOR_PAIR(1)); + addnstr(buffer, console_width); + attroff(COLOR_PAIR(1)); + } else { + attron(A_REVERSE); + addnstr(buffer, console_width); + attroff(A_REVERSE); + } // We are done @@ -389,33 +402,27 @@ int main(int argc, char **argv) { initscr(); - if(!has_colors()) { - cerr << "No colors." << endl; - curs_set(1); - endwin(); - exit(1); + if(has_colors()) { + with_colors = 1; + start_color(); + switch(theme) { + default: + case 0: + init_pair(1, COLOR_WHITE, COLOR_GREEN); + init_pair(2, COLOR_BLACK, COLOR_YELLOW); + break; + case 1: + init_pair(1, COLOR_BLACK, COLOR_GREEN); + init_pair(2, COLOR_BLACK, COLOR_YELLOW); + break; + } } noecho(); - curs_set(0); - keypad(stdscr, TRUE); - - start_color(); - - switch(theme) { - default: - case 0: - init_pair(1, COLOR_WHITE, COLOR_GREEN); - init_pair(2, COLOR_BLACK, COLOR_YELLOW); - break; - case 1: - init_pair(1, COLOR_BLACK, COLOR_GREEN); - init_pair(2, COLOR_BLACK, COLOR_YELLOW); - break; - } + 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, no_blink); @@ -511,5 +518,8 @@ int main(int argc, char **argv) { delete[] lines[l]; } + curs_set(1); + endwin(); + exit(0); } -- 2.39.5