From 2cfe37a36a234e0557536cbb9768976df7a8ae94 Mon Sep 17 00:00:00 2001 From: nick black Date: Tue, 26 Oct 2021 09:46:44 -0400 Subject: [PATCH] tighten up init banner's terminfo version --- src/lib/banner.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/lib/banner.c b/src/lib/banner.c index af71f2943..206f25a9e 100644 --- a/src/lib/banner.c +++ b/src/lib/banner.c @@ -57,7 +57,11 @@ int init_banner(const notcurses* nc, fbuf* f){ 14 % nc->tcache.caps.colors : 0x2080e0); fbuf_putc(f, '+'); } - fbuf_printf(f, "%u colors" NL "%s%s%s (%s)" NL "%sterminfo from %s zlib %s GPM %s" NL, + // we want the terminfo version, which is tied to ncurses + const char* ncursesver = curses_version(); + const char* ncver = strchr(ncursesver, ' '); + ncver = ncver ? ncver + 1 : ncursesver; + fbuf_printf(f, "%u colors" NL "%s%s%s (%s)" NL "%sterminfo %s zlib %s GPM %s" NL, nc->tcache.caps.colors, clreol, #ifdef __clang__ "", // name is contained in __VERSION__ @@ -78,7 +82,7 @@ int init_banner(const notcurses* nc, fbuf* f){ #else #error "No __BYTE_ORDER__ definition" #endif - clreol, curses_version(), zlibVersion(), gpm_version()); + clreol, ncver, zlibVersion(), gpm_version()); fbuf_puts(f, clreol); // for ncvisual banner ncvisual_printbanner(f); init_banner_warnings(nc, f, clreol);