From 7281c7b476094a3ce6431cf60b69d092c3242f09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Diego=20Aur=C3=A9lio=20Mesquita?= Date: Fri, 24 Apr 2020 00:46:25 -0300 Subject: [PATCH 2/2] Allow scrollbar colors to be set. --- src/color.c | 2 ++ src/nano.c | 1 + src/nano.h | 1 + src/rcfile.c | 3 +++ src/winio.c | 2 +- 5 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/color.c b/src/color.c index 701dab04..e95a37b2 100644 --- a/src/color.c +++ b/src/color.c @@ -90,6 +90,8 @@ void set_colorpairs(void) } else { if (index == FUNCTION_TAG) interface_color_pair[index] = A_NORMAL; + else if (index == SCROLL_BAR) + interface_color_pair[index] = A_NORMAL; else if (index == GUIDE_STRIPE) interface_color_pair[index] = A_REVERSE; else if (index == ERROR_MESSAGE) { diff --git a/src/nano.c b/src/nano.c index 156843ea..e00ad2b5 100644 --- a/src/nano.c +++ b/src/nano.c @@ -2275,6 +2275,7 @@ int main(int argc, char **argv) interface_color_pair[ERROR_MESSAGE] = hilite_attribute; interface_color_pair[KEY_COMBO] = hilite_attribute; interface_color_pair[FUNCTION_TAG] = A_NORMAL; + interface_color_pair[SCROLL_BAR] = A_NORMAL; #endif /* Set up the terminal state. */ diff --git a/src/nano.h b/src/nano.h index 4bebc506..a8fe0224 100644 --- a/src/nano.h +++ b/src/nano.h @@ -488,6 +488,7 @@ enum ERROR_MESSAGE, KEY_COMBO, FUNCTION_TAG, + SCROLL_BAR, NUMBER_OF_ELEMENTS }; diff --git a/src/rcfile.c b/src/rcfile.c index 5c52e78c..b03e2695 100644 --- a/src/rcfile.c +++ b/src/rcfile.c @@ -129,6 +129,7 @@ static const rcoption rcopts[] = { {"errorcolor", 0}, {"keycolor", 0}, {"functioncolor", 0}, + {"scrollbarcolor", 0}, #endif {NULL, 0} }; @@ -1511,6 +1512,8 @@ void parse_rcfile(FILE *rcstream, bool just_syntax, bool intros_only) color_combo[KEY_COMBO] = parse_interface_color(argument); else if (strcmp(option, "functioncolor") == 0) color_combo[FUNCTION_TAG] = parse_interface_color(argument); + else if (strcmp(option, "scrollbarcolor") == 0) + color_combo[SCROLL_BAR] = parse_interface_color(argument); else #endif #ifdef ENABLE_OPERATINGDIR diff --git a/src/winio.c b/src/winio.c index e817a928..1ea869bc 100644 --- a/src/winio.c +++ b/src/winio.c @@ -2386,7 +2386,7 @@ void draw_scrollbar(void) for (int current_lineno = 0; current_lineno < editwinrows; current_lineno++) { style = (current_lineno >= inf && current_lineno <= sup) ? - A_REVERSE : A_REVERSE|A_DIM; + interface_color_pair[SCROLL_BAR]^A_REVERSE : interface_color_pair[SCROLL_BAR]; wattron(scrollbarwin, style); mvwaddch(scrollbarwin, current_lineno, 0, ' '); wattroff(scrollbarwin, style); -- 2.17.1