Date: Mon, 9 Sep 2002 10:28:47 +0400 From: "Andrey A. Chernov" <ache@nagual.pp.ru> 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>
next in thread | raw e-mail | index | archive | help
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 <tic.h>
#include <term_entry.h>
-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 <dickey@invisible-island.net>
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020909062845.GA70763>