$NetBSD: patch-aa,v 1.5 2002/06/28 08:42:35 agc Exp $ --- netconsole/build_display.c.orig Thu Jul 13 11:13:37 2000 +++ netconsole/build_display.c Thu Jul 13 11:15:26 2000 @@ -59,7 +59,7 @@ #include "netconsole.h" -#define WFULL(w) (w->_cury == (w->_maxy - 1)) ? 1:0 +#define WFULL(w) (getcury(w) == (getmaxy(w) - 1)) ? 1:0 build_display () { @@ -229,8 +229,8 @@ "\n(DEBUG): frozen = %s, quiet = %s\n", frozen ? "YES" : "NO", quiet ? "YES" : "NO" ); wprintw(aw.wmsg, - "(DEBUG): Term= %s, LINES= %d, COLS= %d, Datadir= %s", ttytype, - LINES, COLS, datadir) ; /* ttytype in curses.h */ + "(DEBUG): LINES= %d, COLS= %d, Datadir= %s", + LINES, COLS, datadir) ; wclrtoeol(aw.wmsg); } @@ -238,8 +238,8 @@ * Am calling touchwin() since its foolproof (see discussion above) */ touchwin (aw.wmain); - y = aw.wprompt->_cury + aw.wprompt->_begy ; /* force cursor loc.. */ - x = aw.wprompt->_curx + aw.wprompt->_begx ; /* ..to prompt window */ + y = getcury(aw.wprompt) + getbegy(aw.wprompt); /* force cursor loc.. */ + x = getcurx(aw.wprompt) + getbegx(aw.wprompt); /* ..to prompt window */ wmove(aw.wmain, y, x); wrefresh (aw.wmain); /* Onto screen */ return (0) ;