diff options
| author |   millert <millert@openbsd.org> | 1999-06-14 02:29:15 +0000 |
|---|---|---|
| committer | millert <millert@openbsd.org> | 1999-06-14 02:29:15 +0000 |
| commit | a22e14e348d0d1fd6025ad1e36987aea1a2f9ed5 (patch) | |
| tree | 1f1ca4235b3db2d1b42f86b90ee3d251b3ab9753 /lib/libcurses/base | |
| parent | ls(1) is now builtin to ftpd(8). Noted by jean@parc.xerox.com; closes PR 858 (diff) | |
| download | wireguard-openbsd-a22e14e348d0d1fd6025ad1e36987aea1a2f9ed5.tar.xz wireguard-openbsd-a22e14e348d0d1fd6025ad1e36987aea1a2f9ed5.zip | |
ncurses-5.0-990612
Diffstat (limited to 'lib/libcurses/base')
| -rw-r--r-- | lib/libcurses/base/lib_endwin.c | 7 | ||||
| -rw-r--r-- | lib/libcurses/base/lib_newterm.c | 33 |
2 files changed, 19 insertions, 21 deletions
diff --git a/lib/libcurses/base/lib_endwin.c b/lib/libcurses/base/lib_endwin.c index 5ebe5a11323..1a6614a3ebc 100644 --- a/lib/libcurses/base/lib_endwin.c +++ b/lib/libcurses/base/lib_endwin.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lib_endwin.c,v 1.1 1999/01/18 19:09:42 millert Exp $ */ +/* $OpenBSD: lib_endwin.c,v 1.2 1999/06/14 02:29:15 millert Exp $ */ /**************************************************************************** * Copyright (c) 1998 Free Software Foundation, Inc. * @@ -44,7 +44,7 @@ #include <curses.priv.h> #include <term.h> -MODULE_ID("$From: lib_endwin.c,v 1.16 1998/09/20 03:29:17 tom Exp $") +MODULE_ID("$From: lib_endwin.c,v 1.17 1999/06/12 23:01:46 tom Exp $") int endwin(void) @@ -56,7 +56,8 @@ endwin(void) SP->_mouse_wrap(SP); _nc_screen_wrap(); _nc_mvcur_wrap(); /* wrap up cursor addressing */ + returnCode(reset_shell_mode()); } - returnCode(reset_shell_mode()); + returnCode(ERR); } diff --git a/lib/libcurses/base/lib_newterm.c b/lib/libcurses/base/lib_newterm.c index ad9819fe8dc..ca2ce25129c 100644 --- a/lib/libcurses/base/lib_newterm.c +++ b/lib/libcurses/base/lib_newterm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lib_newterm.c,v 1.3 1999/03/11 21:03:55 millert Exp $ */ +/* $OpenBSD: lib_newterm.c,v 1.4 1999/06/14 02:29:15 millert Exp $ */ /**************************************************************************** * Copyright (c) 1998 Free Software Foundation, Inc. * @@ -50,7 +50,7 @@ #include <term.h> /* clear_screen, cup & friends, cur_term */ -MODULE_ID("$From: lib_newterm.c,v 1.39 1999/03/03 23:44:22 juergen Exp $") +MODULE_ID("$From: lib_newterm.c,v 1.40 1999/06/12 21:30:39 tom Exp $") #ifndef ONLCR /* Allows compilation under the QNX 4.2 OS */ #define ONLCR 0 @@ -111,22 +111,6 @@ int t = _nc_getenv_num("NCURSES_TRACE"); if (setupterm(term, fileno(ofp), &errret) == ERR) return 0; - /* - * Check for mismatched graphic-rendition capabilities. Most SVr4 - * terminfo trees contain entries that have rmul or rmso equated to - * sgr0 (Solaris curses copes with those entries). We do this only for - * curses, since many termcap applications assume that smso/rmso and - * smul/rmul are paired, and will not function properly if we remove - * rmso or rmul. Curses applications shouldn't be looking at this - * detail. - */ - if (exit_attribute_mode) { -#define SGR0_FIX(mode) if (mode != 0 && !strcmp(mode, exit_attribute_mode)) \ - mode = 0 - SGR0_FIX(exit_underline_mode); - SGR0_FIX(exit_standout_mode); - } - /* implement filter mode */ if (filter_mode) { LINES = 1; @@ -195,6 +179,19 @@ int t = _nc_getenv_num("NCURSES_TRACE"); SP->_keytry = 0; + /* + * Check for mismatched graphic-rendition capabilities. Most SVr4 + * terminfo trees contain entries that have rmul or rmso equated to + * sgr0 (Solaris curses copes with those entries). We do this only for + * curses, since many termcap applications assume that smso/rmso and + * smul/rmul are paired, and will not function properly if we remove + * rmso or rmul. Curses applications shouldn't be looking at this + * detail. + */ +#define SGR0_TEST(mode) (mode != 0) && (exit_attribute_mode == 0 || strcmp(mode, exit_attribute_mode)) + SP->_use_rmso = SGR0_TEST(exit_standout_mode); + SP->_use_rmul = SGR0_TEST(exit_underline_mode); + /* compute movement costs so we can do better move optimization */ _nc_mvcur_init(); |