From 8c815d3bfa923bec6f60ba2d0cb8c0af2efd6352 Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Tue, 6 Feb 2024 08:50:12 +0200 Subject: [PATCH] Init petattr in core, not in curses My recent change to petattr caused a crash in curses when no petattr was used in config file - because curses was setting petattr to curses-specific value. Init the setting in core instead. --- src/options.c | 1 + win/curses/cursinit.c | 11 ----------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/options.c b/src/options.c index a5255c365..93e63de59 100644 --- a/src/options.c +++ b/src/options.c @@ -6813,6 +6813,7 @@ initoptions_init(void) iflags.wc_align_status = ALIGN_BOTTOM; /* used by tty and curses */ iflags.wc2_statuslines = 2; + iflags.wc2_petattr = ATR_INVERSE; /* only used by curses */ iflags.wc2_windowborders = 2; /* 'Auto' */ diff --git a/win/curses/cursinit.c b/win/curses/cursinit.c index 59ccbc1c0..28fe2fd15 100644 --- a/win/curses/cursinit.c +++ b/win/curses/cursinit.c @@ -779,17 +779,6 @@ curses_init_options(void) /* FIXME: this overrides explicit OPTIONS=!use_inverse */ iflags.wc_inverse = TRUE; /* aka iflags.use_inverse; default is False */ - /* fix up pet highlighting */ - if (iflags.wc2_petattr == -1) /* shouldn't happen */ - iflags.wc2_petattr = A_NORMAL; - if (iflags.wc2_petattr != A_NORMAL) { - /* Pet attribute specified, so hilite_pet should be true */ - iflags.hilite_pet = TRUE; - } else if (iflags.hilite_pet) { - /* pet highlighting specified, so don't leave petattr at A_NORMAL */ - iflags.wc2_petattr = A_REVERSE; - } - /* curses doesn't support 's' (single message at a time; successive ^P's go back to earlier messages) and 'c' (combination; single on first and second of consecutive ^P's, full on third) */