Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Use tiparm instead of vtparm.
details: https://anonhg.NetBSD.org/src/rev/5a7c0e5f1fc1
branches: trunk
changeset: 770095:5a7c0e5f1fc1
user: roy <roy%NetBSD.org@localhost>
date: Mon Oct 03 12:32:15 2011 +0000
description:
Use tiparm instead of vtparm.
diffstat:
games/hack/hack.terminfo.c | 8 ++++----
games/larn/io.c | 14 +++++++-------
games/tetris/screen.c | 4 ++--
lib/libcurses/color.c | 20 ++++++++++----------
lib/libcurses/cr_put.c | 6 +++---
lib/libcurses/refresh.c | 28 ++++++++++++++--------------
usr.bin/tset/set.c | 6 +++---
7 files changed, 43 insertions(+), 43 deletions(-)
diffs (truncated from 328 to 300 lines):
diff -r 1f7064e32618 -r 5a7c0e5f1fc1 games/hack/hack.terminfo.c
--- a/games/hack/hack.terminfo.c Mon Oct 03 12:31:51 2011 +0000
+++ b/games/hack/hack.terminfo.c Mon Oct 03 12:32:15 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: hack.terminfo.c,v 1.1 2010/02/03 15:34:38 roy Exp $ */
+/* $NetBSD: hack.terminfo.c,v 1.2 2011/10/03 12:32:28 roy Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: hack.terminfo.c,v 1.1 2010/02/03 15:34:38 roy Exp $");
+__RCSID("$NetBSD: hack.terminfo.c,v 1.2 2011/10/03 12:32:28 roy Exp $");
#endif /* not lint */
#include <string.h>
@@ -126,7 +126,7 @@
{
char *p;
- p = vtparm(cursor_address, y - 1, x - 1);
+ p = tiparm(cursor_address, y - 1, x - 1);
if (p) {
xputs(p);
cury = y;
@@ -246,7 +246,7 @@
if (cursor_home)
xputs(cursor_home);
- else if ((cursor_address) && (out = vtparm(cursor_address, 0, 0)))
+ else if ((cursor_address) && (out = tiparm(cursor_address, 0, 0)))
xputs(out);
else
curs(1, 1); /* using UP ... */
diff -r 1f7064e32618 -r 5a7c0e5f1fc1 games/larn/io.c
--- a/games/larn/io.c Mon Oct 03 12:31:51 2011 +0000
+++ b/games/larn/io.c Mon Oct 03 12:32:15 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: io.c,v 1.25 2010/02/03 15:34:39 roy Exp $ */
+/* $NetBSD: io.c,v 1.26 2011/10/03 12:32:28 roy Exp $ */
/*
* io.c Larn is copyrighted 1986 by Noah Morgan.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: io.c,v 1.25 2010/02/03 15:34:39 roy Exp $");
+__RCSID("$NetBSD: io.c,v 1.26 2011/10/03 12:32:28 roy Exp $");
#endif /* not lint */
#include "header.h"
@@ -831,7 +831,7 @@
case CURSOR:
curx = *++str - 1;
cury = *++str - 1;
- tputs(vtparm(cursor_address,
+ tputs(tiparm(cursor_address,
cury, curx), 0, ttputch);
break;
@@ -845,7 +845,7 @@
if (++scrline > 23)
scrline = 19;
- tputs(vtparm(
+ tputs(tiparm(
cursor_address,
scrline, 0),
0, ttputch);
@@ -854,20 +854,20 @@
if (--scrline < 19)
scrline = 23;
- tputs(vtparm(
+ tputs(tiparm(
cursor_address,
scrline, 0),
0, ttputch);
tputs(clr_eol, 0,
ttputch);
} else {
- tputs(vtparm(
+ tputs(tiparm(
cursor_address,
19, 0),
0, ttputch);
tputs(delete_line, 0,
ttputch);
- tputs(vtparm(
+ tputs(tiparm(
cursor_address,
23, 0),
0, ttputch);
diff -r 1f7064e32618 -r 5a7c0e5f1fc1 games/tetris/screen.c
--- a/games/tetris/screen.c Mon Oct 03 12:31:51 2011 +0000
+++ b/games/tetris/screen.c Mon Oct 03 12:32:15 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: screen.c,v 1.26 2010/02/03 15:34:39 roy Exp $ */
+/* $NetBSD: screen.c,v 1.27 2011/10/03 12:32:28 roy Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -89,7 +89,7 @@
{
char *buf;
- buf = vtparm(cursor_address, r, c);
+ buf = tiparm(cursor_address, r, c);
if (buf != NULL)
putpad(buf);
}
diff -r 1f7064e32618 -r 5a7c0e5f1fc1 lib/libcurses/color.c
--- a/lib/libcurses/color.c Mon Oct 03 12:31:51 2011 +0000
+++ b/lib/libcurses/color.c Mon Oct 03 12:32:15 2011 +0000
@@ -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 @@
_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 @@
_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;
}
diff -r 1f7064e32618 -r 5a7c0e5f1fc1 lib/libcurses/cr_put.c
--- a/lib/libcurses/cr_put.c Mon Oct 03 12:31:51 2011 +0000
+++ b/lib/libcurses/cr_put.c Mon Oct 03 12:32:15 2011 +0000
@@ -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 @@
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
diff -r 1f7064e32618 -r 5a7c0e5f1fc1 lib/libcurses/refresh.c
--- a/lib/libcurses/refresh.c Mon Oct 03 12:31:51 2011 +0000
+++ b/lib/libcurses/refresh.c Mon Oct 03 12:32:15 2011 +0000
@@ -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 @@
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 @@
/* 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 @@
/* 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 @@
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 @@
/* 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 @@
/* 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)
Home |
Main Index |
Thread Index |
Old Index