mirrors/nano
1
0
Fork 0
mirror of git://git.sv.gnu.org/nano.git synced 2024-11-23 13:19:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

tweaks: elide two ifs for the most likely case, when defaults are allowed

Browse Source
This commit is contained in:
Benno Schulenberg 2020-06-13 13:50:23 +02:00
parent 23460bc6a8
commit 454dc6e1ec
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/color.c
View File

@ -72,10 +72,12 @@ void set_interface_colorpairs(void)
colortype *combo = color_combo[index];
if (combo != NULL) {
if (combo->fg == USE_THE_DEFAULT && !defaults_allowed)
if (!defaults_allowed) {
if (combo->fg == USE_THE_DEFAULT)
combo->fg = COLOR_WHITE;
if (combo->bg == USE_THE_DEFAULT && !defaults_allowed)
if (combo->bg == USE_THE_DEFAULT)
combo->bg = COLOR_BLACK;
}
init_pair(index + 1, combo->fg, combo->bg);
interface_color_pair[index] = COLOR_PAIR(index + 1) | A_BANDAID |
combo->attributes;
@ -107,11 +109,13 @@ void prepare_palette(void)
foreground = ink->fg;
background = ink->bg;
if (foreground == USE_THE_DEFAULT && !defaults_allowed)
if (!defaults_allowed) {
if (foreground == USE_THE_DEFAULT)
foreground = COLOR_WHITE;
if (background == USE_THE_DEFAULT && !defaults_allowed)
if (background == USE_THE_DEFAULT)
background = COLOR_BLACK;
}
init_pair(ink->pairnum, foreground, background);
}