Module Name: src
Committed By: roy
Date: Mon Oct 3 12:32:15 UTC 2011
Modified Files:
src/lib/libcurses: color.c cr_put.c refresh.c
Log Message:
Use tiparm instead of vtparm.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/lib/libcurses/color.c
cvs rdiff -u -r1.30 -r1.31 src/lib/libcurses/cr_put.c
cvs rdiff -u -r1.74 -r1.75 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/color.c
diff -u src/lib/libcurses/color.c:1.37 src/lib/libcurses/color.c:1.38
--- src/lib/libcurses/color.c:1.37 Thu Jan 6 11:29:40 2011
+++ src/lib/libcurses/color.c Mon Oct 3 12:32:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: color.c,v 1.37 2011/01/06 11:29:40 blymn Exp $ */
+/* $NetBSD: color.c,v 1.38 2011/10/03 12:32:15 roy Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: color.c,v 1.37 2011/01/06 11:29:40 blymn Exp $");
+__RCSID("$NetBSD: color.c,v 1.38 2011/10/03 12:32:15 roy Exp $");
#endif /* not lint */
#include "curses.h"
@@ -536,12 +536,12 @@ __set_color( /*ARGSUSED*/ WINDOW *win, a
_cursesi_screen->colour_pairs[pair].back < 0)
__unset_color(curscr);
if (_cursesi_screen->colour_pairs[pair].fore >= 0)
- tputs(vtparm(t_set_a_foreground(_cursesi_screen->term),
- _cursesi_screen->colour_pairs[pair].fore),
+ tputs(tiparm(t_set_a_foreground(_cursesi_screen->term),
+ (int)_cursesi_screen->colour_pairs[pair].fore),
0, __cputchar);
if (_cursesi_screen->colour_pairs[pair].back >= 0)
- tputs(vtparm(t_set_a_background(_cursesi_screen->term),
- _cursesi_screen->colour_pairs[pair].back),
+ tputs(tiparm(t_set_a_background(_cursesi_screen->term),
+ (int)_cursesi_screen->colour_pairs[pair].back),
0, __cputchar);
break;
case COLOR_HP:
@@ -555,12 +555,12 @@ __set_color( /*ARGSUSED*/ WINDOW *win, a
_cursesi_screen->colour_pairs[pair].back < 0)
__unset_color(curscr);
if (_cursesi_screen->colour_pairs[pair].fore >= 0)
- tputs(vtparm(t_set_foreground(_cursesi_screen->term),
- _cursesi_screen->colour_pairs[pair].fore),
+ tputs(tiparm(t_set_foreground(_cursesi_screen->term),
+ (int)_cursesi_screen->colour_pairs[pair].fore),
0, __cputchar);
if (_cursesi_screen->colour_pairs[pair].back >= 0)
- tputs(vtparm(t_set_background(_cursesi_screen->term),
- _cursesi_screen->colour_pairs[pair].back),
+ tputs(tiparm(t_set_background(_cursesi_screen->term),
+ (int)_cursesi_screen->colour_pairs[pair].back),
0, __cputchar);
break;
}
Index: src/lib/libcurses/cr_put.c
diff -u src/lib/libcurses/cr_put.c:1.30 src/lib/libcurses/cr_put.c:1.31
--- src/lib/libcurses/cr_put.c:1.30 Fri Feb 12 10:06:15 2010
+++ src/lib/libcurses/cr_put.c Mon Oct 3 12:32:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cr_put.c,v 1.30 2010/02/12 10:06:15 roy Exp $ */
+/* $NetBSD: cr_put.c,v 1.31 2011/10/03 12:32:15 roy Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)cr_put.c 8.3 (Berkeley) 5/4/94";
#else
-__RCSID("$NetBSD: cr_put.c,v 1.30 2010/02/12 10:06:15 roy Exp $");
+__RCSID("$NetBSD: cr_put.c,v 1.31 2011/10/03 12:32:15 roy Exp $");
#endif
#endif /* not lint */
@@ -165,7 +165,7 @@ fgoto(in_refresh)
destline = outline;
if (cursor_address &&
- (cgp = t_vparm(NULL, cursor_address, destline, destcol)))
+ (cgp = tiparm(cursor_address, destline, destcol)))
{
/*
* Need this condition due to inconsistent behavior
Index: src/lib/libcurses/refresh.c
diff -u src/lib/libcurses/refresh.c:1.74 src/lib/libcurses/refresh.c:1.75
--- src/lib/libcurses/refresh.c:1.74 Thu Jun 16 22:45:46 2011
+++ src/lib/libcurses/refresh.c Mon Oct 3 12:32:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: refresh.c,v 1.74 2011/06/16 22:45:46 jdc Exp $ */
+/* $NetBSD: refresh.c,v 1.75 2011/10/03 12:32:15 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.74 2011/06/16 22:45:46 jdc Exp $");
+__RCSID("$NetBSD: refresh.c,v 1.75 2011/10/03 12:32:15 roy Exp $");
#endif
#endif /* not lint */
@@ -1573,18 +1573,18 @@ scrolln(starts, startw, curs, bot, top)
top > 3 || bot + 3 < __virtscr->maxy) &&
scroll_forward != NULL)))
{
- tputs(vtparm(change_scroll_region, top, bot),
+ tputs(tiparm(change_scroll_region, top, bot),
0, __cputchar);
__mvcur(oy, ox, 0, 0, 1);
tputs(cursor_home, 0, __cputchar);
__mvcur(0, 0, bot, 0, 1);
if (parm_index != NULL)
- tputs(vtparm(parm_index, n),
+ tputs(tiparm(parm_index, n),
0, __cputchar);
else
for (i = 0; i < n; i++)
tputs(scroll_forward, 0, __cputchar);
- tputs(vtparm(change_scroll_region,
+ tputs(tiparm(change_scroll_region,
0, (int) __virtscr->maxy - 1), 0, __cputchar);
__mvcur(bot, 0, 0, 0, 1);
tputs(cursor_home, 0, __cputchar);
@@ -1595,11 +1595,11 @@ scrolln(starts, startw, curs, bot, top)
/* Scroll up the block. */
if (parm_index != NULL && top == 0) {
__mvcur(oy, ox, bot, 0, 1);
- tputs(vtparm(parm_index, n), 0, __cputchar);
+ tputs(tiparm(parm_index, n), 0, __cputchar);
} else
if (parm_delete_line != NULL) {
__mvcur(oy, ox, top, 0, 1);
- tputs(vtparm(parm_delete_line, n),
+ tputs(tiparm(parm_delete_line, n),
0, __cputchar);
} else
if (delete_line != NULL) {
@@ -1619,7 +1619,7 @@ scrolln(starts, startw, curs, bot, top)
/* Push down the bottom region. */
__mvcur(top, 0, bot - n + 1, 0, 1);
if (parm_insert_line != NULL)
- tputs(vtparm(parm_insert_line, n), 0, __cputchar);
+ tputs(tiparm(parm_insert_line, n), 0, __cputchar);
else
if (insert_line != NULL)
for (i = 0; i < n; i++)
@@ -1641,19 +1641,19 @@ scrolln(starts, startw, curs, bot, top)
top > 3 ||
bot + 3 < __virtscr->maxy) && scroll_reverse != NULL)))
{
- tputs(vtparm(change_scroll_region, top, bot),
+ tputs(tiparm(change_scroll_region, top, bot),
0, __cputchar);
__mvcur(oy, ox, 0, 0, 1);
tputs(cursor_home, 0, __cputchar);
__mvcur(0, 0, top, 0, 1);
if (parm_rindex != NULL)
- tputs(vtparm(parm_rindex, -n),
+ tputs(tiparm(parm_rindex, -n),
0, __cputchar);
else
for (i = n; i < 0; i++)
tputs(scroll_reverse, 0, __cputchar);
- tputs(vtparm(change_scroll_region,
+ tputs(tiparm(change_scroll_region,
0, (int) __virtscr->maxy - 1), 0, __cputchar);
__mvcur(top, 0, 0, 0, 1);
tputs(cursor_home, 0, __cputchar);
@@ -1664,10 +1664,10 @@ scrolln(starts, startw, curs, bot, top)
/* Preserve the bottom lines. */
__mvcur(oy, ox, bot + n + 1, 0, 1);
if (parm_rindex != NULL && bot == __virtscr->maxy)
- tputs(vtparm(parm_rindex, -n), 0, __cputchar);
+ tputs(tiparm(parm_rindex, -n), 0, __cputchar);
else
if (parm_delete_line != NULL)
- tputs(vtparm(parm_delete_line, -n),
+ tputs(tiparm(parm_delete_line, -n),
0, __cputchar);
else
if (delete_line != NULL)
@@ -1686,7 +1686,7 @@ scrolln(starts, startw, curs, bot, top)
/* Scroll the block down. */
__mvcur(bot + n + 1, 0, top, 0, 1);
if (parm_insert_line != NULL)
- tputs(vtparm(parm_insert_line, -n), 0, __cputchar);
+ tputs(tiparm(parm_insert_line, -n), 0, __cputchar);
else
if (insert_line != NULL)
for (i = n; i < 0; i++)
