 @@ -1,14 +1,14 @@
-/*	$NetBSD: curses_private.h,v 1.62.4.1 2018/09/27 15:12:15 martin Exp $	*/
+/*	$NetBSD: curses_private.h,v 1.62.4.2 2018/10/04 10:20:12 martin Exp $	*/
 /*-
  * Copyright (c) 1998-2000 Brett Lymn
  *                         (blymn@baea.com.au, brett_lymn@yahoo.com.au)
  * All rights reserved.
+ *
  * This code has been donated to The NetBSD Foundation by the Author.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -358,39 +358,40 @@ void	 __init_acs(SCREEN *);
 #ifdef HAVE_WCHAR
 void	 __init_get_wch(SCREEN *);
 void	 __init_wacs(SCREEN *);
 int	__cputwchar_args( wchar_t, void * );
 int     _cursesi_copy_nsp(nschar_t *, struct __ldata *);
 void	__cursesi_free_nsp(nschar_t *);
 void	__cursesi_win_free_nsp(WINDOW *);
 void	__cursesi_putnsp(nschar_t *, const int, const int);
 void	__cursesi_chtype_to_cchar(chtype, cchar_t *);
 #endif /* HAVE_WCHAR */
 int	 __fgetc_resize(FILE *);
 int	 __unget(wint_t);
 int	 __mvcur(int, int, int, int, int);
-WINDOW  *__newwin(SCREEN *, int, int, int, int, int);
+WINDOW  *__newwin(SCREEN *, int, int, int, int, int, int);
 int	 __nodelay(void);
 int	 __notimeout(void);
 void	 __restartwin(void);
 void	 __restore_colors(void);
 void     __restore_cursor_vis(void);
 void     __restore_meta_state(void);
 void	 __restore_termios(void);
 void	 __restore_stophandler(void);
 void	 __restore_winchhandler(void);
-int	 __ripoffscreen(SCREEN *, int *);
+int	 __ripoffscreen(SCREEN *);
-void	 __ripoffresize(SCREEN *);
+int	 __ripoffresize(SCREEN *);
-int	 __rippedlines(const SCREEN *);
+void	 __ripofftouch(SCREEN *);
 int	 __rippedlines(const SCREEN *, int);
 void	 __save_termios(void);
 void	 __set_color(WINDOW *win, attr_t attr);
 void	 __set_stophandler(void);
 void	 __set_winchhandler(void);
 void	 __set_subwin(WINDOW *, WINDOW *);
 int	 __slk_init(SCREEN *);
 void	 __slk_free(SCREEN *);
 int	 __slk_resize(SCREEN *, int cols);
 int	 __slk_noutrefresh(SCREEN *);
 void	 __startwin(SCREEN *);
 void	 __stop_signal_handler(int);
 int	 __stopwin(void);
 void	 __swflags(WINDOW *);

 @@ -1,14 +1,14 @@
-.\"	$NetBSD: curses_screen.3,v 1.23 2017/01/24 16:45:41 roy Exp $
+.\"	$NetBSD: curses_screen.3,v 1.23.4.1 2018/10/04 10:20:12 martin Exp $
 .\"
 .\" Copyright (c) 2002
 .\"	Brett Lymn (blymn@NetBSD.org, brett_lymn@yahoo.com.au)
 .\"
 .\" This code is donated to the NetBSD Foundation by the Author.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 @@ -20,27 +20,27 @@
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .\"
-.Dd January 24, 2017
+.Dd October 2, 2018
 .Dt CURSES_SCREEN 3
 .Os
 .Sh NAME
 .Nm curses_screen ,
 .Nm filter ,
 .Nm ripoffline ,
 .Nm use_env ,
 .Nm newterm ,
 .Nm set_term ,
 .Nm delscreen ,
 .Nm endwin ,
 .Nm initscr ,
 .Nm isendwin ,
 @@ -64,27 +64,27 @@
 .Fn newterm "char *type" "FILE *outfd" "FILE *infd"
 .Ft SCREEN *
 .Fn set_term "SCREEN *screen"
 .Ft void
 .Fn delscreen "SCREEN *screen"
 .Ft int
 .Fn endwin "void"
 .Ft WINDOW *
 .Fn initscr "void"
 .Ft bool
 .Fn isendwin "void"
 .Ft bool
 .Fn is_term_resized "int lines" "int cols"
