Module Name: src
Committed By: blymn
Date: Wed Apr 24 07:09:44 UTC 2019
Modified Files:
src/lib/libcurses: add_wch.c refresh.c touchwin.c
Log Message:
Add/improve debug output for some routines.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/libcurses/add_wch.c
cvs rdiff -u -r1.107 -r1.108 src/lib/libcurses/refresh.c
cvs rdiff -u -r1.30 -r1.31 src/lib/libcurses/touchwin.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/add_wch.c
diff -u src/lib/libcurses/add_wch.c:1.6 src/lib/libcurses/add_wch.c:1.7
--- src/lib/libcurses/add_wch.c:1.6 Thu Nov 22 22:16:45 2018
+++ src/lib/libcurses/add_wch.c Wed Apr 24 07:09:44 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: add_wch.c,v 1.6 2018/11/22 22:16:45 uwe Exp $ */
+/* $NetBSD: add_wch.c,v 1.7 2019/04/24 07:09:44 blymn Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation Inc.
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: add_wch.c,v 1.6 2018/11/22 22:16:45 uwe Exp $");
+__RCSID("$NetBSD: add_wch.c,v 1.7 2019/04/24 07:09:44 blymn Exp $");
#endif /* not lint */
#include <stdlib.h>
@@ -101,7 +101,8 @@ wadd_wch(WINDOW *win, const cchar_t *wch
for (i = 0; i < win->maxy; i++) {
assert(win->alines[i]->sentinel == SENTINEL_VALUE);
}
- __CTRACE(__CTRACE_INPUT, "wadd_wch: win(%p)\n", win);
+ __CTRACE(__CTRACE_INPUT, "wadd_wch: win(%p), x: %d, y: %d\n",
+ win, x, y);
#endif
lnp = win->alines[y];
return _cursesi_addwchar(win, &lnp, &y, &x, wch, 1);
Index: src/lib/libcurses/refresh.c
diff -u src/lib/libcurses/refresh.c:1.107 src/lib/libcurses/refresh.c:1.108
--- src/lib/libcurses/refresh.c:1.107 Fri Mar 29 18:32:45 2019
+++ src/lib/libcurses/refresh.c Wed Apr 24 07:09:44 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: refresh.c,v 1.107 2019/03/29 18:32:45 roy Exp $ */
+/* $NetBSD: refresh.c,v 1.108 2019/04/24 07:09:44 blymn Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)refresh.c 8.7 (Berkeley) 8/13/94";
#else
-__RCSID("$NetBSD: refresh.c,v 1.107 2019/03/29 18:32:45 roy Exp $");
+__RCSID("$NetBSD: refresh.c,v 1.108 2019/04/24 07:09:44 blymn Exp $");
#endif
#endif /* not lint */
@@ -251,14 +251,19 @@ _wnoutrefresh(WINDOW *win, int begy, int
"_wnoutrefresh: wy %d\tf %d\tl %d\tflags %x\n",
wy, *wlp->firstchp, *wlp->lastchp, wlp->flags);
- if ((dwin->flags & __ISDERWIN) != 0) {
- __CTRACE(__CTRACE_REFRESH,
- "_wnoutrefresh: derwin wy %d\tf %d\tl %d\tflags %x\n",
- dy_off, *dwlp->firstchp, *dwlp->lastchp, dwlp->flags);
- __CTRACE(__CTRACE_REFRESH,
- "_wnoutrefresh: derwin maxx %d\tch_off %d\n",
- dwin->maxx, dwin->ch_off);
- }
+ char *_wintype;
+
+ if ((dwin->flags & __ISDERWIN) != 0)
+ _wintype = "derwin";
+ else
+ _wintype = "dwin";
+
+ __CTRACE(__CTRACE_REFRESH,
+ "_wnoutrefresh: %s wy %d\tf %d\tl %d\tflags %x\n",
+ _wintype, dy_off, *dwlp->firstchp, *dwlp->lastchp, dwlp->flags);
+ __CTRACE(__CTRACE_REFRESH,
+ "_wnoutrefresh: %s maxx %d\tch_off %d\n",
+ _wintype, dwin->maxx, dwin->ch_off);
#endif
if (((wlp->flags & (__ISDIRTY | __ISFORCED)) == 0) &&
((dwlp->flags & (__ISDIRTY | __ISFORCED)) == 0))
Index: src/lib/libcurses/touchwin.c
diff -u src/lib/libcurses/touchwin.c:1.30 src/lib/libcurses/touchwin.c:1.31
--- src/lib/libcurses/touchwin.c:1.30 Fri Jan 6 13:53:18 2017
+++ src/lib/libcurses/touchwin.c Wed Apr 24 07:09:44 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: touchwin.c,v 1.30 2017/01/06 13:53:18 roy Exp $ */
+/* $NetBSD: touchwin.c,v 1.31 2019/04/24 07:09:44 blymn Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)touchwin.c 8.2 (Berkeley) 5/4/94";
#else
-__RCSID("$NetBSD: touchwin.c,v 1.30 2017/01/06 13:53:18 roy Exp $");
+__RCSID("$NetBSD: touchwin.c,v 1.31 2019/04/24 07:09:44 blymn Exp $");
#endif
#endif /* not lint */
@@ -67,6 +67,10 @@ is_linetouched(WINDOW *win, int line)
if (line > win->maxy)
return FALSE;
+#ifdef DEBUG
+ __CTRACE(__CTRACE_LINE, "is_linetouched: (%p, line %d, dirty %d)\n",
+ win, line, (win->alines[line]->flags & __ISDIRTY));
+#endif
return (win->alines[line]->flags & __ISDIRTY) != 0;
}
@@ -106,6 +110,10 @@ is_wintouched(WINDOW *win)
{
int y, maxy;
+#ifdef DEBUG
+ __CTRACE(__CTRACE_LINE, "is_wintouched: (%p, maxy %d)\n", win,
+ win->maxy);
+#endif
maxy = win->maxy;
for (y = 0; y < maxy; y++) {
if (is_linetouched(win, y) == TRUE)
