Module Name: src
Committed By: blymn
Date: Tue Oct 19 06:41:03 UTC 2021
Modified Files:
src/lib/libcurses: addnstr.c border.c move.c newwin.c
Log Message:
Add a bit more debug.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/lib/libcurses/addnstr.c
cvs rdiff -u -r1.20 -r1.21 src/lib/libcurses/border.c
cvs rdiff -u -r1.22 -r1.23 src/lib/libcurses/move.c
cvs rdiff -u -r1.62 -r1.63 src/lib/libcurses/newwin.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/addnstr.c
diff -u src/lib/libcurses/addnstr.c:1.19 src/lib/libcurses/addnstr.c:1.20
--- src/lib/libcurses/addnstr.c:1.19 Mon Sep 6 07:45:48 2021
+++ src/lib/libcurses/addnstr.c Tue Oct 19 06:41:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: addnstr.c,v 1.19 2021/09/06 07:45:48 rin Exp $ */
+/* $NetBSD: addnstr.c,v 1.20 2021/10/19 06:41:03 blymn Exp $ */
/*
* Copyright (c) 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)addnstr.c 8.2 (Berkeley) 5/4/94";
#else
-__RCSID("$NetBSD: addnstr.c,v 1.19 2021/09/06 07:45:48 rin Exp $");
+__RCSID("$NetBSD: addnstr.c,v 1.20 2021/10/19 06:41:03 blymn Exp $");
#endif
#endif /* not lint */
@@ -136,6 +136,7 @@ waddnstr(WINDOW *win, const char *s, int
const char *p;
__CTRACE(__CTRACE_INPUT, "ADDNSTR: win %p, length %d\n", win, n);
+ __CTRACE(__CTRACE_INPUT, "ADDNSTR: string %s\n", s);
/*
* behavior changed from traditional BSD curses, for better XCURSES
* conformance.
Index: src/lib/libcurses/border.c
diff -u src/lib/libcurses/border.c:1.20 src/lib/libcurses/border.c:1.21
--- src/lib/libcurses/border.c:1.20 Mon Sep 6 07:45:48 2021
+++ src/lib/libcurses/border.c Tue Oct 19 06:41:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: border.c,v 1.20 2021/09/06 07:45:48 rin Exp $ */
+/* $NetBSD: border.c,v 1.21 2021/10/19 06:41:03 blymn Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: border.c,v 1.20 2021/09/06 07:45:48 rin Exp $");
+__RCSID("$NetBSD: border.c,v 1.21 2021/10/19 06:41:03 blymn Exp $");
#endif /* not lint */
#include <stdlib.h>
@@ -87,6 +87,7 @@ wborder(WINDOW *win, chtype left, chtype
if (!(botright & __CHARTEXT))
botright |= ACS_LRCORNER;
+ __CTRACE(__CTRACE_INPUT, "wborder: window 0x%p\n", win);
__CTRACE(__CTRACE_INPUT, "wborder: left = %c, 0x%x\n",
left & __CHARTEXT, left & __ATTRIBUTES);
__CTRACE(__CTRACE_INPUT, "wborder: right = %c, 0x%x\n",
@@ -237,6 +238,7 @@ int wborder_set(WINDOW *win, const cchar
else
memcpy(&botright, WACS_LRCORNER, sizeof(cchar_t));
+ __CTRACE(__CTRACE_INPUT, "wborder_set: window 0x%p\n", win);
__CTRACE(__CTRACE_INPUT, "wborder_set: left = %c, 0x%x\n",
left.vals[0], left.attributes );
__CTRACE(__CTRACE_INPUT, "wborder_set: right = %c, 0x%x\n",
Index: src/lib/libcurses/move.c
diff -u src/lib/libcurses/move.c:1.22 src/lib/libcurses/move.c:1.23
--- src/lib/libcurses/move.c:1.22 Mon Sep 6 07:03:50 2021
+++ src/lib/libcurses/move.c Tue Oct 19 06:41:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: move.c,v 1.22 2021/09/06 07:03:50 rin Exp $ */
+/* $NetBSD: move.c,v 1.23 2021/10/19 06:41:03 blymn Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)move.c 8.2 (Berkeley) 5/4/94";
#else
-__RCSID("$NetBSD: move.c,v 1.22 2021/09/06 07:03:50 rin Exp $");
+__RCSID("$NetBSD: move.c,v 1.23 2021/10/19 06:41:03 blymn Exp $");
#endif
#endif /* not lint */
@@ -62,7 +62,7 @@ move(int y, int x)
int
wmove(WINDOW *win, int y, int x)
{
- __CTRACE(__CTRACE_MISC, "wmove: (%d, %d)\n", y, x);
+ __CTRACE(__CTRACE_MISC, "wmove: win %p, (%d, %d)\n", win, y, x);
if (x < 0 || y < 0)
return ERR;
if (x >= win->maxx || y >= win->maxy)
Index: src/lib/libcurses/newwin.c
diff -u src/lib/libcurses/newwin.c:1.62 src/lib/libcurses/newwin.c:1.63
--- src/lib/libcurses/newwin.c:1.62 Tue Sep 7 01:23:09 2021
+++ src/lib/libcurses/newwin.c Tue Oct 19 06:41:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: newwin.c,v 1.62 2021/09/07 01:23:09 rin Exp $ */
+/* $NetBSD: newwin.c,v 1.63 2021/10/19 06:41:03 blymn Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)newwin.c 8.3 (Berkeley) 7/27/94";
#else
-__RCSID("$NetBSD: newwin.c,v 1.62 2021/09/07 01:23:09 rin Exp $");
+__RCSID("$NetBSD: newwin.c,v 1.63 2021/10/19 06:41:03 blymn Exp $");
#endif
#endif /* not lint */
@@ -365,6 +365,8 @@ __makenew(SCREEN *screen, int nlines, in
win->smaxx = 0;
} else
__swflags(win);
+ __CTRACE(__CTRACE_WINDOW, "makenew: sub = %d\n", sub);
+ __CTRACE(__CTRACE_WINDOW, "makenew: ispad = %d\n", ispad);
__CTRACE(__CTRACE_WINDOW, "makenew: win->wattr = %08x\n", win->wattr);
__CTRACE(__CTRACE_WINDOW, "makenew: win->flags = %#.4x\n", win->flags);
__CTRACE(__CTRACE_WINDOW, "makenew: win->maxy = %d\n", win->maxy);