-.Fn int
+.Ft int
 .Fn resize_term "int lines" "int cols"
 .Ft int
 .Fn resizeterm "int lines" "int cols"
 .Ft int
 .Fn setterm "char *name"
 .Ft int
 .Fn set_tabsize "int value"
 .Pp
 .Va extern int LINES ;
 .Pp
 .Va extern int COLS ;
 .Sh DESCRIPTION
 These functions initialize terminals and screens.
 @@ -206,51 +206,49 @@ or
 .Fn newterm
 performs the following additonal actions:
 .Bl -bullet -compact
 .It
 Disable use of clear, cud, cud1, cup, cuu, cuu1 and vpa.
 .It
 Set the value of the home string to the value of the cr string.
 .It
 Set lines equal to 1.
 .El
 .Pp
 The
 .Fn ripoffline
-funcion will rip a line from
+function will rip a line from
 .Dv stdscr
 at the top if
 .Fa line
 is positive, or at the bottom if negative.
 When
 .Fn initscr
 or
 .Fn newterm
 is called, a window will be created for each line ripped and passed
 to the
 .Fa init
 function pointer alongwith the number of columns in the window.
 This init function cannot use the
 .Dv LINES
 or
 .Dv COLS
 variables and cannot call
 .Xr wrefresh 3
 or
 .Xr doupdate 3 ,
 but may call
 .Xr wnoutrefresh 3 .
 .Dv LINES
 will be reduced by the total number of lines ripped off.
 .Fn ripoffline
 can be called up to five times.
 .Pp
 The
 .Fn use_env
 function determines whether the environment variables
 .Ev LINES
 and
 .Ev COLUMNS
 override the normal values.
 The default is true.
 Any call to
 .Fn use_env

 @@ -1,14 +1,14 @@
-/*	$NetBSD: fileio.c,v 1.5 2016/10/22 21:55:06 christos Exp $	*/
+/*	$NetBSD: fileio.c,v 1.5.6.1 2018/10/04 10:20:12 martin Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Julian Coleman.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -21,27 +21,27 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: fileio.c,v 1.5 2016/10/22 21:55:06 christos Exp $");
+__RCSID("$NetBSD: fileio.c,v 1.5.6.1 2018/10/04 10:20:12 martin Exp $");
 #endif				/* not lint */
 #include "curses.h"
 #include "curses_private.h"
 #include "fileio.h"
 #include <stdio.h>
 #include <stdlib.h>
 #ifdef HAVE_WCHAR
 static int __putnsp(nschar_t *, FILE *);
 static int __getnsp(nschar_t *, FILE *);
 #endif /* HAVE_WCHAR */
 @@ -185,27 +185,27 @@ getwin(FILE *fp)
 		return NULL;
 	if (fread(&minor, sizeof(int), 1, fp) != 1)
 		return NULL;
 	if(major != CURSES_LIB_MAJOR || minor != CURSES_LIB_MINOR)
 		return NULL;
 	/* Window parameters */
 	wtmp = malloc(sizeof(WINDOW));
 	if (wtmp == NULL)
 		return NULL;
 	if (fread(wtmp, sizeof(WINDOW), 1, fp) != 1)
 		goto error0;
 	win = __newwin(_cursesi_screen, wtmp->maxy, wtmp->maxx,
-	    wtmp->begy, wtmp->begx, FALSE);
+	    wtmp->begy, wtmp->begx, FALSE, FALSE);
 	if (win == NULL)
 		goto error0;
 	win->cury = wtmp->cury;
 	win->curx = wtmp->curx;
 	win->reqy = wtmp->reqy;
 	win->reqx = wtmp->reqx;
 	win->flags = wtmp->flags;
 	win->delay = wtmp->delay;
 	win->wattr = wtmp->wattr;
 	win->bch = wtmp->bch;
 	win->battr = wtmp->battr;
 	win->scr_t = wtmp->scr_t;
 	win->scr_b = wtmp->scr_b;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: initscr.c,v 1.32 2017/01/11 17:15:27 roy Exp $	*/
