diff options
Diffstat (limited to 'lib/libcurses/base/lib_newterm.c')
| -rw-r--r-- | lib/libcurses/base/lib_newterm.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lib/libcurses/base/lib_newterm.c b/lib/libcurses/base/lib_newterm.c index 6218dfa32a2..ad9819fe8dc 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.2 1999/01/31 20:17:09 millert Exp $ */ +/* $OpenBSD: lib_newterm.c,v 1.3 1999/03/11 21:03:55 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.38 1999/01/31 01:23:25 tom Exp $") +MODULE_ID("$From: lib_newterm.c,v 1.39 1999/03/03 23:44:22 juergen Exp $") #ifndef ONLCR /* Allows compilation under the QNX 4.2 OS */ #define ONLCR 0 @@ -96,6 +96,7 @@ void filter(void) SCREEN * newterm(NCURSES_CONST char *term, FILE *ofp, FILE *ifp) { int errret; +int slk_format = _nc_slk_format; SCREEN* current; #ifdef TRACE int t = _nc_getenv_num("NCURSES_TRACE"); @@ -150,10 +151,11 @@ int t = _nc_getenv_num("NCURSES_TRACE"); We assume that we must simulate, if it is none of the standard formats (4-4 or 3-2-3) for which there may be some hardware support. */ - if (num_labels <= 0 || !SLK_STDFMT) - if (_nc_slk_format) + if (num_labels <= 0 || !SLK_STDFMT(slk_format)) + if (slk_format) { - if (ERR==_nc_ripoffline(-SLK_LINES, _nc_slk_initialize)) + if (ERR==_nc_ripoffline(-SLK_LINES(slk_format), + _nc_slk_initialize)) return 0; } /* this actually allocates the screen structure, and saves the @@ -167,7 +169,7 @@ int t = _nc_getenv_num("NCURSES_TRACE"); } /* if the terminal type has real soft labels, set those up */ - if (_nc_slk_format && num_labels > 0 && SLK_STDFMT) + if (slk_format && num_labels > 0 && SLK_STDFMT(slk_format)) _nc_slk_initialize(stdscr, COLS); SP->_ifd = fileno(ifp); |