ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tweaks: rename a symbol, to better match the corresponding option

master
Benno Schulenberg 2021-03-03 09:39:49 +01:00
parent ac5e5179fb
commit a9ccd99b90
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/color.c
View File

@ -58,7 +58,7 @@ void set_interface_colorpairs(void)
interface_color_pair[index] = A_NORMAL; interface_color_pair[index] = A_NORMAL;
else if (index == GUIDE_STRIPE) else if (index == GUIDE_STRIPE)
interface_color_pair[index] = A_REVERSE; interface_color_pair[index] = A_REVERSE;
else if (index == HIGHLIGHTED) { else if (index == SPOTLIGHTED) {
init_pair(index + 1, COLOR_BLACK, COLOR_YELLOW + (COLORS > 15 ? 8 : 0)); init_pair(index + 1, COLOR_BLACK, COLOR_YELLOW + (COLORS > 15 ? 8 : 0));
interface_color_pair[index] = COLOR_PAIR(index + 1); interface_color_pair[index] = COLOR_PAIR(index + 1);
} else if (index == PROMPT_BAR) } else if (index == PROMPT_BAR)

2
src/definitions.h
View File

@ -282,7 +282,7 @@ enum {
GUIDE_STRIPE, GUIDE_STRIPE,
SCROLL_BAR, SCROLL_BAR,
SELECTED_TEXT, SELECTED_TEXT,
HIGHLIGHTED, SPOTLIGHTED,
PROMPT_BAR, PROMPT_BAR,
STATUS_BAR, STATUS_BAR,
ERROR_MESSAGE, ERROR_MESSAGE,

2
src/nano.c
View File

@ -2325,7 +2325,7 @@ int main(int argc, char **argv)
interface_color_pair[GUIDE_STRIPE] = A_REVERSE; interface_color_pair[GUIDE_STRIPE] = A_REVERSE;
interface_color_pair[SCROLL_BAR] = A_NORMAL; interface_color_pair[SCROLL_BAR] = A_NORMAL;
interface_color_pair[SELECTED_TEXT] = hilite_attribute; interface_color_pair[SELECTED_TEXT] = hilite_attribute;
interface_color_pair[HIGHLIGHTED] = A_REVERSE; interface_color_pair[SPOTLIGHTED] = A_REVERSE;
interface_color_pair[PROMPT_BAR] = hilite_attribute; interface_color_pair[PROMPT_BAR] = hilite_attribute;
interface_color_pair[STATUS_BAR] = hilite_attribute; interface_color_pair[STATUS_BAR] = hilite_attribute;
interface_color_pair[ERROR_MESSAGE] = hilite_attribute; interface_color_pair[ERROR_MESSAGE] = hilite_attribute;

2
src/rcfile.c
View File

@ -1559,7 +1559,7 @@ void parse_rcfile(FILE *rcstream, bool just_syntax, bool intros_only)
else if (strcmp(option, "selectedcolor") == 0) else if (strcmp(option, "selectedcolor") == 0)
color_combo[SELECTED_TEXT] = parse_interface_color(argument); color_combo[SELECTED_TEXT] = parse_interface_color(argument);
else if (strcmp(option, "spotlightcolor") == 0) else if (strcmp(option, "spotlightcolor") == 0)
color_combo[HIGHLIGHTED] = parse_interface_color(argument); color_combo[SPOTLIGHTED] = parse_interface_color(argument);
else if (strcmp(option, "promptcolor") == 0) else if (strcmp(option, "promptcolor") == 0)
color_combo[PROMPT_BAR] = parse_interface_color(argument); color_combo[PROMPT_BAR] = parse_interface_color(argument);
else if (strcmp(option, "statuscolor") == 0) else if (strcmp(option, "statuscolor") == 0)

8
src/winio.c
View File

@ -3504,11 +3504,11 @@ void spotlight(size_t from_col, size_t to_col)
word = display_string(openfile->current->data, from_col, word = display_string(openfile->current->data, from_col,
to_col - from_col, FALSE, overshoots); to_col - from_col, FALSE, overshoots);
wattron(edit, interface_color_pair[HIGHLIGHTED]); wattron(edit, interface_color_pair[SPOTLIGHTED]);
waddnstr(edit, word, actual_x(word, to_col)); waddnstr(edit, word, actual_x(word, to_col));
if (overshoots) if (overshoots)
mvwaddch(edit, openfile->current_y, COLS - 1 - thebar, '>'); mvwaddch(edit, openfile->current_y, COLS - 1 - thebar, '>');
wattroff(edit, interface_color_pair[HIGHLIGHTED]); wattroff(edit, interface_color_pair[SPOTLIGHTED]);
free(word); free(word);
} }
@ -3544,9 +3544,9 @@ void spotlight_softwrapped(size_t from_col, size_t to_col)
word = display_string(openfile->current->data, from_col, word = display_string(openfile->current->data, from_col,
break_col - from_col, FALSE, FALSE); break_col - from_col, FALSE, FALSE);
wattron(edit, interface_color_pair[HIGHLIGHTED]); wattron(edit, interface_color_pair[SPOTLIGHTED]);
waddnstr(edit, word, actual_x(word, break_col)); waddnstr(edit, word, actual_x(word, break_col));
wattroff(edit, interface_color_pair[HIGHLIGHTED]); wattroff(edit, interface_color_pair[SPOTLIGHTED]);
free(word); free(word);