+/*	$NetBSD: initscr.c,v 1.32.6.1 2018/10/04 10:20:12 martin Exp $	*/
 /*
  * Copyright (c) 1981, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -24,27 +24,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)initscr.c	8.2 (Berkeley) 5/4/94";
 #else
-__RCSID("$NetBSD: initscr.c,v 1.32 2017/01/11 17:15:27 roy Exp $");
+__RCSID("$NetBSD: initscr.c,v 1.32.6.1 2018/10/04 10:20:12 martin Exp $");
 #endif
 #endif	/* not lint */
 #include <stdlib.h>
 #include "curses.h"
 #include "curses_private.h"
 /*
  * initscr --
  *	Initialize the current and standard screen.
  */
 @@ -60,16 +60,17 @@ initscr(void)
 	/*
 	 * If My_term is set, or can't find a terminal in the environment,
 	 * use Def_term.
 	 */
 	if (My_term || (sp = getenv("TERM")) == NULL)
 		sp = Def_term;
 	/* LINTED const castaway; newterm does not modify sp! */
 	if ((_cursesi_screen = newterm((char *) sp, stdout, stdin)) == NULL)
 		return NULL;
 	set_term(_cursesi_screen);
 	wrefresh(curscr);
 	__ripofftouch(_cursesi_screen);
 	return stdscr;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: newwin.c,v 1.50 2017/01/06 13:53:18 roy Exp $	*/
+/*	$NetBSD: newwin.c,v 1.50.6.1 2018/10/04 10:20:12 martin Exp $	*/
 /*
  * Copyright (c) 1981, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -24,27 +24,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)newwin.c	8.3 (Berkeley) 7/27/94";
 #else
-__RCSID("$NetBSD: newwin.c,v 1.50 2017/01/06 13:53:18 roy Exp $");
+__RCSID("$NetBSD: newwin.c,v 1.50.6.1 2018/10/04 10:20:12 martin Exp $");
 #endif
 #endif				/* not lint */
 #include <stdlib.h>
 #include "curses.h"
 #include "curses_private.h"
 static WINDOW *__makenew(SCREEN *screen, int nlines, int ncols, int by,
 			 int bx, int sub, int ispad);
 static WINDOW *__subwin(WINDOW *orig, int nlines, int ncols, int by, int bx,
 			 int ispad);
 @@ -75,70 +75,78 @@ subpad(WINDOW *orig, int nlines, int nco
 	    TRUE);
+}
 /*
  * dupwin --
  *      Create a copy of the given window.
  */
 WINDOW *
 dupwin(WINDOW *win)
+{
 	WINDOW *new_one;
 	if ((new_one = __newwin(_cursesi_screen, win->maxy, win->maxx,
-				win->begy, win->begx, FALSE)) == NULL)
+				win->begy, win->begx, FALSE,
 				win == stdscr ? TRUE : FALSE)) == NULL)
 		return NULL;
 	overwrite(win, new_one);
 	return new_one;
+}
 /*
  * newwin --
  *	Allocate space for and set up defaults for a new window.
  */
 WINDOW *
 newwin(int nlines, int ncols, int by, int bx)
+{
-	return __newwin(_cursesi_screen, nlines, ncols, by, bx, FALSE);
+	return __newwin(_cursesi_screen, nlines, ncols, by, bx, FALSE, FALSE);
+}
 /*
  * newpad --
  *	Allocate space for and set up defaults for a new pad.
  */
 WINDOW *
 newpad(int nlines, int ncols)
