Tue Jul 7 12:48:42 2020 UTC ()
Pull up following revision(s) (requested by uwe in ticket #1567):
lib/libcurses/insch.c: revision 1.26
lib/libcurses/ins_wch.c: revision 1.15
lib/libcurses/ins_wstr.c: revision 1.15
lib/libcurses/insstr.c: revision 1.8
mvwins*(WINDOW *win, ...) functions - call wins* on win, not stdscr.
>From Naman Jain in PR lib/55460.
(martin)
diff -r1.11 -r1.11.4.1 src/lib/libcurses/ins_wch.c
diff -r1.11 -r1.11.4.1 src/lib/libcurses/ins_wstr.c
diff -r1.23 -r1.23.6.1 src/lib/libcurses/insch.c
diff -r1.5 -r1.5.6.1 src/lib/libcurses/insstr.c
--- src/lib/libcurses/ins_wch.c 2017/01/31 09:17:53 1.11
+++ src/lib/libcurses/ins_wch.c 2020/07/07 12:48:42 1.11.4.1
@@ -1,4 +1,4 @@
-/* $NetBSD: ins_wch.c,v 1.11 2017/01/31 09:17:53 roy Exp $ */
+/* $NetBSD: ins_wch.c,v 1.11.4.1 2020/07/07 12:48:42 martin Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation Inc.
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: ins_wch.c,v 1.11 2017/01/31 09:17:53 roy Exp $");
+__RCSID("$NetBSD: ins_wch.c,v 1.11.4.1 2020/07/07 12:48:42 martin Exp $");
#endif /* not lint */
#include <string.h>
@@ -86,7 +86,7 @@
if (wmove(win, y, x) == ERR)
return ERR;
- return wins_wch(stdscr, wch);
+ return wins_wch(win, wch);
#endif /* HAVE_WCHAR */
}
--- src/lib/libcurses/ins_wstr.c 2017/01/31 09:17:53 1.11
+++ src/lib/libcurses/ins_wstr.c 2020/07/07 12:48:42 1.11.4.1
@@ -1,4 +1,4 @@
-/* $NetBSD: ins_wstr.c,v 1.11 2017/01/31 09:17:53 roy Exp $ */
+/* $NetBSD: ins_wstr.c,v 1.11.4.1 2020/07/07 12:48:42 martin Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation Inc.
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: ins_wstr.c,v 1.11 2017/01/31 09:17:53 roy Exp $");
+__RCSID("$NetBSD: ins_wstr.c,v 1.11.4.1 2020/07/07 12:48:42 martin Exp $");
#endif /* not lint */
#include <string.h>
@@ -96,7 +96,7 @@
if (wmove(win, y, x) == ERR)
return ERR;
- return wins_wstr(stdscr, wstr);
+ return wins_wstr(win, wstr);
}
/*
@@ -109,7 +109,7 @@
if (wmove(win, y, x) == ERR)
return ERR;
- return wins_nwstr(stdscr, wstr, n);
+ return wins_nwstr(win, wstr, n);
}
--- src/lib/libcurses/insch.c 2017/01/06 13:53:18 1.23
+++ src/lib/libcurses/insch.c 2020/07/07 12:48:42 1.23.6.1
@@ -1,4 +1,4 @@
-/* $NetBSD: insch.c,v 1.23 2017/01/06 13:53:18 roy Exp $ */
+/* $NetBSD: insch.c,v 1.23.6.1 2020/07/07 12:48:42 martin Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)insch.c 8.2 (Berkeley) 5/4/94";
#else
-__RCSID("$NetBSD: insch.c,v 1.23 2017/01/06 13:53:18 roy Exp $");
+__RCSID("$NetBSD: insch.c,v 1.23.6.1 2020/07/07 12:48:42 martin Exp $");
#endif
#endif /* not lint */
@@ -79,7 +79,7 @@
if (wmove(win, y, x) == ERR)
return ERR;
- return winsch(stdscr, ch);
+ return winsch(win, ch);
}
#endif
--- src/lib/libcurses/insstr.c 2017/01/06 13:53:18 1.5
+++ src/lib/libcurses/insstr.c 2020/07/07 12:48:42 1.5.6.1
@@ -1,4 +1,4 @@
-/* $NetBSD: insstr.c,v 1.5 2017/01/06 13:53:18 roy Exp $ */
+/* $NetBSD: insstr.c,v 1.5.6.1 2020/07/07 12:48:42 martin Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation Inc.
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: insstr.c,v 1.5 2017/01/06 13:53:18 roy Exp $");
+__RCSID("$NetBSD: insstr.c,v 1.5.6.1 2020/07/07 12:48:42 martin Exp $");
#endif /* not lint */
#include <string.h>
@@ -103,7 +103,7 @@
if (wmove(win, y, x) == ERR)
return ERR;
- return winsstr(stdscr, str);
+ return winsstr(win, str);
}
/*
@@ -117,7 +117,7 @@
if (wmove(win, y, x) == ERR)
return ERR;
- return winsnstr(stdscr, str, n);
+ return winsnstr(win, str, n);
}
#endif