Module Name: src
Committed By: roy
Date: Wed Jan 11 10:06:32 UTC 2017
Modified Files:
src/lib/libcurses: refresh.c
Log Message:
Kill stray refs to __virtscr and _cursesi_screen missed in prior commit.
To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/lib/libcurses/refresh.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/refresh.c
diff -u src/lib/libcurses/refresh.c:1.86 src/lib/libcurses/refresh.c:1.87
--- src/lib/libcurses/refresh.c:1.86 Wed Jan 11 09:54:54 2017
+++ src/lib/libcurses/refresh.c Wed Jan 11 10:06:32 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: refresh.c,v 1.86 2017/01/11 09:54:54 roy Exp $ */
+/* $NetBSD: refresh.c,v 1.87 2017/01/11 10:06:32 roy 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.86 2017/01/11 09:54:54 roy Exp $");
+__RCSID("$NetBSD: refresh.c,v 1.87 2017/01/11 10:06:32 roy Exp $");
#endif
#endif /* not lint */
@@ -270,8 +270,9 @@ _wnoutrefresh(WINDOW *win, int begy, int
mx = maxx;
if (mx > *wlp->lastchp - swin->ch_off + 1)
mx = *dwlp->lastchp - dwin->ch_off + 1;
- if (x_off + (mx - wx) > __virtscr->maxx)
- mx -= (x_off + maxx) - __virtscr->maxx;
+ if (x_off + (mx - wx) > screen->__virtscr->maxx)
+ mx -= (x_off + maxx) -
+ screen->__virtscr->maxx;
}
/* Copy line from "win" to "__virtscr". */
@@ -290,8 +291,7 @@ _wnoutrefresh(WINDOW *win, int begy, int
vlp->line[x_off].attr = wlp->line[wx].attr;
/* Check for nca conflict with colour */
if ((vlp->line[x_off].attr & __COLOR) &&
- (vlp->line[x_off].attr &
- _cursesi_screen->nca))
+ (vlp->line[x_off].attr & screen->nca))
vlp->line[x_off].attr &= ~__COLOR;
if (win->flags & __ISDERWIN) {
dwlp->line[dx_off].ch =
@@ -304,7 +304,7 @@ _wnoutrefresh(WINDOW *win, int begy, int
if (wlp->line[wx].ch
== (wchar_t)btowc((int) win->bch)) {
vlp->line[x_off].ch = win->bch;
- SET_WCOL( vlp->line[x_off], 1 );
+ SET_WCOL(vlp->line[x_off], 1);
if (_cursesi_copy_nsp(win->bnsp,
&vlp->line[x_off])
== ERR)