+{
 	if (nlines < 1 || ncols < 1)
 		return NULL;
-	return __newwin(_cursesi_screen, nlines, ncols, 0, 0, TRUE);
+	return __newwin(_cursesi_screen, nlines, ncols, 0, 0, TRUE, FALSE);
+}
 WINDOW *
-__newwin(SCREEN *screen, int nlines, int ncols, int by, int bx, int ispad)
+__newwin(SCREEN *screen, int nlines, int ncols, int by, int bx, int ispad,
     int isstdscr)
+{
 	WINDOW *win;
 	__LINE *lp;
 	int     i, j;
-	int	maxy, maxx;
+	int	ry, maxy, maxx;
 	__LDATA *sp;
 	if (by < 0 || bx < 0)
 		return NULL;
-	maxy = nlines > 0 ? nlines : LINES - by + nlines;
+	if (isstdscr) {
 		ry = __rippedlines(screen, -1);
 		by += __rippedlines(screen, 1);
 	} else
 		ry = 0;
 	maxy = nlines > 0 ? nlines : LINES - by - ry + nlines;
 	maxx = ncols > 0 ? ncols : COLS - bx + ncols;
 	if ((win = __makenew(screen, maxy, maxx, by, bx, 0, ispad)) == NULL)
 		return NULL;
 	win->bch = ' ';
 	if (__using_color)
 		win->battr = __default_color;
 	else
 		win->battr = 0;
 	win->nextp = win;
 	win->ch_off = 0;
 	win->orig = NULL;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: resize.c,v 1.26.4.1 2018/10/03 17:49:06 martin Exp $	*/
+/*	$NetBSD: resize.c,v 1.26.4.2 2018/10/04 10:20:12 martin Exp $	*/
 /*
  * Copyright (c) 2001
  *	Brett Lymn.
+ *
  * This code has been donated to The NetBSD Foundation by the Author.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -30,27 +30,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)resize.c   blymn 2001/08/26";
 #else
-__RCSID("$NetBSD: resize.c,v 1.26.4.1 2018/10/03 17:49:06 martin Exp $");
+__RCSID("$NetBSD: resize.c,v 1.26.4.2 2018/10/04 10:20:12 martin Exp $");
 #endif
 #endif				/* not lint */
 #include <stdlib.h>
 #include "curses.h"
 #include "curses_private.h"
 static int __resizeterm(WINDOW *win, int nlines, int ncols);
 static int __resizewin(WINDOW *win, int nlines, int ncols);
 /*
  * wresize --
 @@ -166,30 +166,27 @@ resizeterm(int nlines, int ncols)
 	/* Unconditionally inform application screen has been resized. */
 	_cursesi_screen->resized = 1;
 	if (!is_term_resized(nlines, ncols))
 		return OK;
 	result = resize_term(nlines, ncols);
 	/* Screen contents are unknown, libcurses is not libpanel, we don't
 	 * know the correct draw order. */
 	clearok(curscr, TRUE);
 	if (result == OK) {
-		/* We know how to repaint the ripoffs */
+		/* Redraw the soft label keys to the new size. */
 		__ripoffresize(_cursesi_screen);
 		/* We do need to reposition our slks. */
 		__slk_resize(_cursesi_screen, ncols);
 		__slk_noutrefresh(_cursesi_screen);
+	}
 	return result;
+}
 /*
  * resize_term --
  *	Resize the terminal window, resizing the dependent windows.
  */
 int
 resize_term(int nlines, int ncols)
 @@ -199,48 +196,47 @@ resize_term(int nlines, int ncols)
 	int rlines;
 #ifdef	DEBUG
 	__CTRACE(__CTRACE_WINDOW, "resize_term: (%d, %d)\n", nlines, ncols);
 #endif
 	if (!is_term_resized(nlines, ncols))
 		return OK;
 	if (__resizeterm(curscr, nlines, ncols) == ERR)
 		return ERR;
 	if (__resizeterm(__virtscr, nlines, ncols) == ERR)
 		return ERR;
