Module Name: src
Committed By: blymn
Date: Sun Dec 11 21:25:23 UTC 2016
Modified Files:
src/lib/libcurses: copywin.c
Log Message:
Improve debug information.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/lib/libcurses/copywin.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/copywin.c
diff -u src/lib/libcurses/copywin.c:1.15 src/lib/libcurses/copywin.c:1.16
--- src/lib/libcurses/copywin.c:1.15 Wed Jul 22 16:57:14 2009
+++ src/lib/libcurses/copywin.c Sun Dec 11 21:25:22 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: copywin.c,v 1.15 2009/07/22 16:57:14 roy Exp $ */
+/* $NetBSD: copywin.c,v 1.16 2016/12/11 21:25:22 blymn Exp $ */
/*-
* Copyright (c) 1998-1999 Brett Lymn
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: copywin.c,v 1.15 2009/07/22 16:57:14 roy Exp $");
+__RCSID("$NetBSD: copywin.c,v 1.16 2016/12/11 21:25:22 blymn Exp $");
#endif /* not lint */
#include <ctype.h>
@@ -59,6 +59,13 @@ int copywin(const WINDOW *srcwin, WINDOW
nschar_t *np;
#endif /* HAVE_WCHAR */
+#ifdef DEBUG
+ __CTRACE(__CTRACE_WINDOW,
+ "copywin %s mode: from (%d,%d) to (%d,%d-%d,%d)\n",
+ dooverlay ? "overlay" : "overwrite",
+ sminrow, smincol, dminrow, dmincol, dmaxrow, dmaxcol);
+#endif
+
/* overwrite() and overlay() can come here with -ve srcwin coords */
if (sminrow < 0) {
dminrow -= sminrow;
@@ -104,12 +111,18 @@ int copywin(const WINDOW *srcwin, WINDOW
for (; dminrow <= dmaxrow; sminrow++, dminrow++) {
sp = &srcwin->alines[sminrow]->line[smincol];
end = sp + dmaxcol - dmincol;
+#ifdef DEBUG
+ __CTRACE(__CTRACE_WINDOW, "copywin: row %d\n", sminrow);
+#endif
for (dcol = dmincol; sp <= end; dcol++, sp++) {
/* XXX: Perhaps this should check for the
* background character
*/
if ((dooverlay && !isspace(sp->ch)) || !dooverlay) {
wmove(dstwin, dminrow, dcol);
+#ifdef DEBUG
+ __CTRACE(__CTRACE_WINDOW, "copywin: dcol = %d\n", dcol);
+#endif
#ifndef HAVE_WCHAR
__waddch(dstwin, sp);
#else
