Wed Jan 11 17:15:27 2017 UTC ()
Remove setup already done in newterm and even set_term.


(roy)
diff -r1.31 -r1.32 src/lib/libcurses/initscr.c
cvs diff -r1.31 -r1.32 src/lib/libcurses/initscr.c (expand / switch to unified diff)

--- src/lib/libcurses/initscr.c 2017/01/10 10:13:24 1.31
+++ src/lib/libcurses/initscr.c 2017/01/11 17:15:27 1.32
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: initscr.c,v 1.31 2017/01/10 10:13:24 roy Exp $ */ 1/* $NetBSD: initscr.c,v 1.32 2017/01/11 17:15:27 roy Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1981, 1993, 1994 4 * Copyright (c) 1981, 1993, 1994
5 * The Regents of the University of California. All rights reserved. 5 * The Regents of the University of California. All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -24,27 +24,27 @@ @@ -24,27 +24,27 @@
24 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 24 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
25 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 25 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
26 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 26 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
27 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 27 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
28 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 28 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
29 * SUCH DAMAGE. 29 * SUCH DAMAGE.
30 */ 30 */
31 31
32#include <sys/cdefs.h> 32#include <sys/cdefs.h>
33#ifndef lint 33#ifndef lint
34#if 0 34#if 0
35static char sccsid[] = "@(#)initscr.c 8.2 (Berkeley) 5/4/94"; 35static char sccsid[] = "@(#)initscr.c 8.2 (Berkeley) 5/4/94";
36#else 36#else
37__RCSID("$NetBSD: initscr.c,v 1.31 2017/01/10 10:13:24 roy Exp $"); 37__RCSID("$NetBSD: initscr.c,v 1.32 2017/01/11 17:15:27 roy Exp $");
38#endif 38#endif
39#endif /* not lint */ 39#endif /* not lint */
40 40
41#include <stdlib.h> 41#include <stdlib.h>
42 42
43#include "curses.h" 43#include "curses.h"
44#include "curses_private.h" 44#include "curses_private.h"
45 45
46 46
47/* 47/*
48 * initscr -- 48 * initscr --
49 * Initialize the current and standard screen. 49 * Initialize the current and standard screen.
50 */ 50 */
@@ -58,31 +58,18 @@ initscr(void) @@ -58,31 +58,18 @@ initscr(void)
58#endif 58#endif
59 59
60 /* 60 /*
61 * If My_term is set, or can't find a terminal in the environment, 61 * If My_term is set, or can't find a terminal in the environment,
62 * use Def_term. 62 * use Def_term.
63 */ 63 */
64 if (My_term || (sp = getenv("TERM")) == NULL) 64 if (My_term || (sp = getenv("TERM")) == NULL)
65 sp = Def_term; 65 sp = Def_term;
66 66
67 /* LINTED const castaway; newterm does not modify sp! */ 67 /* LINTED const castaway; newterm does not modify sp! */
68 if ((_cursesi_screen = newterm((char *) sp, stdout, stdin)) == NULL) 68 if ((_cursesi_screen = newterm((char *) sp, stdout, stdin)) == NULL)
69 return NULL; 69 return NULL;
70 70
71 __echoit = _cursesi_screen->echoit; 
72 __pfast = _cursesi_screen->pfast; 
73 __rawmode = _cursesi_screen->rawmode; 
74 __noqch = _cursesi_screen->noqch; 
75 COLS = _cursesi_screen->COLS; 
76 LINES = _cursesi_screen->LINES 
77 - _cursesi_screen->ripped_top - _cursesi_screen->ripped_bottom; 
78 COLORS = _cursesi_screen->COLORS; 
79 COLOR_PAIRS = _cursesi_screen->COLOR_PAIRS; 
80 __GT = _cursesi_screen->GT; 
81 __NONL = _cursesi_screen->NONL; 
82 __UPPERCASE = _cursesi_screen->UPPERCASE; 
83 
84 set_term(_cursesi_screen); 71 set_term(_cursesi_screen);
85 wrefresh(curscr); 72 wrefresh(curscr);
86 73
87 return stdscr; 74 return stdscr;
88} 75}