-	rlines = nlines - __rippedlines(_cursesi_screen);
+	rlines = nlines - __rippedlines(_cursesi_screen, 0);
 	if (__resizeterm(stdscr, rlines, ncols) == ERR)
 		return ERR;
 	_cursesi_screen->LINES = nlines;
 	_cursesi_screen->COLS = ncols;
-	LINES = rlines;
+	LINES = nlines;
 	COLS = ncols;
-	if (_cursesi_screen->slk_window != NULL &&
+	/* tweak the flags now that we have updated the LINES and COLS */
 	    __resizewin(_cursesi_screen->slk_window,
 		        _cursesi_screen->slk_window->reqy, ncols) == ERR)
 		return ERR;
 	  /* tweak the flags now that we have updated the LINES and COLS */
 	for (list = _cursesi_screen->winlistp; list != NULL; list = list->nextp) {
 		win = list->winp;
 		if (!(win->flags & __ISPAD))
 			__swflags(win);
+	}
 	/* Resize and re-position the ripped off windows. */
 	if (__ripoffresize(_cursesi_screen) == ERR)
 		return ERR;
 	return OK;
+}
 /*
  * __resizeterm
  *	Setup window for resizing.
  */
 static int
 __resizeterm(WINDOW *win, int nlines, int ncols)
+{
 	int newlines, newcols;
 	newlines = win->reqy;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ripoffline.c,v 1.3 2017/01/24 17:27:30 roy Exp $	*/
+/*	$NetBSD: ripoffline.c,v 1.3.6.1 2018/10/04 10:20:12 martin Exp $	*/
 /*-
  * Copyright (c) 2017 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Roy Marples.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -21,145 +21,169 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: ripoffline.c,v 1.3 2017/01/24 17:27:30 roy Exp $");
+__RCSID("$NetBSD: ripoffline.c,v 1.3.6.1 2018/10/04 10:20:12 martin Exp $");
 #endif				/* not lint */
 #include "curses.h"
 #include "curses_private.h"
 /* List of ripoffline calls */
 static struct ripoff {
 	int	nlines;
 	int	(*init)(WINDOW *, int);
 } ripoffs[MAX_RIPS];
 static int nrips;
 /*
  * ripoffline --
  *	Ripoff a line from the top of bottom of stdscr.
  *	Must be called before initscr or newterm.
  */
 int
 ripoffline(int line, int (*init)(WINDOW *, int))
+{
 #ifdef DEBUG
-	__CTRACE(__CTRACE_SCREEN, "ripoffline: %d\n", line);
+	__CTRACE(__CTRACE_WINDOW, "ripoffline: %d\n", line);
 #endif
 	if (nrips >= MAX_RIPS || init == NULL)
 		return ERR; /* This makes sense, but not standards compliant. */
 	if (line == 0)
 		return OK;
 	ripoffs[nrips].nlines = line < 0 ? -1 : 1;
 	ripoffs[nrips++].init = init;
 	return OK;
+}
 /*
  * __rippedlines --
  *	Returns the number of ripped lines from the screen.
  */
 int
-__rippedlines(const SCREEN *screen)
+__rippedlines(const SCREEN *screen, int line)
+{
 	const struct __ripoff *rip;
 	int i, n;
 	n = 0;
 	for (i = 0, rip = screen->ripped; i < screen->nripped; i++, rip++) {
-		if (rip->nlines < 0)
+		if (line < 1 && rip->nlines < 0)
 			n += -rip->nlines;
-		else
+		else if (line > 0 && rip->nlines > 0)
 			n += rip->nlines;
+	}
 	return n;
+}
 /*
  * __ripoffscreen --
  *	Rips lines from the screen by creating a WINDOW per ripoffline call.
  *	Although the POSIX API only allows for one line WINDOWS to be created,
  *	this implemenation allows for N lines if needed.
  */
 int
-__ripoffscreen(SCREEN *screen, int *rtop)
+__ripoffscreen(SCREEN *screen)
+{
-	int i, nlines;
+	int i, nlines, rbot, rtop;
 	const struct ripoff *srip;
 	struct __ripoff *rip;
 	WINDOW *w;
 	*rtop = 0;
 	rip = screen->ripped;
 	rbot = LINES;
 	rtop = 0;
 	for (i = 0, srip = ripoffs; i < nrips; i++, srip++) {
 		if (srip->nlines == 0)
 			continue;
 		nlines = srip->nlines < 0 ? -srip->nlines : srip->nlines;
 		w = __newwin(screen, nlines, 0,
-		    srip->nlines < 0 ? LINES - nlines : *rtop,
+		    srip->nlines < 0 ? rbot - nlines : rtop,
-, FALSE);
+, FALSE, FALSE);
 		if (w != NULL) {
 			rip->win = w;
 			rip->nlines = srip->nlines;
 			rip++;
 			screen->nripped++;
-			if (rip->nlines > 0)
+			if (srip->nlines > 0)
-				(*rtop) += rip->nlines;
+				rtop += nlines;
-			LINES -= nlines;
+			else
 				rbot -= nlines;
+		}
 		if (srip->init(w, COLS) == ERR)
 			return ERR;
 #ifdef DEBUG
 		if (w != NULL)
-			__CTRACE(__CTRACE_SCREEN,
+			__CTRACE(__CTRACE_WINDOW,
-			    "newterm: ripped %d lines from the %s\n",
+			    "newterm: %p ripped %d line(s) from the %s\n",
-			    nlines, srip->nlines < 0 ? "bottom" : "top");
+			    w, nlines, srip->nlines < 0 ? "bottom" : "top");
 #endif
+	}
 	nrips = 0; /* Reset the stack. */
 	return OK;
+}
 /*
  * __ripoffresize --
  *	Called from resizeterm to ensure the ripped off lines are correctly
  *	placed and refreshed.
  */
