From owner-freebsd-current Sun Sep 8 23:29: 5 2002 Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6F70E37B400; Sun, 8 Sep 2002 23:29:02 -0700 (PDT) Received: from nagual.pp.ru (pobrecita.freebsd.ru [194.87.13.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6BB1043E72; Sun, 8 Sep 2002 23:29:01 -0700 (PDT) (envelope-from ache@pobrecita.freebsd.ru) Received: from pobrecita.freebsd.ru (ache@localhost [127.0.0.1]) by nagual.pp.ru (8.12.5/8.12.5) with ESMTP id g896Spau070784; Mon, 9 Sep 2002 10:28:54 +0400 (MSD) (envelope-from ache@pobrecita.freebsd.ru) Received: (from ache@localhost) by pobrecita.freebsd.ru (8.12.5/8.12.5/Submit) id g896Sn87070782; Mon, 9 Sep 2002 10:28:49 +0400 (MSD) (envelope-from ache) Date: Mon, 9 Sep 2002 10:28:47 +0400 From: "Andrey A. Chernov" To: current@freebsd.org, peter@freebsd.org Subject: Ncurses official patch to solve xterm ac= problem, please commit. Message-ID: <20020909062845.GA70763@nagual.pp.ru> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.1i Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG This patch comes from Thomas. Please commit it to solve missing ACS characters problem with recent XFree entries termcap spam. -------------------------------------------------------------------- This is the change I made to comp_parse.c (compare with similar logic in parse_entry.c): Index: ncurses/tinfo/comp_parse.c Prereq: 1.51 --- ncurses-5.2-20020824+/ncurses/tinfo/comp_parse.c Sat Aug 10 20:59:06 2002 +++ ncurses-5.2-20020901/ncurses/tinfo/comp_parse.c Sat Aug 31 13:14:56 2002 @@ -52,7 +52,7 @@ #include #include -MODULE_ID("$Id: comp_parse.c,v 1.51 2002/08/11 00:59:06 tom Exp $") +MODULE_ID("$Id: comp_parse.c,v 1.52 2002/08/31 17:14:56 tom Exp $") static void sanity_check(TERMTYPE *); NCURSES_IMPEXP void NCURSES_API(*_nc_check_termtype) (TERMTYPE *) = sanity_check; @@ -81,8 +81,8 @@ NCURSES_EXPORT_VAR(ENTRY *) _nc_head = 0; NCURSES_EXPORT_VAR(ENTRY *) _nc_tail = 0; - static void - enqueue(ENTRY * ep) +static void +enqueue(ENTRY * ep) /* add an entry to the in-core list */ { ENTRY *newp = _nc_copy_entry(ep); @@ -461,9 +461,17 @@ || PRESENT(enter_reverse_mode))) _nc_warning("no exit_attribute_mode"); #endif /* __UNUSED__ */ - PAIRED(enter_standout_mode, exit_standout_mode) - PAIRED(enter_underline_mode, exit_underline_mode) + PAIRED(enter_standout_mode, exit_standout_mode); + PAIRED(enter_underline_mode, exit_underline_mode); } + + /* we do this check/fix in postprocess_termcap(), but some packagers + * prefer to bypass it... + */ + if (acs_chars == 0 + && enter_alt_charset_mode != 0 + && exit_alt_charset_mode != 0) + acs_chars = strdup(VT_ACSC); /* listed in structure-member order of first argument */ PAIRED(enter_alt_charset_mode, exit_alt_charset_mode); -- Thomas E. Dickey http://invisible-island.net ftp://invisible-island.net -------------------------------------------------------------------- -- Andrey A. Chernov http://ache.pp.ru/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message