Module Name: src
Committed By: uwe
Date: Mon Jul 6 22:46:50 UTC 2020
Modified Files:
src/lib/libcurses: ins_wch.c ins_wstr.c insch.c insstr.c
Log Message:
mvwins*(WINDOW *win, ...) functions - call wins* on win, not stdscr.
>From Naman Jain in PR lib/55460.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/lib/libcurses/ins_wch.c \
src/lib/libcurses/ins_wstr.c
cvs rdiff -u -r1.25 -r1.26 src/lib/libcurses/insch.c
cvs rdiff -u -r1.7 -r1.8 src/lib/libcurses/insstr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libcurses/ins_wch.c
diff -u src/lib/libcurses/ins_wch.c:1.14 src/lib/libcurses/ins_wch.c:1.15
--- src/lib/libcurses/ins_wch.c:1.14 Sun Jun 9 07:40:14 2019
+++ src/lib/libcurses/ins_wch.c Mon Jul 6 22:46:50 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ins_wch.c,v 1.14 2019/06/09 07:40:14 blymn Exp $ */
+/* $NetBSD: ins_wch.c,v 1.15 2020/07/06 22:46:50 uwe 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.14 2019/06/09 07:40:14 blymn Exp $");
+__RCSID("$NetBSD: ins_wch.c,v 1.15 2020/07/06 22:46:50 uwe Exp $");
#endif /* not lint */
#include <string.h>
@@ -75,7 +75,7 @@ mvwins_wch(WINDOW *win, int y, int x, co
if (wmove(win, y, x) == ERR)
return ERR;
- return wins_wch(stdscr, wch);
+ return wins_wch(win, wch);
}
/*
Index: src/lib/libcurses/ins_wstr.c
diff -u src/lib/libcurses/ins_wstr.c:1.14 src/lib/libcurses/ins_wstr.c:1.15
--- src/lib/libcurses/ins_wstr.c:1.14 Sun Jun 9 07:40:14 2019
+++ src/lib/libcurses/ins_wstr.c Mon Jul 6 22:46:50 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ins_wstr.c,v 1.14 2019/06/09 07:40:14 blymn Exp $ */
+/* $NetBSD: ins_wstr.c,v 1.15 2020/07/06 22:46:50 uwe 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.14 2019/06/09 07:40:14 blymn Exp $");
+__RCSID("$NetBSD: ins_wstr.c,v 1.15 2020/07/06 22:46:50 uwe Exp $");
#endif /* not lint */
#include <string.h>
@@ -96,7 +96,7 @@ mvwins_wstr(WINDOW *win, int y, int x, c
if (wmove(win, y, x) == ERR)
return ERR;
- return wins_wstr(stdscr, wstr);
+ return wins_wstr(win, wstr);
}
/*
@@ -109,7 +109,7 @@ mvwins_nwstr(WINDOW *win, int y, int x,
if (wmove(win, y, x) == ERR)
return ERR;
- return wins_nwstr(stdscr, wstr, n);
+ return wins_nwstr(win, wstr, n);
}
Index: src/lib/libcurses/insch.c
diff -u src/lib/libcurses/insch.c:1.25 src/lib/libcurses/insch.c:1.26
--- src/lib/libcurses/insch.c:1.25 Sun Jun 9 07:40:14 2019
+++ src/lib/libcurses/insch.c Mon Jul 6 22:46:50 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: insch.c,v 1.25 2019/06/09 07:40:14 blymn Exp $ */
+/* $NetBSD: insch.c,v 1.26 2020/07/06 22:46:50 uwe 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.25 2019/06/09 07:40:14 blymn Exp $");
+__RCSID("$NetBSD: insch.c,v 1.26 2020/07/06 22:46:50 uwe Exp $");
#endif
#endif /* not lint */
@@ -79,7 +79,7 @@ mvwinsch(WINDOW *win, int y, int x, chty
if (wmove(win, y, x) == ERR)
return ERR;
- return winsch(stdscr, ch);
+ return winsch(win, ch);
}
#endif
Index: src/lib/libcurses/insstr.c
diff -u src/lib/libcurses/insstr.c:1.7 src/lib/libcurses/insstr.c:1.8
--- src/lib/libcurses/insstr.c:1.7 Sun Jun 9 07:40:14 2019
+++ src/lib/libcurses/insstr.c Mon Jul 6 22:46:50 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: insstr.c,v 1.7 2019/06/09 07:40:14 blymn Exp $ */
+/* $NetBSD: insstr.c,v 1.8 2020/07/06 22:46:50 uwe Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation Inc.
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: insstr.c,v 1.7 2019/06/09 07:40:14 blymn Exp $");
+__RCSID("$NetBSD: insstr.c,v 1.8 2020/07/06 22:46:50 uwe Exp $");
#endif /* not lint */
#include <string.h>
@@ -103,7 +103,7 @@ mvwinsstr(WINDOW *win, int y, int x, con
if (wmove(win, y, x) == ERR)
return ERR;
- return winsstr(stdscr, str);
+ return winsstr(win, str);
}
/*
@@ -117,7 +117,7 @@ mvwinsnstr(WINDOW *win, int y, int x, co
if (wmove(win, y, x) == ERR)
return ERR;
- return winsnstr(stdscr, str, n);
+ return winsnstr(win, str, n);
}
#endif