-void
+int
 __ripoffresize(SCREEN *screen)
+{
-	int rbot = screen->LINES, i;
+	int rbot = screen->LINES, i, nlines, ret = OK;
 	struct __ripoff *rip;
 	for (i = 0, rip = screen->ripped; i < screen->nripped; i++, rip++) {
-		if (rip->nlines > 0)
+		if (rip->nlines == 0)
-			touchwin(rip->win);
+			continue;
-		else {
+		nlines = rip->nlines < 0 ? -rip->nlines : rip->nlines;
 		if (wresize(rip->win, nlines, screen->COLS) == ERR)
 			ret = ERR;
 		if (rip->nlines < 0) {
 			/* Reposition the lower windows. */
-			mvwin(rip->win, rbot + rip->nlines, 0);
+			if (mvwin(rip->win, rbot + rip->nlines, 0) == ERR)
-			rbot += rip->nlines;
+				ret = ERR;
 			else
 				rbot += rip->nlines;
+		}
+	}
 	return ret;
+}
 /*
  *  __ripofftouch --
  *	Displays the ripped off lines from initscr.
  */
 void
 __ripofftouch(SCREEN *screen)
+{
 	int i;
 	struct __ripoff *rip;
 	for (i = 0, rip = screen->ripped; i < screen->nripped; i++, rip++) {
 		touchwin(rip->win);
 		wnoutrefresh(rip->win);
+	}
+}
 /*
  * __unripoffline --
  *	Used by __slk_init to remove the ripoffline reservation it made
  *	because the terminal natively supports soft label keys.
  */
 int
 __unripoffline(int (*init)(WINDOW *, int))
+{
 	struct ripoff *rip;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: screen.c,v 1.33 2017/03/20 10:20:16 roy Exp $	*/
+/*	$NetBSD: screen.c,v 1.33.4.1 2018/10/04 10:20:12 martin Exp $	*/
 /*
  * Copyright (c) 1981, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -24,27 +24,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)screen.c	8.2 (blymn) 11/27/2001";
 #else
-__RCSID("$NetBSD: screen.c,v 1.33 2017/03/20 10:20:16 roy Exp $");
+__RCSID("$NetBSD: screen.c,v 1.33.4.1 2018/10/04 10:20:12 martin Exp $");
 #endif
 #endif					/* not lint */
 #include <stdlib.h>
 #include "curses.h"
 #include "curses_private.h"
 static int filtered;
 static void	 __delscreen(SCREEN *);
 /*
 @@ -64,44 +64,44 @@ filter(void)
  */
 SCREEN *
 set_term(SCREEN *new)
+{
 	SCREEN *old_screen = _cursesi_screen;
 	if (_cursesi_screen != NULL) {
 		  /* save changes made to the current screen... */
 		old_screen->echoit = __echoit;
 		old_screen->pfast = __pfast;
 		old_screen->rawmode = __rawmode;
 		old_screen->noqch = __noqch;
 		old_screen->COLS = COLS;
-		old_screen->LINES = LINES + __rippedlines(old_screen);
+		old_screen->LINES = LINES;
 		old_screen->ESCDELAY = ESCDELAY;
 		old_screen->TABSIZE = TABSIZE;
 		old_screen->COLORS = COLORS;
 		old_screen->COLOR_PAIRS = COLOR_PAIRS;
 		old_screen->GT = __GT;
 		old_screen->NONL = __NONL;
 		old_screen->UPPERCASE = __UPPERCASE;
+	}
 	_cursesi_screen = new;
 	__echoit = new->echoit;
         __pfast = new->pfast;
 	__rawmode = new->rawmode;
 	__noqch = new->noqch;
 	COLS = new->COLS;
-	LINES = new->LINES - __rippedlines(new);
+	LINES = new->LINES;
 	ESCDELAY = new->ESCDELAY;
 	TABSIZE = new->TABSIZE;
 	COLORS = new->COLORS;
 	COLOR_PAIRS = new->COLOR_PAIRS;
 	__GT = new->GT;
 	__NONL = new->NONL;
 	__UPPERCASE = new->UPPERCASE;
 	_cursesi_resetterm(new);
 	curscr = new->curscr;
 	clearok(curscr, new->clearok);
 	stdscr = new->stdscr;
 @@ -120,27 +120,26 @@ set_term(SCREEN *new)
 	return old_screen;
+}
 /*
  * newterm --
  *      Set up a new screen.
+ *
  */
 SCREEN *
 newterm(char *type, FILE *outfd, FILE *infd)
+{
 	SCREEN *new_screen;
 	char *sp;
 	int rtop;
 	sp = type;
 	if (type == NULL && (sp = getenv("TERM")) == NULL)
 		return NULL;
 	if ((new_screen = calloc(1, sizeof(SCREEN))) == NULL)
 		return NULL;
 #ifdef DEBUG
 	__CTRACE(__CTRACE_INIT, "newterm\n");
 #endif
 	new_screen->infd = infd;
 @@ -183,41 +182,41 @@ newterm(char *type, FILE *outfd, FILE *i
 		goto error_exit;
 	if (_cursesi_setterm((char *)sp, new_screen) == ERR)
 		goto error_exit;
 	/* Need either homing or cursor motion for refreshes */
 	if (!t_cursor_home(new_screen->term) &&
 	    !t_cursor_address(new_screen->term))
 		goto error_exit;
 	new_screen->winlistp = NULL;
 	if ((new_screen->curscr = __newwin(new_screen, 0,
-, 0, 0, FALSE)) == NULL)
+, 0, 0, FALSE, FALSE)) == NULL)
 		goto error_exit;
 	if ((new_screen->__virtscr = __newwin(new_screen, 0,
-, 0, 0, FALSE)) == NULL)
+, 0, 0, FALSE, FALSE)) == NULL)
 		goto error_exit;
 	/* If Soft Label Keys are setup, they will ripoffline. */
 	if (__slk_init(new_screen) == ERR)
 		goto error_exit;
