From d94521fb5b5a5c3a6315c425dba5f1218f0dd323 Mon Sep 17 00:00:00 2001 From: Robin Haberkorn Date: Sun, 28 Dec 2025 13:03:16 +0100 Subject: Curses: use INDIC_SQUIGGLE to render rubbed-out command lines * This is still rendered as underlined text. * It uses a new Scinterm upstream feature, so we can switch back to the upstream repo. --- .gitmodules | 2 +- contrib/scinterm | 2 +- src/interface-curses/interface.c | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index af9fd68..841ce77 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,7 +4,7 @@ ignore = untracked [submodule "scinterm"] path = contrib/scinterm - url = https://github.com/rhaberkorn/scinterm.git + url = https://github.com/orbitalquark/scinterm.git [submodule "lexilla"] path = contrib/lexilla url = https://github.com/ScintillaOrg/lexilla.git diff --git a/contrib/scinterm b/contrib/scinterm index 5639aa0..8a0e888 160000 --- a/contrib/scinterm +++ b/contrib/scinterm @@ -1 +1 @@ -Subproject commit 5639aa0cc0939cd3f5fdd27003f97df703f87c6d +Subproject commit 8a0e888a87e760eec05224b93fdd8ea3c3be40f1 diff --git a/src/interface-curses/interface.c b/src/interface-curses/interface.c index 833b564..93a5bd5 100644 --- a/src/interface-curses/interface.c +++ b/src/interface-curses/interface.c @@ -439,11 +439,9 @@ teco_interface_init(void) teco_cmdline_init(); /* * The default INDIC_STRIKE wouldn't be visible. - * Instead we use INDIC_STRAIGHTBOX, which will be rendered as underlined if - * the alpha is 0. + * Instead we use INDIC_SQUIGGLE, which is rendered as A_UNDERLINE. */ - teco_cmdline_ssm(SCI_INDICSETSTYLE, INDICATOR_RUBBEDOUT, INDIC_STRAIGHTBOX); - teco_cmdline_ssm(SCI_INDICSETALPHA, INDICATOR_RUBBEDOUT, 0); + teco_cmdline_ssm(SCI_INDICSETSTYLE, INDICATOR_RUBBEDOUT, INDIC_SQUIGGLE); /* * On all platforms except Curses/XTerm, it's -- cgit v1.2.3