-	if (__ripoffscreen(new_screen, &rtop) == ERR)
+	if (__ripoffscreen(new_screen) == ERR)
 		goto error_exit;
-	new_screen->stdscr = __newwin(new_screen, LINES, 0, rtop, 0, FALSE);
+	new_screen->stdscr = __newwin(new_screen, 0, 0, 0, 0, FALSE, TRUE);
 	if (new_screen->stdscr == NULL)
 		goto error_exit;
 	clearok(new_screen->stdscr, 1);
 	__init_getch(new_screen);
 	__init_acs(new_screen);
 #ifdef HAVE_WCHAR
 	__init_get_wch(new_screen);
 	__init_wacs(new_screen);
 #endif /* HAVE_WCHAR */
 	__set_stophandler();

 @@ -1,14 +1,14 @@
-/*	$NetBSD: setterm.c,v 1.66 2017/03/23 00:55:39 roy Exp $	*/
+/*	$NetBSD: setterm.c,v 1.66.4.1 2018/10/04 10:20:12 martin Exp $	*/
 /*
  * Copyright (c) 1981, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -24,27 +24,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)setterm.c	8.8 (Berkeley) 10/25/94";
 #else
-__RCSID("$NetBSD: setterm.c,v 1.66 2017/03/23 00:55:39 roy Exp $");
+__RCSID("$NetBSD: setterm.c,v 1.66.4.1 2018/10/04 10:20:12 martin Exp $");
 #endif
 #endif /* not lint */
 #include <stdlib.h>
 #include <string.h>
 #include <termios.h>
 #include <unistd.h>
 #include "curses.h"
 #include "curses_private.h"
 static int does_esc_m(const char *cap);
 static int does_ctrl_o(const char *exit_cap, const char *acs_cap);
 @@ -112,27 +112,27 @@ _cursesi_setterm(char *type, SCREEN *scr
 		screen->ESCDELAY = ESCDELAY_DEFAULT;
 	if ((p = getenv("TABSIZE")) != NULL)
 		screen->TABSIZE = (int)strtol(p, NULL, 0);
 	else if (t_init_tabs(screen->term) >= 0)
 		screen->TABSIZE = (int)t_init_tabs(screen->term);
 	else
 		screen->TABSIZE = TABSIZE_DEFAULT;
 	/*
 	 * Want cols > 4, otherwise things will fail.
 	 */
 	if (screen->COLS <= 4)
 		return ERR;
-	LINES = screen->LINES - __rippedlines(screen);
+	LINES = screen->LINES;
 	COLS = screen->COLS;
 	ESCDELAY = screen->ESCDELAY;
 	TABSIZE = screen->TABSIZE;
 #ifdef DEBUG
 	__CTRACE(__CTRACE_INIT,
 	    "setterm: LINES = %d, COLS = %d, TABSIZE = %d\n",
 	    LINES, COLS, TABSIZE);
 #endif
 	/*
 	 * set the pad char, only take the first char of the pc capability
 	 * as this is all we can use.
 @@ -238,27 +238,27 @@ _cursesi_setterm(char *type, SCREEN *scr
 	return unknown ? ERR : OK;
+}
 /*
  * _cursesi_resetterm --
  *  Copy the terminal instance data for the given screen to the global
  *  variables.
  */
 void
 _cursesi_resetterm(SCREEN *screen)
+{
-	LINES = screen->LINES - __rippedlines(screen);
+	LINES = screen->LINES;
 	COLS = screen->COLS;
 	ESCDELAY = screen->ESCDELAY;
 	TABSIZE = screen->TABSIZE;
 	__GT = screen->GT;
 	__noqch = screen->noqch;
 	__mask_op = screen->mask_op;
 	__mask_me = screen->mask_me;
 	__mask_ue = screen->mask_ue;
 	__mask_se = screen->mask_se;
 	set_curterm(screen->term);
+}