aboutsummaryrefslogtreecommitdiff
path: root/ncurses/tty
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2014-02-28 19:12:44 +0000
committerXin LI <delphij@FreeBSD.org>2014-02-28 19:12:44 +0000
commit4b819fa20a8d007a10f2d3e8d6a5dedf7f18fc9a (patch)
treeb8f6e12b479a78216f3bffb8e1258d54087268de /ncurses/tty
parente07762606a5bf651a501cb095c98cba90e4a8fe2 (diff)
downloadsrc-4b819fa20a8d007a10f2d3e8d6a5dedf7f18fc9a.tar.gz
src-4b819fa20a8d007a10f2d3e8d6a5dedf7f18fc9a.zip
Undo two previous imports which was never done in preparation of doing a
new import.
Notes
Notes: svn path=/vendor/ncurses/dist/; revision=262616
Diffstat (limited to 'ncurses/tty')
-rwxr-xr-xncurses/tty/MKexpanded.sh61
-rw-r--r--ncurses/tty/hardscroll.c113
-rw-r--r--ncurses/tty/hashmap.c259
-rw-r--r--ncurses/tty/lib_mvcur.c504
-rw-r--r--ncurses/tty/lib_tstp.c45
-rw-r--r--ncurses/tty/lib_twait.c82
-rw-r--r--ncurses/tty/lib_vidattr.c133
-rw-r--r--ncurses/tty/tty_update.c1228
8 files changed, 941 insertions, 1484 deletions
diff --git a/ncurses/tty/MKexpanded.sh b/ncurses/tty/MKexpanded.sh
index 7a5f5993c487..bf9acf21aa43 100755
--- a/ncurses/tty/MKexpanded.sh
+++ b/ncurses/tty/MKexpanded.sh
@@ -1,6 +1,6 @@
#! /bin/sh
##############################################################################
-# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. #
+# Copyright (c) 1998-2000,2005 Free Software Foundation, Inc. #
# #
# Permission is hereby granted, free of charge, to any person obtaining a #
# copy of this software and associated documentation files (the "Software"), #
@@ -27,9 +27,9 @@
# authorization. #
##############################################################################
#
-# Author: Thomas E. Dickey, 1997-on
+# Author: Thomas E. Dickey <dickey@clark.net> 1997
#
-# $Id: MKexpanded.sh,v 1.17 2010/01/23 17:57:43 tom Exp $
+# $Id: MKexpanded.sh,v 1.11 2005/01/02 01:06:40 tom Exp $
#
# Script to generate 'expanded.c', a dummy source that contains functions
# corresponding to complex macros used in this library. By making functions,
@@ -52,13 +52,8 @@ trap "rm -f $TMP" 0 1 2 5 15
cat <<EOF
/* generated by MKexpanded.sh */
-#define NEED_NCURSES_CH_T 1
#include <curses.priv.h>
-
-#ifndef CUR
-#define CUR SP_TERMTYPE
-#endif
-
+#include <term.h>
#if NCURSES_EXPANDED
EOF
@@ -73,59 +68,29 @@ cat >$TMP <<EOF
#undef FALSE
/* this is a marker */
IGNORE
-NCURSES_EXPORT(void)
-_nc_toggle_attr_on (attr_t *S, attr_t at)
+NCURSES_EXPORT(void) _nc_toggle_attr_on (attr_t *S, attr_t at)
{
toggle_attr_on(*S,at);
}
-
-NCURSES_EXPORT(void)
-_nc_toggle_attr_off (attr_t *S, attr_t at)
+NCURSES_EXPORT(void) _nc_toggle_attr_off (attr_t *S, attr_t at)
{
toggle_attr_off(*S,at);
}
-
-NCURSES_EXPORT(int)
-NCURSES_SP_NAME(_nc_DelCharCost) (NCURSES_SP_DCLx int count)
-{
- return DelCharCost(SP_PARM, count);
-}
-
-NCURSES_EXPORT(int)
-NCURSES_SP_NAME(_nc_InsCharCost) (NCURSES_SP_DCLx int count)
+NCURSES_EXPORT(int) _nc_DelCharCost (int count)
{
- return InsCharCost(SP_PARM, count);
+ return DelCharCost(count);
}
-
-NCURSES_EXPORT(void)
-NCURSES_SP_NAME(_nc_UpdateAttrs) (NCURSES_SP_DCLx CARG_CH_T c)
+NCURSES_EXPORT(int) _nc_InsCharCost (int count)
{
- UpdateAttrs(SP_PARM, CHDEREF(c));
+ return InsCharCost(count);
}
-
-@if_NCURSES_SP_FUNCS
-NCURSES_EXPORT(int)
-_nc_DelCharCost (int count)
-{
- return NCURSES_SP_NAME(_nc_DelCharCost) (CURRENT_SCREEN, count);
-}
-
-NCURSES_EXPORT(int)
-_nc_InsCharCost (int count)
-{
- return NCURSES_SP_NAME(_nc_InsCharCost)(CURRENT_SCREEN, count);
-}
-
-NCURSES_EXPORT(void)
-_nc_UpdateAttrs (CARG_CH_T c)
+NCURSES_EXPORT(void) _nc_UpdateAttrs (NCURSES_CH_T c)
{
- NCURSES_SP_NAME(_nc_UpdateAttrs)(CURRENT_SCREEN,c);
+ UpdateAttrs(c);
}
-@endif
EOF
-$preprocessor $TMP 2>/dev/null | \
- sed -e '1,/^IGNORE$/d' -e 's/^@/#/' -e 's/^#if_/#if /'
+$preprocessor $TMP 2>/dev/null | sed -e '1,/^IGNORE$/d'
cat <<EOF
#else /* ! NCURSES_EXPANDED */
diff --git a/ncurses/tty/hardscroll.c b/ncurses/tty/hardscroll.c
index af68c961728d..2c40997fb6b1 100644
--- a/ncurses/tty/hardscroll.c
+++ b/ncurses/tty/hardscroll.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the *
@@ -147,98 +147,90 @@ AUTHOR
#include <curses.priv.h>
-MODULE_ID("$Id: hardscroll.c,v 1.47 2010/04/24 23:46:47 tom Exp $")
+MODULE_ID("$Id: hardscroll.c,v 1.42 2008/08/03 23:49:30 tom Exp $")
#if defined(SCROLLDEBUG) || defined(HASHDEBUG)
# undef screen_lines
-# define screen_lines(sp) MAXLINES
-NCURSES_EXPORT_VAR (int)
- oldnums[MAXLINES];
-# define OLDNUM(sp,n) oldnums[n]
+# define screen_lines MAXLINES
+NCURSES_EXPORT_VAR(int)
+oldnums[MAXLINES];
+# define OLDNUM(n) oldnums[n]
# define _tracef printf
# undef TR
# define TR(n, a) if (_nc_tracing & (n)) { _tracef a ; putchar('\n'); }
-extern NCURSES_EXPORT_VAR(unsigned) _nc_tracing;
+extern NCURSES_EXPORT_VAR(unsigned) _nc_tracing;
#else /* no debug */
/* OLDNUM(n) indicates which line will be shifted to the position n.
if OLDNUM(n) == _NEWINDEX, then the line n in new, not shifted from
somewhere. */
-NCURSES_EXPORT_VAR (int *)
- _nc_oldnums = 0; /* obsolete: keep for ABI compat */
+NCURSES_EXPORT_VAR(int *)
+_nc_oldnums = 0; /* obsolete: keep for ABI compat */
# if USE_HASHMAP
-# define oldnums(sp) (sp)->_oldnum_list
-# define OLDNUM(sp,n) oldnums(sp)[n]
+# define oldnums SP->_oldnum_list
+# define OLDNUM(n) oldnums[n]
# else /* !USE_HASHMAP */
-# define OLDNUM(sp,n) NewScreen(sp)->_line[n].oldindex
+# define OLDNUM(n) newscr->_line[n].oldindex
# endif /* !USE_HASHMAP */
-#define OLDNUM_SIZE(sp) (sp)->_oldnum_size
+#define OLDNUM_SIZE SP->_oldnum_size
#endif /* defined(SCROLLDEBUG) || defined(HASHDEBUG) */
NCURSES_EXPORT(void)
-NCURSES_SP_NAME(_nc_scroll_optimize) (NCURSES_SP_DCL0)
+_nc_scroll_optimize(void)
/* scroll optimization to transform curscr to newscr */
{
int i;
int start, end, shift;
- TR(TRACE_ICALLS, (T_CALLED("_nc_scroll_optimize(%p)"), (void *) SP_PARM));
+ TR(TRACE_ICALLS, (T_CALLED("_nc_scroll_optimize")));
#if !defined(SCROLLDEBUG) && !defined(HASHDEBUG)
#if USE_HASHMAP
/* get enough storage */
- if (OLDNUM_SIZE(SP_PARM) < screen_lines(SP_PARM)) {
- int *new_oldnums = typeRealloc(int,
- (size_t) screen_lines(SP_PARM),
- oldnums(SP_PARM));
+ if (OLDNUM_SIZE < screen_lines) {
+ int *new_oldnums = typeRealloc(int, screen_lines, oldnums);
if (!new_oldnums)
return;
- oldnums(SP_PARM) = new_oldnums;
- OLDNUM_SIZE(SP_PARM) = screen_lines(SP_PARM);
+ oldnums = new_oldnums;
+ OLDNUM_SIZE = screen_lines;
}
/* calculate the indices */
- NCURSES_SP_NAME(_nc_hash_map) (NCURSES_SP_ARG);
+ _nc_hash_map();
#endif
#endif /* !defined(SCROLLDEBUG) && !defined(HASHDEBUG) */
#ifdef TRACE
if (USE_TRACEF(TRACE_UPDATE | TRACE_MOVE)) {
- NCURSES_SP_NAME(_nc_linedump) (NCURSES_SP_ARG);
+ _nc_linedump();
_nc_unlock_global(tracef);
}
#endif /* TRACE */
/* pass 1 - from top to bottom scrolling up */
- for (i = 0; i < screen_lines(SP_PARM);) {
- while (i < screen_lines(SP_PARM)
- && (OLDNUM(SP_PARM, i) == _NEWINDEX || OLDNUM(SP_PARM, i) <= i))
+ for (i = 0; i < screen_lines;) {
+ while (i < screen_lines && (OLDNUM(i) == _NEWINDEX || OLDNUM(i) <= i))
i++;
- if (i >= screen_lines(SP_PARM))
+ if (i >= screen_lines)
break;
- shift = OLDNUM(SP_PARM, i) - i; /* shift > 0 */
+ shift = OLDNUM(i) - i; /* shift > 0 */
start = i;
i++;
- while (i < screen_lines(SP_PARM)
- && OLDNUM(SP_PARM, i) != _NEWINDEX
- && OLDNUM(SP_PARM, i) - i == shift)
+ while (i < screen_lines && OLDNUM(i) != _NEWINDEX && OLDNUM(i) - i
+ == shift)
i++;
end = i - 1 + shift;
TR(TRACE_UPDATE | TRACE_MOVE, ("scroll [%d, %d] by %d", start, end, shift));
#if !defined(SCROLLDEBUG) && !defined(HASHDEBUG)
- if (NCURSES_SP_NAME(_nc_scrolln) (NCURSES_SP_ARGx
- shift,
- start,
- end,
- screen_lines(SP_PARM) - 1) == ERR) {
+ if (_nc_scrolln(shift, start, end, screen_lines - 1) == ERR) {
TR(TRACE_UPDATE | TRACE_MOVE, ("unable to scroll"));
continue;
}
@@ -246,33 +238,23 @@ NCURSES_SP_NAME(_nc_scroll_optimize) (NCURSES_SP_DCL0)
}
/* pass 2 - from bottom to top scrolling down */
- for (i = screen_lines(SP_PARM) - 1; i >= 0;) {
- while (i >= 0
- && (OLDNUM(SP_PARM, i) == _NEWINDEX
- || OLDNUM(SP_PARM, i) >= i)) {
+ for (i = screen_lines - 1; i >= 0;) {
+ while (i >= 0 && (OLDNUM(i) == _NEWINDEX || OLDNUM(i) >= i))
i--;
- }
if (i < 0)
break;
- shift = OLDNUM(SP_PARM, i) - i; /* shift < 0 */
+ shift = OLDNUM(i) - i; /* shift < 0 */
end = i;
i--;
- while (i >= 0
- && OLDNUM(SP_PARM, i) != _NEWINDEX
- && OLDNUM(SP_PARM, i) - i == shift) {
+ while (i >= 0 && OLDNUM(i) != _NEWINDEX && OLDNUM(i) - i == shift)
i--;
- }
start = i + 1 - (-shift);
TR(TRACE_UPDATE | TRACE_MOVE, ("scroll [%d, %d] by %d", start, end, shift));
#if !defined(SCROLLDEBUG) && !defined(HASHDEBUG)
- if (NCURSES_SP_NAME(_nc_scrolln) (NCURSES_SP_ARGx
- shift,
- start,
- end,
- screen_lines(SP_PARM) - 1) == ERR) {
+ if (_nc_scrolln(shift, start, end, screen_lines - 1) == ERR) {
TR(TRACE_UPDATE | TRACE_MOVE, ("unable to scroll"));
continue;
}
@@ -281,41 +263,24 @@ NCURSES_SP_NAME(_nc_scroll_optimize) (NCURSES_SP_DCL0)
TR(TRACE_ICALLS, (T_RETURN("")));
}
-#if NCURSES_SP_FUNCS
-NCURSES_EXPORT(void)
-_nc_scroll_optimize(void)
-{
- NCURSES_SP_NAME(_nc_scroll_optimize) (CURRENT_SCREEN);
-}
-#endif
-
#if defined(TRACE) || defined(SCROLLDEBUG) || defined(HASHDEBUG)
NCURSES_EXPORT(void)
-NCURSES_SP_NAME(_nc_linedump) (NCURSES_SP_DCL0)
+_nc_linedump(void)
/* dump the state of the real and virtual oldnum fields */
{
int n;
char *buf = 0;
- size_t want = ((size_t) screen_lines(SP_PARM) + 1) * 4;
+ size_t want = (screen_lines + 1) * 4;
if ((buf = typeMalloc(char, want)) != 0) {
- *buf = '\0';
- for (n = 0; n < screen_lines(SP_PARM); n++)
- (void) sprintf(buf + strlen(buf), " %02d", OLDNUM(SP_PARM, n));
- TR(TRACE_UPDATE | TRACE_MOVE, ("virt %s", buf));
+ (void) strcpy(buf, "virt");
+ for (n = 0; n < screen_lines; n++)
+ (void) sprintf(buf + strlen(buf), " %02d", OLDNUM(n));
+ TR(TRACE_UPDATE | TRACE_MOVE, (buf));
free(buf);
}
}
-
-#if NCURSES_SP_FUNCS
-NCURSES_EXPORT(void)
-_nc_linedump(void)
-{
- NCURSES_SP_NAME(_nc_linedump) (CURRENT_SCREEN);
-}
-#endif
-
#endif /* defined(TRACE) || defined(SCROLLDEBUG) */
#ifdef SCROLLDEBUG
diff --git a/ncurses/tty/hashmap.c b/ncurses/tty/hashmap.c
index b670e1b9691f..9b60df62d5cf 100644
--- a/ncurses/tty/hashmap.c
+++ b/ncurses/tty/hashmap.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the *
@@ -68,12 +68,9 @@ AUTHOR
*****************************************************************************/
#include <curses.priv.h>
+#include <term.h> /* for back_color_erase */
-#ifndef CUR
-#define CUR SP_TERMTYPE
-#endif
-
-MODULE_ID("$Id: hashmap.c,v 1.62 2010/04/24 23:46:07 tom Exp $")
+MODULE_ID("$Id: hashmap.c,v 1.56 2007/10/13 18:47:25 Miroslav.Lichvar Exp $")
#ifdef HASHDEBUG
@@ -86,25 +83,25 @@ MODULE_ID("$Id: hashmap.c,v 1.62 2010/04/24 23:46:07 tom Exp $")
int oldnums[MAXLINES], reallines[MAXLINES];
static NCURSES_CH_T oldtext[MAXLINES][TEXTWIDTH];
static NCURSES_CH_T newtext[MAXLINES][TEXTWIDTH];
-# define OLDNUM(sp,n) oldnums[n]
-# define OLDTEXT(sp,n) oldtext[n]
-# define NEWTEXT(sp,m) newtext[m]
-# define PENDING(sp,n) 1
+# define OLDNUM(n) oldnums[n]
+# define OLDTEXT(n) oldtext[n]
+# define NEWTEXT(m) newtext[m]
+# define PENDING(n) 1
#else /* !HASHDEBUG */
-# define OLDNUM(sp,n) (sp)->_oldnum_list[n]
-# define OLDTEXT(sp,n) CurScreen(sp)->_line[n].text
-# define NEWTEXT(sp,m) NewScreen(sp)->_line[m].text
-# define TEXTWIDTH(sp) (CurScreen(sp)->_maxx + 1)
-# define PENDING(sp,n) (NewScreen(sp)->_line[n].firstchar != _NOCHANGE)
+# define OLDNUM(n) SP->_oldnum_list[n]
+# define OLDTEXT(n) curscr->_line[n].text
+# define NEWTEXT(m) newscr->_line[m].text
+# define TEXTWIDTH (curscr->_maxx+1)
+# define PENDING(n) (newscr->_line[n].firstchar != _NOCHANGE)
#endif /* !HASHDEBUG */
-#define oldhash(sp) ((sp)->oldhash)
-#define newhash(sp) ((sp)->newhash)
-#define hashtab(sp) ((sp)->hashtab)
-#define lines_alloc(sp) ((sp)->hashtab_len)
+#define oldhash (SP->oldhash)
+#define newhash (SP->newhash)
+#define hashtab (SP->hashtab)
+#define lines_alloc (SP->hashtab_len)
#if USE_WIDEC_SUPPORT
#define HASH_VAL(ch) (ch.chars[0])
@@ -115,26 +112,26 @@ static NCURSES_CH_T newtext[MAXLINES][TEXTWIDTH];
static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
static NCURSES_INLINE unsigned long
-hash(SCREEN *sp, NCURSES_CH_T * text)
+hash(NCURSES_CH_T * text)
{
int i;
NCURSES_CH_T ch;
unsigned long result = 0;
- for (i = TEXTWIDTH(sp); i > 0; i--) {
+ for (i = TEXTWIDTH; i > 0; i--) {
ch = *text++;
- result += (result << 5) + (unsigned long) HASH_VAL(ch);
+ result += (result << 5) + HASH_VAL(ch);
}
return result;
}
/* approximate update cost */
static int
-update_cost(SCREEN *sp, NCURSES_CH_T * from, NCURSES_CH_T * to)
+update_cost(NCURSES_CH_T * from, NCURSES_CH_T * to)
{
int cost = 0;
int i;
- for (i = TEXTWIDTH(sp); i > 0; i--, from++, to++)
+ for (i = TEXTWIDTH; i > 0; i--, from++, to++)
if (!(CharEq(*from, *to)))
cost++;
@@ -142,7 +139,7 @@ update_cost(SCREEN *sp, NCURSES_CH_T * from, NCURSES_CH_T * to)
}
static int
-update_cost_from_blank(SCREEN *sp, NCURSES_CH_T * to)
+update_cost_from_blank(NCURSES_CH_T * to)
{
int cost = 0;
int i;
@@ -151,7 +148,7 @@ update_cost_from_blank(SCREEN *sp, NCURSES_CH_T * to)
if (back_color_erase)
SetPair(blank, GetPair(stdscr->_nc_bkgd));
- for (i = TEXTWIDTH(sp); i > 0; i--, to++)
+ for (i = TEXTWIDTH; i > 0; i--, to++)
if (!(CharEq(blank, *to)))
cost++;
@@ -163,14 +160,14 @@ update_cost_from_blank(SCREEN *sp, NCURSES_CH_T * to)
* effective. 'blank' indicates whether the line 'to' would become blank.
*/
static NCURSES_INLINE bool
-cost_effective(SCREEN *sp, const int from, const int to, const bool blank)
+cost_effective(const int from, const int to, const bool blank)
{
int new_from;
if (from == to)
return FALSE;
- new_from = OLDNUM(sp, from);
+ new_from = OLDNUM(from);
if (new_from == _NEWINDEX)
new_from = from;
@@ -178,17 +175,16 @@ cost_effective(SCREEN *sp, const int from, const int to, const bool blank)
* On the left side of >= is the cost before moving;
* on the right side -- cost after moving.
*/
- return (((blank ? update_cost_from_blank(sp, NEWTEXT(sp, to))
- : update_cost(sp, OLDTEXT(sp, to), NEWTEXT(sp, to)))
- + update_cost(sp, OLDTEXT(sp, new_from), NEWTEXT(sp, from)))
- >= ((new_from == from ? update_cost_from_blank(sp, NEWTEXT(sp, from))
- : update_cost(sp, OLDTEXT(sp, new_from), NEWTEXT(sp, from)))
- + update_cost(sp, OLDTEXT(sp, from), NEWTEXT(sp, to))))
- ? TRUE : FALSE;
+ return (((blank ? update_cost_from_blank(NEWTEXT(to))
+ : update_cost(OLDTEXT(to), NEWTEXT(to)))
+ + update_cost(OLDTEXT(new_from), NEWTEXT(from)))
+ >= ((new_from == from ? update_cost_from_blank(NEWTEXT(from))
+ : update_cost(OLDTEXT(new_from), NEWTEXT(from)))
+ + update_cost(OLDTEXT(from), NEWTEXT(to)))) ? TRUE : FALSE;
}
static void
-grow_hunks(SCREEN *sp)
+grow_hunks(void)
{
int start, end, shift;
int back_limit, forward_limit; /* limits for cells to fill */
@@ -204,36 +200,35 @@ grow_hunks(SCREEN *sp)
back_ref_limit = 0;
i = 0;
- while (i < screen_lines(sp) && OLDNUM(sp, i) == _NEWINDEX)
+ while (i < screen_lines && OLDNUM(i) == _NEWINDEX)
i++;
- for (; i < screen_lines(sp); i = next_hunk) {
+ for (; i < screen_lines; i = next_hunk) {
start = i;
- shift = OLDNUM(sp, i) - i;
+ shift = OLDNUM(i) - i;
/* get forward limit */
i = start + 1;
- while (i < screen_lines(sp)
- && OLDNUM(sp, i) != _NEWINDEX
- && OLDNUM(sp, i) - i == shift)
+ while (i < screen_lines && OLDNUM(i) != _NEWINDEX && OLDNUM(i) - i
+ == shift)
i++;
end = i;
- while (i < screen_lines(sp) && OLDNUM(sp, i) == _NEWINDEX)
+ while (i < screen_lines && OLDNUM(i) == _NEWINDEX)
i++;
next_hunk = i;
forward_limit = i;
- if (i >= screen_lines(sp) || OLDNUM(sp, i) >= i)
+ if (i >= screen_lines || OLDNUM(i) >= i)
forward_ref_limit = i;
else
- forward_ref_limit = OLDNUM(sp, i);
+ forward_ref_limit = OLDNUM(i);
i = start - 1;
/* grow back */
if (shift < 0)
back_limit = back_ref_limit + (-shift);
while (i >= back_limit) {
- if (newhash(sp)[i] == oldhash(sp)[i + shift]
- || cost_effective(sp, i + shift, i, shift < 0)) {
- OLDNUM(sp, i) = i + shift;
+ if (newhash[i] == oldhash[i + shift]
+ || cost_effective(i + shift, i, shift < 0)) {
+ OLDNUM(i) = i + shift;
TR(TRACE_UPDATE | TRACE_MOVE,
("connected new line %d to old line %d (backward continuation)",
i, i + shift));
@@ -251,9 +246,9 @@ grow_hunks(SCREEN *sp)
if (shift > 0)
forward_limit = forward_ref_limit - shift;
while (i < forward_limit) {
- if (newhash(sp)[i] == oldhash(sp)[i + shift]
- || cost_effective(sp, i + shift, i, shift > 0)) {
- OLDNUM(sp, i) = i + shift;
+ if (newhash[i] == oldhash[i + shift]
+ || cost_effective(i + shift, i, shift > 0)) {
+ OLDNUM(i) = i + shift;
TR(TRACE_UPDATE | TRACE_MOVE,
("connected new line %d to old line %d (forward continuation)",
i, i + shift));
@@ -273,54 +268,51 @@ grow_hunks(SCREEN *sp)
}
NCURSES_EXPORT(void)
-NCURSES_SP_NAME(_nc_hash_map) (NCURSES_SP_DCL0)
+_nc_hash_map(void)
{
- HASHMAP *hsp;
+ HASHMAP *sp;
register int i;
int start, shift, size;
- if (screen_lines(SP_PARM) > lines_alloc(SP_PARM)) {
- if (hashtab(SP_PARM))
- free(hashtab(SP_PARM));
- hashtab(SP_PARM) = typeMalloc(HASHMAP,
- ((size_t) screen_lines(SP_PARM) + 1) * 2);
- if (!hashtab(SP_PARM)) {
- if (oldhash(SP_PARM)) {
- FreeAndNull(oldhash(SP_PARM));
+ if (screen_lines > lines_alloc) {
+ if (hashtab)
+ free(hashtab);
+ hashtab = typeMalloc(HASHMAP, (screen_lines + 1) * 2);
+ if (!hashtab) {
+ if (oldhash) {
+ FreeAndNull(oldhash);
}
- lines_alloc(SP_PARM) = 0;
+ lines_alloc = 0;
return;
}
- lines_alloc(SP_PARM) = screen_lines(SP_PARM);
+ lines_alloc = screen_lines;
}
- if (oldhash(SP_PARM) && newhash(SP_PARM)) {
+ if (oldhash && newhash) {
/* re-hash only changed lines */
- for (i = 0; i < screen_lines(SP_PARM); i++) {
- if (PENDING(SP_PARM, i))
- newhash(SP_PARM)[i] = hash(SP_PARM, NEWTEXT(SP_PARM, i));
+ for (i = 0; i < screen_lines; i++) {
+ if (PENDING(i))
+ newhash[i] = hash(NEWTEXT(i));
}
} else {
/* re-hash all */
- if (oldhash(SP_PARM) == 0)
- oldhash(SP_PARM) = typeCalloc(unsigned long,
- (size_t) screen_lines(SP_PARM));
- if (newhash(SP_PARM) == 0)
- newhash(SP_PARM) = typeCalloc(unsigned long,
- (size_t) screen_lines(SP_PARM));
- if (!oldhash(SP_PARM) || !newhash(SP_PARM))
+ if (oldhash == 0)
+ oldhash = typeCalloc(unsigned long, (unsigned) screen_lines);
+ if (newhash == 0)
+ newhash = typeCalloc(unsigned long, (unsigned) screen_lines);
+ if (!oldhash || !newhash)
return; /* malloc failure */
- for (i = 0; i < screen_lines(SP_PARM); i++) {
- newhash(SP_PARM)[i] = hash(SP_PARM, NEWTEXT(SP_PARM, i));
- oldhash(SP_PARM)[i] = hash(SP_PARM, OLDTEXT(SP_PARM, i));
+ for (i = 0; i < screen_lines; i++) {
+ newhash[i] = hash(NEWTEXT(i));
+ oldhash[i] = hash(OLDTEXT(i));
}
}
#ifdef HASH_VERIFY
- for (i = 0; i < screen_lines(SP_PARM); i++) {
- if (newhash(SP_PARM)[i] != hash(SP_PARM, NEWTEXT(SP_PARM, i)))
+ for (i = 0; i < screen_lines; i++) {
+ if (newhash[i] != hash(NEWTEXT(i)))
fprintf(stderr, "error in newhash[%d]\n", i);
- if (oldhash(SP_PARM)[i] != hash(SP_PARM, OLDTEXT(SP_PARM, i)))
+ if (oldhash[i] != hash(OLDTEXT(i)))
fprintf(stderr, "error in oldhash[%d]\n", i);
}
#endif
@@ -328,30 +320,28 @@ NCURSES_SP_NAME(_nc_hash_map) (NCURSES_SP_DCL0)
/*
* Set up and count line-hash values.
*/
- memset(hashtab(SP_PARM), '\0',
- sizeof(*(hashtab(SP_PARM)))
- * ((size_t) screen_lines(SP_PARM) + 1) * 2);
- for (i = 0; i < screen_lines(SP_PARM); i++) {
- unsigned long hashval = oldhash(SP_PARM)[i];
-
- for (hsp = hashtab(SP_PARM); hsp->hashval; hsp++)
- if (hsp->hashval == hashval)
+ memset(hashtab, '\0', sizeof(*hashtab) * (screen_lines + 1) * 2);
+ for (i = 0; i < screen_lines; i++) {
+ unsigned long hashval = oldhash[i];
+
+ for (sp = hashtab; sp->hashval; sp++)
+ if (sp->hashval == hashval)
break;
- hsp->hashval = hashval; /* in case this is a new entry */
- hsp->oldcount++;
- hsp->oldindex = i;
+ sp->hashval = hashval; /* in case this is a new entry */
+ sp->oldcount++;
+ sp->oldindex = i;
}
- for (i = 0; i < screen_lines(SP_PARM); i++) {
- unsigned long hashval = newhash(SP_PARM)[i];
+ for (i = 0; i < screen_lines; i++) {
+ unsigned long hashval = newhash[i];
- for (hsp = hashtab(SP_PARM); hsp->hashval; hsp++)
- if (hsp->hashval == hashval)
+ for (sp = hashtab; sp->hashval; sp++)
+ if (sp->hashval == hashval)
break;
- hsp->hashval = hashval; /* in case this is a new entry */
- hsp->newcount++;
- hsp->newindex = i;
+ sp->hashval = hashval; /* in case this is a new entry */
+ sp->newcount++;
+ sp->newindex = i;
- OLDNUM(SP_PARM, i) = _NEWINDEX; /* initialize old indices array */
+ OLDNUM(i) = _NEWINDEX; /* initialize old indices array */
}
/*
@@ -361,16 +351,16 @@ NCURSES_SP_NAME(_nc_hash_map) (NCURSES_SP_DCL0)
* extending hunks by cost_effective. Otherwise, it does not
* have any side effects.
*/
- for (hsp = hashtab(SP_PARM); hsp->hashval; hsp++)
- if (hsp->oldcount == 1 && hsp->newcount == 1
- && hsp->oldindex != hsp->newindex) {
+ for (sp = hashtab; sp->hashval; sp++)
+ if (sp->oldcount == 1 && sp->newcount == 1
+ && sp->oldindex != sp->newindex) {
TR(TRACE_UPDATE | TRACE_MOVE,
("new line %d is hash-identical to old line %d (unique)",
- hsp->newindex, hsp->oldindex));
- OLDNUM(SP_PARM, hsp->newindex) = hsp->oldindex;
+ sp->newindex, sp->oldindex));
+ OLDNUM(sp->newindex) = sp->oldindex;
}
- grow_hunks(SP_PARM);
+ grow_hunks();
/*
* Eliminate bad or impossible shifts -- this includes removing
@@ -378,83 +368,58 @@ NCURSES_SP_NAME(_nc_hash_map) (NCURSES_SP_DCL0)
* those which are to be moved too far, they are likely to destroy
* more than carry.
*/
- for (i = 0; i < screen_lines(SP_PARM);) {
- while (i < screen_lines(SP_PARM) && OLDNUM(SP_PARM, i) == _NEWINDEX)
+ for (i = 0; i < screen_lines;) {
+ while (i < screen_lines && OLDNUM(i) == _NEWINDEX)
i++;
- if (i >= screen_lines(SP_PARM))
+ if (i >= screen_lines)
break;
start = i;
- shift = OLDNUM(SP_PARM, i) - i;
+ shift = OLDNUM(i) - i;
i++;
- while (i < screen_lines(SP_PARM)
- && OLDNUM(SP_PARM, i) != _NEWINDEX
- && OLDNUM(SP_PARM, i) - i == shift)
+ while (i < screen_lines && OLDNUM(i) != _NEWINDEX && OLDNUM(i) - i
+ == shift)
i++;
size = i - start;
if (size < 3 || size + min(size / 8, 2) < abs(shift)) {
while (start < i) {
- OLDNUM(SP_PARM, start) = _NEWINDEX;
+ OLDNUM(start) = _NEWINDEX;
start++;
}
}
}
/* After clearing invalid hunks, try grow the rest. */
- grow_hunks(SP_PARM);
-}
-
-#if NCURSES_SP_FUNCS
-NCURSES_EXPORT(void)
-_nc_hash_map(void)
-{
- NCURSES_SP_NAME(_nc_hash_map) (CURRENT_SCREEN);
-}
-#endif
-
-NCURSES_EXPORT(void)
-NCURSES_SP_NAME(_nc_make_oldhash) (NCURSES_SP_DCLx int i)
-{
- if (oldhash(SP_PARM))
- oldhash(SP_PARM)[i] = hash(SP_PARM, OLDTEXT(SP_PARM, i));
+ grow_hunks();
}
-#if NCURSES_SP_FUNCS
NCURSES_EXPORT(void)
_nc_make_oldhash(int i)
{
- NCURSES_SP_NAME(_nc_make_oldhash) (CURRENT_SCREEN, i);
+ if (oldhash)
+ oldhash[i] = hash(OLDTEXT(i));
}
-#endif
NCURSES_EXPORT(void)
-NCURSES_SP_NAME(_nc_scroll_oldhash) (NCURSES_SP_DCLx int n, int top, int bot)
+_nc_scroll_oldhash(int n, int top, int bot)
{
size_t size;
int i;
- if (!oldhash(SP_PARM))
+ if (!oldhash)
return;
- size = sizeof(*(oldhash(SP_PARM))) * (size_t) (bot - top + 1 - abs(n));
+ size = sizeof(*oldhash) * (bot - top + 1 - abs(n));
if (n > 0) {
- memmove(oldhash(SP_PARM) + top, oldhash(SP_PARM) + top + n, size);
+ memmove(oldhash + top, oldhash + top + n, size);
for (i = bot; i > bot - n; i--)
- oldhash(SP_PARM)[i] = hash(SP_PARM, OLDTEXT(SP_PARM, i));
+ oldhash[i] = hash(OLDTEXT(i));
} else {
- memmove(oldhash(SP_PARM) + top - n, oldhash(SP_PARM) + top, size);
+ memmove(oldhash + top - n, oldhash + top, size);
for (i = top; i < top - n; i++)
- oldhash(SP_PARM)[i] = hash(SP_PARM, OLDTEXT(SP_PARM, i));
+ oldhash[i] = hash(OLDTEXT(i));
}
}
-#if NCURSES_SP_FUNCS
-NCURSES_EXPORT(void)
-_nc_scroll_oldhash(int n, int top, int bot)
-{
- NCURSES_SP_NAME(_nc_scroll_oldhash) (CURRENT_SCREEN, n, top, bot);
-}
-#endif
-
#ifdef HASHDEBUG
static void
usage(void)
diff --git a/ncurses/tty/lib_mvcur.c b/ncurses/tty/lib_mvcur.c
index ad41f8dd72d8..8e66fa3bf64c 100644
--- a/ncurses/tty/lib_mvcur.c
+++ b/ncurses/tty/lib_mvcur.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the *
@@ -30,7 +30,6 @@
* Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 *
* and: Eric S. Raymond <esr@snark.thyrsus.com> *
* and: Thomas E. Dickey 1996-on *
- * and: Juergen Pfeifer 2009 *
****************************************************************************/
/*
@@ -110,8 +109,8 @@
* LONG_DIST and (b) further inward from the right or left edge than LONG_DIST,
* we'll consider nonlocal.
*/
-#define NOT_LOCAL(sp, fy, fx, ty, tx) ((tx > LONG_DIST) \
- && (tx < screen_columns(sp) - 1 - LONG_DIST) \
+#define NOT_LOCAL(fy, fx, ty, tx) ((tx > LONG_DIST) \
+ && (tx < screen_columns - 1 - LONG_DIST) \
&& (abs(ty-fy) + abs(tx-fx) > LONG_DIST))
/****************************************************************************
@@ -153,21 +152,13 @@
*/
#include <curses.priv.h>
+#include <term.h>
#include <ctype.h>
-#ifndef CUR
-#define CUR SP_TERMTYPE
-#endif
-
-MODULE_ID("$Id: lib_mvcur.c,v 1.126 2011/01/22 19:48:21 tom Exp $")
-
-#define WANT_CHAR(sp, y, x) NewScreen(sp)->_line[y].text[x] /* desired state */
+MODULE_ID("$Id: lib_mvcur.c,v 1.113 2008/08/16 19:30:58 tom Exp $")
-#if NCURSES_SP_FUNCS
-#define BAUDRATE(sp) sp->_term->_baudrate /* bits per second */
-#else
-#define BAUDRATE(sp) cur_term->_baudrate /* bits per second */
-#endif
+#define WANT_CHAR(y, x) SP->_newscr->_line[y].text[x] /* desired state */
+#define BAUDRATE cur_term->_baudrate /* bits per second */
#if defined(MAIN) || defined(NCURSES_TEST)
#include <sys/time.h>
@@ -178,7 +169,7 @@ static float diff;
#define OPT_SIZE 512
-static int normalized_cost(NCURSES_SP_DCLx const char *const cap, int affcnt);
+static int normalized_cost(const char *const cap, int affcnt);
/****************************************************************************
*
@@ -188,34 +179,34 @@ static int normalized_cost(NCURSES_SP_DCLx const char *const cap, int affcnt);
#ifdef TRACE
static int
-trace_cost_of(NCURSES_SP_DCLx const char *capname, const char *cap, int affcnt)
+trace_cost_of(const char *capname, const char *cap, int affcnt)
{
- int result = NCURSES_SP_NAME(_nc_msec_cost) (NCURSES_SP_ARGx cap, affcnt);
+ int result = _nc_msec_cost(cap, affcnt);
TR(TRACE_CHARPUT | TRACE_MOVE,
("CostOf %s %d %s", capname, result, _nc_visbuf(cap)));
return result;
}
-#define CostOf(cap,affcnt) trace_cost_of(NCURSES_SP_ARGx #cap, cap, affcnt)
+#define CostOf(cap,affcnt) trace_cost_of(#cap,cap,affcnt);
static int
-trace_normalized_cost(NCURSES_SP_DCLx const char *capname, const char *cap, int affcnt)
+trace_normalized_cost(const char *capname, const char *cap, int affcnt)
{
- int result = normalized_cost(NCURSES_SP_ARGx cap, affcnt);
+ int result = normalized_cost(cap, affcnt);
TR(TRACE_CHARPUT | TRACE_MOVE,
("NormalizedCost %s %d %s", capname, result, _nc_visbuf(cap)));
return result;
}
-#define NormalizedCost(cap,affcnt) trace_normalized_cost(NCURSES_SP_ARGx #cap, cap, affcnt)
+#define NormalizedCost(cap,affcnt) trace_normalized_cost(#cap,cap,affcnt);
#else
-#define CostOf(cap,affcnt) NCURSES_SP_NAME(_nc_msec_cost)(NCURSES_SP_ARGx cap, affcnt)
-#define NormalizedCost(cap,affcnt) normalized_cost(NCURSES_SP_ARGx cap, affcnt)
+#define CostOf(cap,affcnt) _nc_msec_cost(cap,affcnt);
+#define NormalizedCost(cap,affcnt) normalized_cost(cap,affcnt);
#endif
NCURSES_EXPORT(int)
-NCURSES_SP_NAME(_nc_msec_cost) (NCURSES_SP_DCLx const char *const cap, int affcnt)
+_nc_msec_cost(const char *const cap, int affcnt)
/* compute the cost of a given operation */
{
if (cap == 0)
@@ -231,68 +222,53 @@ NCURSES_SP_NAME(_nc_msec_cost) (NCURSES_SP_DCLx const char *const cap, int affcn
for (cp += 2; *cp != '>'; cp++) {
if (isdigit(UChar(*cp)))
- number = number * 10 + (float) (*cp - '0');
+ number = number * 10 + (*cp - '0');
else if (*cp == '*')
- number *= (float) affcnt;
+ number *= affcnt;
else if (*cp == '.' && (*++cp != '>') && isdigit(UChar(*cp)))
- number += (float) ((*cp - '0') / 10.0);
+ number += (*cp - '0') / 10.0;
}
#if NCURSES_NO_PADDING
- if (!GetNoPadding(SP_PARM))
+ if (!GetNoPadding(SP))
#endif
cum_cost += number * 10;
- } else if (SP_PARM) {
- cum_cost += (float) SP_PARM->_char_padding;
- }
+ } else
+ cum_cost += SP->_char_padding;
}
return ((int) cum_cost);
}
}
-#if NCURSES_SP_FUNCS
-NCURSES_EXPORT(int)
-_nc_msec_cost(const char *const cap, int affcnt)
-{
- return NCURSES_SP_NAME(_nc_msec_cost) (CURRENT_SCREEN, cap, affcnt);
-}
-#endif
-
static int
-normalized_cost(NCURSES_SP_DCLx const char *const cap, int affcnt)
+normalized_cost(const char *const cap, int affcnt)
/* compute the effective character-count for an operation (round up) */
{
- int cost = NCURSES_SP_NAME(_nc_msec_cost) (NCURSES_SP_ARGx cap, affcnt);
+ int cost = _nc_msec_cost(cap, affcnt);
if (cost != INFINITY)
- cost = (cost + SP_PARM->_char_padding - 1) / SP_PARM->_char_padding;
+ cost = (cost + SP->_char_padding - 1) / SP->_char_padding;
return cost;
}
static void
-reset_scroll_region(NCURSES_SP_DCL0)
+reset_scroll_region(void)
/* Set the scroll-region to a known state (the default) */
{
if (change_scroll_region) {
- NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_ARGx
- "change_scroll_region",
- TPARM_2(change_scroll_region,
- 0, screen_lines(SP_PARM) - 1));
+ TPUTS_TRACE("change_scroll_region");
+ putp(TPARM_2(change_scroll_region, 0, screen_lines - 1));
}
}
NCURSES_EXPORT(void)
-NCURSES_SP_NAME(_nc_mvcur_resume) (NCURSES_SP_DCL0)
+_nc_mvcur_resume(void)
/* what to do at initialization time and after each shellout */
{
- if (SP_PARM && !IsTermInfo(SP_PARM))
- return;
-
/* initialize screen for cursor access */
if (enter_ca_mode) {
- NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_ARGx
- "enter_ca_mode",
- enter_ca_mode);
+ TPUTS_TRACE("enter_ca_mode");
+ putp(enter_ca_mode);
}
/*
@@ -304,63 +280,53 @@ NCURSES_SP_NAME(_nc_mvcur_resume) (NCURSES_SP_DCL0)
* they know the screen size. This is useful when you're running
* a vt100 emulation through xterm.
*/
- reset_scroll_region(NCURSES_SP_ARG);
- SP_PARM->_cursrow = SP_PARM->_curscol = -1;
+ reset_scroll_region();
+ SP->_cursrow = SP->_curscol = -1;
/* restore cursor shape */
- if (SP_PARM->_cursor != -1) {
- int cursor = SP_PARM->_cursor;
- SP_PARM->_cursor = -1;
- NCURSES_SP_NAME(curs_set) (NCURSES_SP_ARGx cursor);
+ if (SP->_cursor != -1) {
+ int cursor = SP->_cursor;
+ SP->_cursor = -1;
+ curs_set(cursor);
}
}
-#if NCURSES_SP_FUNCS
NCURSES_EXPORT(void)
-_nc_mvcur_resume(void)
-{
- NCURSES_SP_NAME(_nc_mvcur_resume) (CURRENT_SCREEN);
-}
-#endif
-
-NCURSES_EXPORT(void)
-NCURSES_SP_NAME(_nc_mvcur_init) (NCURSES_SP_DCL0)
+_nc_mvcur_init(void)
/* initialize the cost structure */
{
- if (SP_PARM->_ofp && isatty(fileno(SP_PARM->_ofp)))
- SP_PARM->_char_padding = ((BAUDBYTE * 1000 * 10)
- / (BAUDRATE(SP_PARM) > 0
- ? BAUDRATE(SP_PARM)
- : 9600));
+ if (isatty(fileno(SP->_ofp)))
+ SP->_char_padding = ((BAUDBYTE * 1000 * 10)
+ / (BAUDRATE > 0 ? BAUDRATE : 9600));
else
- SP_PARM->_char_padding = 1; /* must be nonzero */
- if (SP_PARM->_char_padding <= 0)
- SP_PARM->_char_padding = 1; /* must be nonzero */
- TR(TRACE_CHARPUT | TRACE_MOVE, ("char_padding %d msecs", SP_PARM->_char_padding));
+ SP->_char_padding = 1; /* must be nonzero */
+ if (SP->_char_padding <= 0)
+ SP->_char_padding = 1; /* must be nonzero */
+ TR(TRACE_CHARPUT | TRACE_MOVE, ("char_padding %d msecs", SP->_char_padding));
/* non-parameterized local-motion strings */
- SP_PARM->_cr_cost = CostOf(carriage_return, 0);
- SP_PARM->_home_cost = CostOf(cursor_home, 0);
- SP_PARM->_ll_cost = CostOf(cursor_to_ll, 0);
+ SP->_cr_cost = CostOf(carriage_return, 0);
+ SP->_home_cost = CostOf(cursor_home, 0);
+ SP->_ll_cost = CostOf(cursor_to_ll, 0);
#if USE_HARD_TABS
if (getenv("NCURSES_NO_HARD_TABS") == 0) {
- SP_PARM->_ht_cost = CostOf(tab, 0);
- SP_PARM->_cbt_cost = CostOf(back_tab, 0);
+ SP->_ht_cost = CostOf(tab, 0);
+ SP->_cbt_cost = CostOf(back_tab, 0);
} else {
- SP_PARM->_ht_cost = INFINITY;
- SP_PARM->_cbt_cost = INFINITY;
+ SP->_ht_cost = INFINITY;
+ SP->_cbt_cost = INFINITY;
}
#endif /* USE_HARD_TABS */
- SP_PARM->_cub1_cost = CostOf(cursor_left, 0);
- SP_PARM->_cuf1_cost = CostOf(cursor_right, 0);
- SP_PARM->_cud1_cost = CostOf(cursor_down, 0);
- SP_PARM->_cuu1_cost = CostOf(cursor_up, 0);
-
- SP_PARM->_smir_cost = CostOf(enter_insert_mode, 0);
- SP_PARM->_rmir_cost = CostOf(exit_insert_mode, 0);
- SP_PARM->_ip_cost = 0;
+ SP->_cub1_cost = CostOf(cursor_left, 0);
+ SP->_cuf1_cost = CostOf(cursor_right, 0);
+ SP->_cud1_cost = CostOf(cursor_down, 0);
+ SP->_cuu1_cost = CostOf(cursor_up, 0);
+
+ SP->_smir_cost = CostOf(enter_insert_mode, 0);
+ SP->_rmir_cost = CostOf(exit_insert_mode, 0);
+ SP->_ip_cost = 0;
if (insert_padding) {
- SP_PARM->_ip_cost = CostOf(insert_padding, 0);
+ SP->_ip_cost = CostOf(insert_padding, 0);
}
/*
@@ -369,7 +335,7 @@ NCURSES_SP_NAME(_nc_mvcur_init) (NCURSES_SP_DCL0)
* can treat it like absolute screen addressing. This seems to be true
* for all cursor_mem_address terminal types in the terminfo database.
*/
- SP_PARM->_address_cursor = cursor_address ? cursor_address : cursor_mem_address;
+ SP->_address_cursor = cursor_address ? cursor_address : cursor_mem_address;
/*
* Parametrized local-motion strings. This static cost computation
@@ -395,43 +361,40 @@ NCURSES_SP_NAME(_nc_mvcur_init) (NCURSES_SP_DCL0)
* All these averages depend on the assumption that all parameter values
* are equally probable.
*/
- SP_PARM->_cup_cost = CostOf(TPARM_2(SP_PARM->_address_cursor, 23, 23), 1);
- SP_PARM->_cub_cost = CostOf(TPARM_1(parm_left_cursor, 23), 1);
- SP_PARM->_cuf_cost = CostOf(TPARM_1(parm_right_cursor, 23), 1);
- SP_PARM->_cud_cost = CostOf(TPARM_1(parm_down_cursor, 23), 1);
- SP_PARM->_cuu_cost = CostOf(TPARM_1(parm_up_cursor, 23), 1);
- SP_PARM->_hpa_cost = CostOf(TPARM_1(column_address, 23), 1);
- SP_PARM->_vpa_cost = CostOf(TPARM_1(row_address, 23), 1);
+ SP->_cup_cost = CostOf(TPARM_2(SP->_address_cursor, 23, 23), 1);
+ SP->_cub_cost = CostOf(TPARM_1(parm_left_cursor, 23), 1);
+ SP->_cuf_cost = CostOf(TPARM_1(parm_right_cursor, 23), 1);
+ SP->_cud_cost = CostOf(TPARM_1(parm_down_cursor, 23), 1);
+ SP->_cuu_cost = CostOf(TPARM_1(parm_up_cursor, 23), 1);
+ SP->_hpa_cost = CostOf(TPARM_1(column_address, 23), 1);
+ SP->_vpa_cost = CostOf(TPARM_1(row_address, 23), 1);
/* non-parameterized screen-update strings */
- SP_PARM->_ed_cost = NormalizedCost(clr_eos, 1);
- SP_PARM->_el_cost = NormalizedCost(clr_eol, 1);
- SP_PARM->_el1_cost = NormalizedCost(clr_bol, 1);
- SP_PARM->_dch1_cost = NormalizedCost(delete_character, 1);
- SP_PARM->_ich1_cost = NormalizedCost(insert_character, 1);
+ SP->_ed_cost = NormalizedCost(clr_eos, 1);
+ SP->_el_cost = NormalizedCost(clr_eol, 1);
+ SP->_el1_cost = NormalizedCost(clr_bol, 1);
+ SP->_dch1_cost = NormalizedCost(delete_character, 1);
+ SP->_ich1_cost = NormalizedCost(insert_character, 1);
/*
* If this is a bce-terminal, we want to bias the choice so we use clr_eol
* rather than spaces at the end of a line.
*/
if (back_color_erase)
- SP_PARM->_el_cost = 0;
+ SP->_el_cost = 0;
/* parameterized screen-update strings */
- SP_PARM->_dch_cost = NormalizedCost(TPARM_1(parm_dch, 23), 1);
- SP_PARM->_ich_cost = NormalizedCost(TPARM_1(parm_ich, 23), 1);
- SP_PARM->_ech_cost = NormalizedCost(TPARM_1(erase_chars, 23), 1);
- SP_PARM->_rep_cost = NormalizedCost(TPARM_2(repeat_char, ' ', 23), 1);
-
- SP_PARM->_cup_ch_cost = NormalizedCost(
- TPARM_2(SP_PARM->_address_cursor,
- 23, 23),
- 1);
- SP_PARM->_hpa_ch_cost = NormalizedCost(TPARM_1(column_address, 23), 1);
- SP_PARM->_cuf_ch_cost = NormalizedCost(TPARM_1(parm_right_cursor, 23), 1);
- SP_PARM->_inline_cost = min(SP_PARM->_cup_ch_cost,
- min(SP_PARM->_hpa_ch_cost,
- SP_PARM->_cuf_ch_cost));
+ SP->_dch_cost = NormalizedCost(TPARM_1(parm_dch, 23), 1);
+ SP->_ich_cost = NormalizedCost(TPARM_1(parm_ich, 23), 1);
+ SP->_ech_cost = NormalizedCost(TPARM_1(erase_chars, 23), 1);
+ SP->_rep_cost = NormalizedCost(TPARM_2(repeat_char, ' ', 23), 1);
+
+ SP->_cup_ch_cost = NormalizedCost(TPARM_2(SP->_address_cursor, 23, 23), 1);
+ SP->_hpa_ch_cost = NormalizedCost(TPARM_1(column_address, 23), 1);
+ SP->_cuf_ch_cost = NormalizedCost(TPARM_1(parm_right_cursor, 23), 1);
+ SP->_inline_cost = min(SP->_cup_ch_cost,
+ min(SP->_hpa_ch_cost,
+ SP->_cuf_ch_cost));
/*
* If save_cursor is used within enter_ca_mode, we should not use it for
@@ -448,42 +411,30 @@ NCURSES_SP_NAME(_nc_mvcur_init) (NCURSES_SP_DCL0)
}
/*
- * A different, possibly better way to arrange this would be to set the
- * SCREEN's _endwin to TRUE at window initialization time and let this be
+ * A different, possibly better way to arrange this would be to set
+ * SP->_endwin = TRUE at window initialization time and let this be
* called by doupdate's return-from-shellout code.
*/
- NCURSES_SP_NAME(_nc_mvcur_resume) (NCURSES_SP_ARG);
+ _nc_mvcur_resume();
}
-#if NCURSES_SP_FUNCS
NCURSES_EXPORT(void)
-_nc_mvcur_init(void)
-{
- NCURSES_SP_NAME(_nc_mvcur_init) (CURRENT_SCREEN);
-}
-#endif
-
-NCURSES_EXPORT(void)
-NCURSES_SP_NAME(_nc_mvcur_wrap) (NCURSES_SP_DCL0)
+_nc_mvcur_wrap(void)
/* wrap up cursor-addressing mode */
{
/* leave cursor at screen bottom */
- TINFO_MVCUR(NCURSES_SP_ARGx -1, -1, screen_lines(SP_PARM) - 1, 0);
-
- if (!SP_PARM || !IsTermInfo(SP_PARM))
- return;
+ mvcur(-1, -1, screen_lines - 1, 0);
/* set cursor to normal mode */
- if (SP_PARM->_cursor != -1) {
- int cursor = SP_PARM->_cursor;
- NCURSES_SP_NAME(curs_set) (NCURSES_SP_ARGx 1);
- SP_PARM->_cursor = cursor;
+ if (SP->_cursor != -1) {
+ int cursor = SP->_cursor;
+ curs_set(1);
+ SP->_cursor = cursor;
}
if (exit_ca_mode) {
- NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_ARGx
- "exit_ca_mode",
- exit_ca_mode);
+ TPUTS_TRACE("exit_ca_mode");
+ putp(exit_ca_mode);
}
/*
* Reset terminal's tab counter. There's a long-time bug that
@@ -493,17 +444,9 @@ NCURSES_SP_NAME(_nc_mvcur_wrap) (NCURSES_SP_DCL0)
* escape sequences that reset things as column positions.
* Utter a \r to reset this invisibly.
*/
- NCURSES_SP_NAME(_nc_outch) (NCURSES_SP_ARGx '\r');
+ _nc_outch('\r');
}
-#if NCURSES_SP_FUNCS
-NCURSES_EXPORT(void)
-_nc_mvcur_wrap(void)
-{
- NCURSES_SP_NAME(_nc_mvcur_wrap) (CURRENT_SCREEN);
-}
-#endif
-
/****************************************************************************
*
* Optimized cursor movement
@@ -516,7 +459,7 @@ _nc_mvcur_wrap(void)
static NCURSES_INLINE int
repeated_append(string_desc * target, int total, int num, int repeat, const char *src)
{
- size_t need = (size_t) repeat * strlen(src);
+ size_t need = repeat * strlen(src);
if (need < target->s_size) {
while (repeat-- > 0) {
@@ -543,13 +486,8 @@ repeated_append(string_desc * target, int total, int num, int repeat, const char
#define LASTTAB(fr) ((fr > 0) ? ((fr - 1) / init_tabs) * init_tabs : -1)
static int
-relative_move(NCURSES_SP_DCLx
- string_desc * target,
- int from_y,
- int from_x,
- int to_y,
- int to_x,
- bool ovw)
+relative_move(string_desc * target, int from_y, int from_x, int to_y, int
+ to_x, bool ovw)
/* move via local motions (cuu/cuu1/cud/cud1/cub1/cub/cuf1/cuf/vpa/hpa) */
{
string_desc save;
@@ -562,38 +500,38 @@ relative_move(NCURSES_SP_DCLx
if (row_address != 0
&& _nc_safe_strcat(target, TPARM_1(row_address, to_y))) {
- vcost = SP_PARM->_vpa_cost;
+ vcost = SP->_vpa_cost;
}
if (to_y > from_y) {
n = (to_y - from_y);
if (parm_down_cursor
- && SP_PARM->_cud_cost < vcost
+ && SP->_cud_cost < vcost
&& _nc_safe_strcat(_nc_str_copy(target, &save),
TPARM_1(parm_down_cursor, n))) {
- vcost = SP_PARM->_cud_cost;
+ vcost = SP->_cud_cost;
}
if (cursor_down
- && (*cursor_down != '\n' || SP_PARM->_nl)
- && (n * SP_PARM->_cud1_cost < vcost)) {
+ && (*cursor_down != '\n' || SP->_nl)
+ && (n * SP->_cud1_cost < vcost)) {
vcost = repeated_append(_nc_str_copy(target, &save), 0,
- SP_PARM->_cud1_cost, n, cursor_down);
+ SP->_cud1_cost, n, cursor_down);
}
} else { /* (to_y < from_y) */
n = (from_y - to_y);
if (parm_up_cursor
- && SP_PARM->_cuu_cost < vcost
+ && SP->_cuu_cost < vcost
&& _nc_safe_strcat(_nc_str_copy(target, &save),
TPARM_1(parm_up_cursor, n))) {
- vcost = SP_PARM->_cuu_cost;
+ vcost = SP->_cuu_cost;
}
- if (cursor_up && (n * SP_PARM->_cuu1_cost < vcost)) {
+ if (cursor_up && (n * SP->_cuu1_cost < vcost)) {
vcost = repeated_append(_nc_str_copy(target, &save), 0,
- SP_PARM->_cuu1_cost, n, cursor_up);
+ SP->_cuu1_cost, n, cursor_up);
}
}
@@ -612,17 +550,17 @@ relative_move(NCURSES_SP_DCLx
if (column_address
&& _nc_safe_strcat(_nc_str_copy(target, &save),
TPARM_1(column_address, to_x))) {
- hcost = SP_PARM->_hpa_cost;
+ hcost = SP->_hpa_cost;
}
if (to_x > from_x) {
n = to_x - from_x;
if (parm_right_cursor
- && SP_PARM->_cuf_cost < hcost
+ && SP->_cuf_cost < hcost
&& _nc_safe_strcat(_nc_str_copy(target, &save),
TPARM_1(parm_right_cursor, n))) {
- hcost = SP_PARM->_cuf_cost;
+ hcost = SP->_cuf_cost;
}
if (cursor_right) {
@@ -637,7 +575,7 @@ relative_move(NCURSES_SP_DCLx
for (fr = from_x; (nxt = NEXTTAB(fr)) <= to_x; fr = nxt) {
lhcost = repeated_append(&check, lhcost,
- SP_PARM->_ht_cost, 1, tab);
+ SP->_ht_cost, 1, tab);
if (lhcost == INFINITY)
break;
}
@@ -661,7 +599,7 @@ relative_move(NCURSES_SP_DCLx
&& n < (int) check.s_size
&& vcost == 0
&& str[0] == '\0') {
- int wanted = CharOf(WANT_CHAR(SP_PARM, to_y, from_x));
+ int wanted = CharOf(WANT_CHAR(to_y, from_x));
if (is8bits(wanted) && isdigit(wanted))
ovw = FALSE;
}
@@ -678,8 +616,8 @@ relative_move(NCURSES_SP_DCLx
int i;
for (i = 0; i < n; i++) {
- NCURSES_CH_T ch = WANT_CHAR(SP_PARM, to_y, from_x + i);
- if (!SameAttrOf(ch, SCREEN_ATTRS(SP_PARM))
+ NCURSES_CH_T ch = WANT_CHAR(to_y, from_x + i);
+ if (!SameAttrOf(ch, SCREEN_ATTRS(SP))
#if USE_WIDEC_SUPPORT
|| !Charable(ch)
#endif
@@ -693,13 +631,13 @@ relative_move(NCURSES_SP_DCLx
int i;
for (i = 0; i < n; i++)
- *check.s_tail++ = (char) CharOf(WANT_CHAR(SP_PARM, to_y,
+ *check.s_tail++ = (char) CharOf(WANT_CHAR(to_y,
from_x + i));
*check.s_tail = '\0';
- check.s_size -= (size_t) n;
- lhcost += n * SP_PARM->_char_padding;
+ check.s_size -= n;
+ lhcost += n * SP->_char_padding;
} else {
- lhcost = repeated_append(&check, lhcost, SP_PARM->_cuf1_cost,
+ lhcost = repeated_append(&check, lhcost, SP->_cuf1_cost,
n, cursor_right);
}
@@ -712,10 +650,10 @@ relative_move(NCURSES_SP_DCLx
n = from_x - to_x;
if (parm_left_cursor
- && SP_PARM->_cub_cost < hcost
+ && SP->_cub_cost < hcost
&& _nc_safe_strcat(_nc_str_copy(target, &save),
TPARM_1(parm_left_cursor, n))) {
- hcost = SP_PARM->_cub_cost;
+ hcost = SP->_cub_cost;
}
if (cursor_left) {
@@ -729,8 +667,7 @@ relative_move(NCURSES_SP_DCLx
for (fr = from_x; (nxt = LASTTAB(fr)) >= to_x; fr = nxt) {
lhcost = repeated_append(&check, lhcost,
- SP_PARM->_cbt_cost,
- 1, back_tab);
+ SP->_cbt_cost, 1, back_tab);
if (lhcost == INFINITY)
break;
}
@@ -739,9 +676,7 @@ relative_move(NCURSES_SP_DCLx
}
#endif /* USE_HARD_TABS */
- lhcost = repeated_append(&check, lhcost,
- SP_PARM->_cub1_cost,
- n, cursor_left);
+ lhcost = repeated_append(&check, lhcost, SP->_cub1_cost, n, cursor_left);
if (lhcost < hcost
&& _nc_safe_strcat(_nc_str_copy(target, &save), str)) {
@@ -770,7 +705,7 @@ relative_move(NCURSES_SP_DCLx
*/
static NCURSES_INLINE int
-onscreen_mvcur(NCURSES_SP_DCLx int yold, int xold, int ynew, int xnew, bool ovw)
+onscreen_mvcur(int yold, int xold, int ynew, int xnew, bool ovw)
/* onscreen move from (yold, xold) to (ynew, xnew) */
{
string_desc result;
@@ -788,9 +723,9 @@ onscreen_mvcur(NCURSES_SP_DCLx int yold, int xold, int ynew, int xnew, bool ovw)
#define InitResult _nc_str_init(&result, buffer, sizeof(buffer))
/* tactic #0: use direct cursor addressing */
- if (_nc_safe_strcpy(InitResult, TPARM_2(SP_PARM->_address_cursor, ynew, xnew))) {
+ if (_nc_safe_strcpy(InitResult, TPARM_2(SP->_address_cursor, ynew, xnew))) {
tactic = 0;
- usecost = SP_PARM->_cup_cost;
+ usecost = SP->_cup_cost;
#if defined(TRACE) || defined(NCURSES_TEST)
if (!(_nc_optimize_enable & OPTIMIZE_MVCUR))
@@ -805,7 +740,7 @@ onscreen_mvcur(NCURSES_SP_DCLx int yold, int xold, int ynew, int xnew, bool ovw)
* (like, say, local-movement \n getting mapped to some obscure
* character because A_ALTCHARSET is on).
*/
- if (yold == -1 || xold == -1 || NOT_LOCAL(SP_PARM, yold, xold, ynew, xnew)) {
+ if (yold == -1 || xold == -1 || NOT_LOCAL(yold, xold, ynew, xnew)) {
#if defined(MAIN) || defined(NCURSES_TEST)
if (!profiling) {
(void) fputs("nonlocal\n", stderr);
@@ -819,10 +754,8 @@ onscreen_mvcur(NCURSES_SP_DCLx int yold, int xold, int ynew, int xnew, bool ovw)
#ifndef NO_OPTIMIZE
/* tactic #1: use local movement */
if (yold != -1 && xold != -1
- && ((newcost = relative_move(NCURSES_SP_ARGx
- NullResult,
- yold, xold,
- ynew, xnew, ovw)) != INFINITY)
+ && ((newcost = relative_move(NullResult, yold, xold, ynew, xnew,
+ ovw)) != INFINITY)
&& newcost < usecost) {
tactic = 1;
usecost = newcost;
@@ -830,51 +763,42 @@ onscreen_mvcur(NCURSES_SP_DCLx int yold, int xold, int ynew, int xnew, bool ovw)
/* tactic #2: use carriage-return + local movement */
if (yold != -1 && carriage_return
- && ((newcost = relative_move(NCURSES_SP_ARGx
- NullResult,
- yold, 0,
- ynew, xnew, ovw)) != INFINITY)
- && SP_PARM->_cr_cost + newcost < usecost) {
+ && ((newcost = relative_move(NullResult, yold, 0, ynew, xnew, ovw))
+ != INFINITY)
+ && SP->_cr_cost + newcost < usecost) {
tactic = 2;
- usecost = SP_PARM->_cr_cost + newcost;
+ usecost = SP->_cr_cost + newcost;
}
/* tactic #3: use home-cursor + local movement */
if (cursor_home
- && ((newcost = relative_move(NCURSES_SP_ARGx
- NullResult,
- 0, 0,
- ynew, xnew, ovw)) != INFINITY)
- && SP_PARM->_home_cost + newcost < usecost) {
+ && ((newcost = relative_move(NullResult, 0, 0, ynew, xnew, ovw)) != INFINITY)
+ && SP->_home_cost + newcost < usecost) {
tactic = 3;
- usecost = SP_PARM->_home_cost + newcost;
+ usecost = SP->_home_cost + newcost;
}
/* tactic #4: use home-down + local movement */
if (cursor_to_ll
- && ((newcost = relative_move(NCURSES_SP_ARGx
- NullResult,
- screen_lines(SP_PARM) - 1, 0,
- ynew, xnew, ovw)) != INFINITY)
- && SP_PARM->_ll_cost + newcost < usecost) {
+ && ((newcost = relative_move(NullResult, screen_lines - 1, 0, ynew,
+ xnew, ovw)) != INFINITY)
+ && SP->_ll_cost + newcost < usecost) {
tactic = 4;
- usecost = SP_PARM->_ll_cost + newcost;
+ usecost = SP->_ll_cost + newcost;
}
/*
* tactic #5: use left margin for wrap to right-hand side,
* unless strange wrap behavior indicated by xenl might hose us.
*/
- t5_cr_cost = (xold > 0 ? SP_PARM->_cr_cost : 0);
+ t5_cr_cost = (xold > 0 ? SP->_cr_cost : 0);
if (auto_left_margin && !eat_newline_glitch
&& yold > 0 && cursor_left
- && ((newcost = relative_move(NCURSES_SP_ARGx
- NullResult,
- yold - 1, screen_columns(SP_PARM) - 1,
- ynew, xnew, ovw)) != INFINITY)
- && t5_cr_cost + SP_PARM->_cub1_cost + newcost < usecost) {
+ && ((newcost = relative_move(NullResult, yold - 1, screen_columns -
+ 1, ynew, xnew, ovw)) != INFINITY)
+ && t5_cr_cost + SP->_cub1_cost + newcost < usecost) {
tactic = 5;
- usecost = t5_cr_cost + SP_PARM->_cub1_cost + newcost;
+ usecost = t5_cr_cost + SP->_cub1_cost + newcost;
}
/*
@@ -884,39 +808,26 @@ onscreen_mvcur(NCURSES_SP_DCLx int yold, int xold, int ynew, int xnew, bool ovw)
InitResult;
switch (tactic) {
case 1:
- (void) relative_move(NCURSES_SP_ARGx
- &result,
- yold, xold,
- ynew, xnew, ovw);
+ (void) relative_move(&result, yold, xold, ynew, xnew, ovw);
break;
case 2:
(void) _nc_safe_strcpy(&result, carriage_return);
- (void) relative_move(NCURSES_SP_ARGx
- &result,
- yold, 0,
- ynew, xnew, ovw);
+ (void) relative_move(&result, yold, 0, ynew, xnew, ovw);
break;
case 3:
(void) _nc_safe_strcpy(&result, cursor_home);
- (void) relative_move(NCURSES_SP_ARGx
- &result, 0, 0,
- ynew, xnew, ovw);
+ (void) relative_move(&result, 0, 0, ynew, xnew, ovw);
break;
case 4:
(void) _nc_safe_strcpy(&result, cursor_to_ll);
- (void) relative_move(NCURSES_SP_ARGx
- &result,
- screen_lines(SP_PARM) - 1, 0,
- ynew, xnew, ovw);
+ (void) relative_move(&result, screen_lines - 1, 0, ynew, xnew, ovw);
break;
case 5:
if (xold > 0)
(void) _nc_safe_strcat(&result, carriage_return);
(void) _nc_safe_strcat(&result, cursor_left);
- (void) relative_move(NCURSES_SP_ARGx
- &result,
- yold - 1, screen_columns(SP_PARM) - 1,
- ynew, xnew, ovw);
+ (void) relative_move(&result, yold - 1, screen_columns - 1, ynew,
+ xnew, ovw);
break;
}
#endif /* !NO_OPTIMIZE */
@@ -934,26 +845,25 @@ onscreen_mvcur(NCURSES_SP_DCLx int yold, int xold, int ynew, int xnew, bool ovw)
if (usecost != INFINITY) {
TPUTS_TRACE("mvcur");
- NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx
- buffer, 1, NCURSES_SP_NAME(_nc_outch));
- SP_PARM->_cursrow = ynew;
- SP_PARM->_curscol = xnew;
+ tputs(buffer, 1, _nc_outch);
+ SP->_cursrow = ynew;
+ SP->_curscol = xnew;
return (OK);
} else
return (ERR);
}
NCURSES_EXPORT(int)
-TINFO_MVCUR(NCURSES_SP_DCLx int yold, int xold, int ynew, int xnew)
+mvcur(int yold, int xold, int ynew, int xnew)
/* optimized cursor move from (yold, xold) to (ynew, xnew) */
{
NCURSES_CH_T oldattr;
int code;
- TR(TRACE_CALLS | TRACE_MOVE, (T_CALLED("_nc_tinfo_mvcur(%p,%d,%d,%d,%d)"),
- (void *) SP_PARM, yold, xold, ynew, xnew));
+ TR(TRACE_CALLS | TRACE_MOVE, (T_CALLED("mvcur(%d,%d,%d,%d)"),
+ yold, xold, ynew, xnew));
- if (SP_PARM == 0) {
+ if (SP == 0) {
code = ERR;
} else if (yold == ynew && xold == xnew) {
code = OK;
@@ -964,9 +874,9 @@ TINFO_MVCUR(NCURSES_SP_DCLx int yold, int xold, int ynew, int xnew)
* column position implied by wraparound or the lack thereof and
* rolling up the screen to get ynew on the screen.
*/
- if (xnew >= screen_columns(SP_PARM)) {
- ynew += xnew / screen_columns(SP_PARM);
- xnew %= screen_columns(SP_PARM);
+ if (xnew >= screen_columns) {
+ ynew += xnew / screen_columns;
+ xnew %= screen_columns;
}
/*
@@ -974,40 +884,38 @@ TINFO_MVCUR(NCURSES_SP_DCLx int yold, int xold, int ynew, int xnew)
* character set -- these have a strong tendency to screw up the CR &
* LF used for local character motions!
*/
- oldattr = SCREEN_ATTRS(SP_PARM);
+ oldattr = SCREEN_ATTRS(SP);
if ((AttrOf(oldattr) & A_ALTCHARSET)
|| (AttrOf(oldattr) && !move_standout_mode)) {
TR(TRACE_CHARPUT, ("turning off (%#lx) %s before move",
(unsigned long) AttrOf(oldattr),
_traceattr(AttrOf(oldattr))));
- (void) VIDATTR(SP_PARM, A_NORMAL, 0);
+ (void) VIDATTR(A_NORMAL, 0);
}
- if (xold >= screen_columns(SP_PARM)) {
+ if (xold >= screen_columns) {
int l;
- if (SP_PARM->_nl) {
- l = (xold + 1) / screen_columns(SP_PARM);
+ if (SP->_nl) {
+ l = (xold + 1) / screen_columns;
yold += l;
- if (yold >= screen_lines(SP_PARM))
- l -= (yold - screen_lines(SP_PARM) - 1);
+ if (yold >= screen_lines)
+ l -= (yold - screen_lines - 1);
if (l > 0) {
if (carriage_return) {
- NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_ARGx
- "carriage_return",
- carriage_return);
+ TPUTS_TRACE("carriage_return");
+ putp(carriage_return);
} else
- NCURSES_SP_NAME(_nc_outch) (NCURSES_SP_ARGx '\r');
+ _nc_outch('\r');
xold = 0;
while (l > 0) {
if (newline) {
- NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_ARGx
- "newline",
- newline);
+ TPUTS_TRACE("newline");
+ putp(newline);
} else
- NCURSES_SP_NAME(_nc_outch) (NCURSES_SP_ARGx '\n');
+ _nc_outch('\n');
l--;
}
}
@@ -1021,35 +929,27 @@ TINFO_MVCUR(NCURSES_SP_DCLx int yold, int xold, int ynew, int xnew)
}
}
- if (yold > screen_lines(SP_PARM) - 1)
- yold = screen_lines(SP_PARM) - 1;
- if (ynew > screen_lines(SP_PARM) - 1)
- ynew = screen_lines(SP_PARM) - 1;
+ if (yold > screen_lines - 1)
+ yold = screen_lines - 1;
+ if (ynew > screen_lines - 1)
+ ynew = screen_lines - 1;
/* destination location is on screen now */
- code = onscreen_mvcur(NCURSES_SP_ARGx yold, xold, ynew, xnew, TRUE);
+ code = onscreen_mvcur(yold, xold, ynew, xnew, TRUE);
/*
* Restore attributes if we disabled them before moving.
*/
- if (!SameAttrOf(oldattr, SCREEN_ATTRS(SP_PARM))) {
+ if (!SameAttrOf(oldattr, SCREEN_ATTRS(SP))) {
TR(TRACE_CHARPUT, ("turning on (%#lx) %s after move",
(unsigned long) AttrOf(oldattr),
_traceattr(AttrOf(oldattr))));
- (void) VIDATTR(SP_PARM, AttrOf(oldattr), GetPair(oldattr));
+ (void) VIDATTR(AttrOf(oldattr), GetPair(oldattr));
}
}
returnCode(code);
}
-#if NCURSES_SP_FUNCS && !defined(USE_TERM_DRIVER)
-NCURSES_EXPORT(int)
-mvcur(int yold, int xold, int ynew, int xnew)
-{
- return NCURSES_SP_NAME(mvcur) (CURRENT_SCREEN, yold, xold, ynew, xnew);
-}
-#endif
-
#if defined(TRACE) || defined(NCURSES_TEST)
NCURSES_EXPORT_VAR(int) _nc_optimize_enable = OPTIMIZE_ALL;
#endif
@@ -1312,25 +1212,25 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
speeds[i], overhead, totalest);
}
} else if (buf[0] == 'c') {
- (void) printf("char padding: %d\n", CURRENT_SCREEN->_char_padding);
- (void) printf("cr cost: %d\n", CURRENT_SCREEN->_cr_cost);
- (void) printf("cup cost: %d\n", CURRENT_SCREEN->_cup_cost);
- (void) printf("home cost: %d\n", CURRENT_SCREEN->_home_cost);
- (void) printf("ll cost: %d\n", CURRENT_SCREEN->_ll_cost);
+ (void) printf("char padding: %d\n", SP->_char_padding);
+ (void) printf("cr cost: %d\n", SP->_cr_cost);
+ (void) printf("cup cost: %d\n", SP->_cup_cost);
+ (void) printf("home cost: %d\n", SP->_home_cost);
+ (void) printf("ll cost: %d\n", SP->_ll_cost);
#if USE_HARD_TABS
- (void) printf("ht cost: %d\n", CURRENT_SCREEN->_ht_cost);
- (void) printf("cbt cost: %d\n", CURRENT_SCREEN->_cbt_cost);
+ (void) printf("ht cost: %d\n", SP->_ht_cost);
+ (void) printf("cbt cost: %d\n", SP->_cbt_cost);
#endif /* USE_HARD_TABS */
- (void) printf("cub1 cost: %d\n", CURRENT_SCREEN->_cub1_cost);
- (void) printf("cuf1 cost: %d\n", CURRENT_SCREEN->_cuf1_cost);
- (void) printf("cud1 cost: %d\n", CURRENT_SCREEN->_cud1_cost);
- (void) printf("cuu1 cost: %d\n", CURRENT_SCREEN->_cuu1_cost);
- (void) printf("cub cost: %d\n", CURRENT_SCREEN->_cub_cost);
- (void) printf("cuf cost: %d\n", CURRENT_SCREEN->_cuf_cost);
- (void) printf("cud cost: %d\n", CURRENT_SCREEN->_cud_cost);
- (void) printf("cuu cost: %d\n", CURRENT_SCREEN->_cuu_cost);
- (void) printf("hpa cost: %d\n", CURRENT_SCREEN->_hpa_cost);
- (void) printf("vpa cost: %d\n", CURRENT_SCREEN->_vpa_cost);
+ (void) printf("cub1 cost: %d\n", SP->_cub1_cost);
+ (void) printf("cuf1 cost: %d\n", SP->_cuf1_cost);
+ (void) printf("cud1 cost: %d\n", SP->_cud1_cost);
+ (void) printf("cuu1 cost: %d\n", SP->_cuu1_cost);
+ (void) printf("cub cost: %d\n", SP->_cub_cost);
+ (void) printf("cuf cost: %d\n", SP->_cuf_cost);
+ (void) printf("cud cost: %d\n", SP->_cud_cost);
+ (void) printf("cuu cost: %d\n", SP->_cuu_cost);
+ (void) printf("hpa cost: %d\n", SP->_hpa_cost);
+ (void) printf("vpa cost: %d\n", SP->_vpa_cost);
} else if (buf[0] == 'x' || buf[0] == 'q')
break;
else
diff --git a/ncurses/tty/lib_tstp.c b/ncurses/tty/lib_tstp.c
index 70f805a2ad5e..06c8411caa4d 100644
--- a/ncurses/tty/lib_tstp.c
+++ b/ncurses/tty/lib_tstp.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the *
@@ -46,7 +46,7 @@
#define _POSIX_SOURCE
#endif
-MODULE_ID("$Id: lib_tstp.c,v 1.41 2010/05/15 21:31:12 tom Exp $")
+MODULE_ID("$Id: lib_tstp.c,v 1.37 2008/05/03 16:24:56 tom Exp $")
#if defined(SIGTSTP) && (HAVE_SIGACTION || HAVE_SIGVEC)
#define USE_SIGTSTP 1
@@ -59,20 +59,16 @@ static const char *
signal_name(int sig)
{
switch (sig) {
-#ifdef SIGALRM
case SIGALRM:
return "SIGALRM";
-#endif
#ifdef SIGCONT
case SIGCONT:
return "SIGCONT";
#endif
case SIGINT:
return "SIGINT";
-#ifdef SIGQUIT
case SIGQUIT:
return "SIGQUIT";
-#endif
case SIGTERM:
return "SIGTERM";
#ifdef SIGTSTP
@@ -140,7 +136,6 @@ signal_name(int sig)
static void
tstp(int dummy GCC_UNUSED)
{
- SCREEN *sp = CURRENT_SCREEN;
sigset_t mask, omask;
sigaction_t act, oact;
@@ -159,11 +154,11 @@ tstp(int dummy GCC_UNUSED)
* parent was stopped before us, and we would likely pick up the
* settings already modified by the shell.
*/
- if (sp != 0 && !sp->_endwin) /* don't do this if we're not in curses */
+ if (SP != 0 && !SP->_endwin) /* don't do this if we're not in curses */
#if HAVE_TCGETPGRP
if (tcgetpgrp(STDIN_FILENO) == getpgrp())
#endif
- NCURSES_SP_NAME(def_prog_mode) (NCURSES_SP_ARG);
+ def_prog_mode();
/*
* Block window change and timer signals. The latter
@@ -171,9 +166,7 @@ tstp(int dummy GCC_UNUSED)
* to repaint the screen.
*/
(void) sigemptyset(&mask);
-#ifdef SIGALRM
(void) sigaddset(&mask, SIGALRM);
-#endif
#if USE_SIGWINCH
(void) sigaddset(&mask, SIGWINCH);
#endif
@@ -192,7 +185,7 @@ tstp(int dummy GCC_UNUSED)
* End window mode, which also resets the terminal state to the
* original (pre-curses) modes.
*/
- NCURSES_SP_NAME(endwin) (NCURSES_SP_ARG);
+ endwin();
/* Unblock SIGTSTP. */
(void) sigemptyset(&mask);
@@ -219,19 +212,19 @@ tstp(int dummy GCC_UNUSED)
T(("SIGCONT received"));
sigaction(SIGTSTP, &oact, NULL);
- NCURSES_SP_NAME(flushinp) (NCURSES_SP_ARG);
+ flushinp();
/*
* If the user modified the tty state while suspended, he wants
* those changes to stick. So save the new "default" terminal state.
*/
- NCURSES_SP_NAME(def_shell_mode) (NCURSES_SP_ARG);
+ def_shell_mode();
/*
* This relies on the fact that doupdate() will restore the
* program-mode tty state, and issue enter_ca_mode if need be.
*/
- NCURSES_SP_NAME(doupdate) (NCURSES_SP_ARG);
+ doupdate();
/* Reset the signals. */
(void) sigprocmask(SIG_SETMASK, &omask, NULL);
@@ -241,8 +234,6 @@ tstp(int dummy GCC_UNUSED)
static void
cleanup(int sig)
{
- SCREEN *sp = CURRENT_SCREEN;
-
/*
* Actually, doing any sort of I/O from within an signal handler is
* "unsafe". But we'll _try_ to clean up the screen and terminal
@@ -250,10 +241,7 @@ cleanup(int sig)
*/
if (!_nc_globals.cleanup_nested++
&& (sig == SIGINT
-#ifdef SIGQUIT
- || sig == SIGQUIT
-#endif
- )) {
+ || sig == SIGQUIT)) {
#if HAVE_SIGACTION || HAVE_SIGVEC
sigaction_t act;
sigemptyset(&act.sa_mask);
@@ -269,12 +257,12 @@ cleanup(int sig)
if (scan->_ofp != 0
&& isatty(fileno(scan->_ofp))) {
scan->_cleanup = TRUE;
- scan->_outch = NCURSES_SP_NAME(_nc_outch);
+ scan->_outch = _nc_outch;
}
set_term(scan);
- NCURSES_SP_NAME(endwin) (NCURSES_SP_ARG);
- if (sp)
- sp->_endwin = FALSE; /* in case we have an atexit! */
+ endwin();
+ if (SP)
+ SP->_endwin = FALSE; /* in case we have an atexit! */
}
}
}
@@ -286,13 +274,6 @@ static void
sigwinch(int sig GCC_UNUSED)
{
_nc_globals.have_sigwinch = 1;
-# if USE_PTHREADS_EINTR
- if (_nc_globals.read_thread) {
- if (!pthread_equal(pthread_self(), _nc_globals.read_thread))
- pthread_kill(_nc_globals.read_thread, SIGWINCH);
- _nc_globals.read_thread = 0;
- }
-# endif
}
#endif /* USE_SIGWINCH */
diff --git a/ncurses/tty/lib_twait.c b/ncurses/tty/lib_twait.c
index 329ec29a019f..16d12edbbe3c 100644
--- a/ncurses/tty/lib_twait.c
+++ b/ncurses/tty/lib_twait.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the *
@@ -65,12 +65,10 @@
# include <sys/select.h>
# endif
#endif
-#ifdef __MINGW32__
-# include <sys/time.h>
-#endif
+
#undef CUR
-MODULE_ID("$Id: lib_twait.c,v 1.61 2010/12/25 23:43:58 tom Exp $")
+MODULE_ID("$Id: lib_twait.c,v 1.59 2008/08/30 20:08:19 tom Exp $")
static long
_nc_gettime(TimeType * t0, bool first)
@@ -126,27 +124,15 @@ _nc_eventlist_timeout(_nc_eventlist * evl)
}
#endif /* NCURSES_WGETCH_EVENTS */
-#if (USE_FUNC_POLL || HAVE_SELECT)
-# define MAYBE_UNUSED
-#else
-# define MAYBE_UNUSED GCC_UNUSED
-#endif
-
-#if (USE_FUNC_POLL || HAVE_SELECT)
-# define MAYBE_UNUSED
-#else
-# define MAYBE_UNUSED GCC_UNUSED
-#endif
-
/*
* Wait a specified number of milliseconds, returning nonzero if the timer
* didn't expire before there is activity on the specified file descriptors.
* The file-descriptors are specified by the mode:
- * TW_NONE 0 - none (absolute time)
- * TW_INPUT 1 - ncurses' normal input-descriptor
- * TW_MOUSE 2 - mouse descriptor, if any
- * TW_ANY 3 - either input or mouse.
- * TW_EVENT 4 -
+ * 0 - none (absolute time)
+ * 1 - ncurses' normal input-descriptor
+ * 2 - mouse descriptor, if any
+ * 3 - either input or mouse.
+ *
* Experimental: if NCURSES_WGETCH_EVENTS is defined, (mode & 4) determines
* whether to pay attention to evl argument. If set, the smallest of
* millisecond and of timeout of evl is taken.
@@ -157,18 +143,16 @@ _nc_eventlist_timeout(_nc_eventlist * evl)
* descriptors.
*/
NCURSES_EXPORT(int)
-_nc_timed_wait(SCREEN *sp MAYBE_UNUSED,
- int mode MAYBE_UNUSED,
+_nc_timed_wait(SCREEN *sp,
+ int mode,
int milliseconds,
int *timeleft
EVENTLIST_2nd(_nc_eventlist * evl))
{
+ int fd;
int count;
- int result = TW_NONE;
+ int result = 0;
TimeType t0;
-#if (USE_FUNC_POLL || HAVE_SELECT)
- int fd;
-#endif
#ifdef NCURSES_WGETCH_EVENTS
int timeout_is_event = 0;
@@ -190,7 +174,7 @@ _nc_timed_wait(SCREEN *sp MAYBE_UNUSED,
milliseconds, mode));
#ifdef NCURSES_WGETCH_EVENTS
- if (mode & TW_EVENT) {
+ if (mode & 4) {
int event_delay = _nc_eventlist_timeout(evl);
if (event_delay >= 0
@@ -209,7 +193,7 @@ _nc_timed_wait(SCREEN *sp MAYBE_UNUSED,
count = 0;
#ifdef NCURSES_WGETCH_EVENTS
- if ((mode & TW_EVENT) && evl)
+ if ((mode & 4) && evl)
evl->result_flags = 0;
#endif
@@ -217,23 +201,23 @@ _nc_timed_wait(SCREEN *sp MAYBE_UNUSED,
memset(fd_list, 0, sizeof(fd_list));
#ifdef NCURSES_WGETCH_EVENTS
- if ((mode & TW_EVENT) && evl)
+ if ((mode & 4) && evl)
fds = typeMalloc(struct pollfd, MIN_FDS + evl->count);
#endif
- if (mode & TW_INPUT) {
+ if (mode & 1) {
fds[count].fd = sp->_ifd;
fds[count].events = POLLIN;
count++;
}
- if ((mode & TW_MOUSE)
+ if ((mode & 2)
&& (fd = sp->_mouse_fd) >= 0) {
fds[count].fd = fd;
fds[count].events = POLLIN;
count++;
}
#ifdef NCURSES_WGETCH_EVENTS
- if ((mode & TW_EVENT) && evl) {
+ if ((mode & 4) && evl) {
for (n = 0; n < evl->count; ++n) {
_nc_event *ev = evl->events[n];
@@ -250,7 +234,7 @@ _nc_timed_wait(SCREEN *sp MAYBE_UNUSED,
result = poll(fds, (unsigned) count, milliseconds);
#ifdef NCURSES_WGETCH_EVENTS
- if ((mode & TW_EVENT) && evl) {
+ if ((mode & 4) && evl) {
int c;
if (!result)
@@ -292,8 +276,8 @@ _nc_timed_wait(SCREEN *sp MAYBE_UNUSED,
*
* FIXME: this assumes mode&1 if milliseconds < 0 (see lib_getch.c).
*/
- result = TW_NONE;
- if (mode & TW_INPUT) {
+ result = 0;
+ if (mode & 1) {
int step = (milliseconds < 0) ? 0 : 5000;
bigtime_t d;
bigtime_t useconds = milliseconds * 1000;
@@ -329,17 +313,17 @@ _nc_timed_wait(SCREEN *sp MAYBE_UNUSED,
*/
FD_ZERO(&set);
- if (mode & TW_INPUT) {
+ if (mode & 1) {
FD_SET(sp->_ifd, &set);
count = sp->_ifd + 1;
}
- if ((mode & TW_MOUSE)
+ if ((mode & 2)
&& (fd = sp->_mouse_fd) >= 0) {
FD_SET(fd, &set);
count = max(fd, count) + 1;
}
#ifdef NCURSES_WGETCH_EVENTS
- if ((mode & TW_EVENT) && evl) {
+ if ((mode & 4) && evl) {
for (n = 0; n < evl->count; ++n) {
_nc_event *ev = evl->events[n];
@@ -362,7 +346,7 @@ _nc_timed_wait(SCREEN *sp MAYBE_UNUSED,
}
#ifdef NCURSES_WGETCH_EVENTS
- if ((mode & TW_EVENT) && evl) {
+ if ((mode & 4) && evl) {
evl->result_flags = 0;
for (n = 0; n < evl->count; ++n) {
_nc_event *ev = evl->events[n];
@@ -386,7 +370,7 @@ _nc_timed_wait(SCREEN *sp MAYBE_UNUSED,
returntime = _nc_gettime(&t0, FALSE);
if (milliseconds >= 0)
- milliseconds -= (int) (returntime - starttime);
+ milliseconds -= (returntime - starttime);
#ifdef NCURSES_WGETCH_EVENTS
if (evl) {
@@ -444,22 +428,22 @@ _nc_timed_wait(SCREEN *sp MAYBE_UNUSED,
}
}
#elif defined(__BEOS__)
- result = TW_INPUT; /* redundant, but simple */
+ result = 1; /* redundant, but simple */
#elif HAVE_SELECT
- if ((mode & TW_MOUSE)
+ if ((mode & 2)
&& (fd = sp->_mouse_fd) >= 0
&& FD_ISSET(fd, &set))
- result |= TW_MOUSE;
- if ((mode & TW_INPUT)
+ result |= 2;
+ if ((mode & 1)
&& FD_ISSET(sp->_ifd, &set))
- result |= TW_INPUT;
+ result |= 1;
#endif
} else
result = 0;
}
#ifdef NCURSES_WGETCH_EVENTS
- if ((mode & TW_EVENT) && evl && evl->result_flags)
- result |= TW_EVENT;
+ if ((mode & 4) && evl && evl->result_flags)
+ result |= 4;
#endif
return (result);
diff --git a/ncurses/tty/lib_vidattr.c b/ncurses/tty/lib_vidattr.c
index 9656b3c70ee6..ac2a74f08e01 100644
--- a/ncurses/tty/lib_vidattr.c
+++ b/ncurses/tty/lib_vidattr.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the *
@@ -29,8 +29,7 @@
/****************************************************************************
* Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 *
* and: Eric S. Raymond <esr@snark.thyrsus.com> *
- * and: Thomas E. Dickey 1996-on *
- * and: Juergen Pfeifer 2009 *
+ * and: Thomas E. Dickey 1996 on *
****************************************************************************/
/*
@@ -64,16 +63,11 @@
*/
#include <curses.priv.h>
+#include <term.h>
-#ifndef CUR
-#define CUR SP_TERMTYPE
-#endif
-
-MODULE_ID("$Id: lib_vidattr.c,v 1.61 2010/06/05 22:22:04 tom Exp $")
+MODULE_ID("$Id: lib_vidattr.c,v 1.49 2007/06/30 21:58:04 tom Exp $")
-#define doPut(mode) \
- TPUTS_TRACE(#mode); \
- NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx mode, 1, outc)
+#define doPut(mode) TPUTS_TRACE(#mode); tputs(mode, 1, outc)
#define TurnOn(mask,mode) \
if ((turn_on & mask) && mode) { doPut(mode); }
@@ -84,49 +78,40 @@ MODULE_ID("$Id: lib_vidattr.c,v 1.61 2010/06/05 22:22:04 tom Exp $")
/* if there is no current screen, assume we *can* do color */
#define SetColorsIf(why,old_attr) \
if (can_color && (why)) { \
- int old_pair = PairNumber(old_attr); \
+ int old_pair = PAIR_NUMBER(old_attr); \
TR(TRACE_ATTRS, ("old pair = %d -- new pair = %d", old_pair, pair)); \
if ((pair != old_pair) \
|| (fix_pair0 && (pair == 0)) \
|| (reverse ^ ((old_attr & A_REVERSE) != 0))) { \
- NCURSES_SP_NAME(_nc_do_color)(NCURSES_SP_ARGx \
- (short) old_pair, \
- (short) pair, \
- reverse, outc); \
+ _nc_do_color(old_pair, pair, reverse, outc); \
} \
}
#define PreviousAttr _nc_prescreen.previous_attr
NCURSES_EXPORT(int)
-NCURSES_SP_NAME(vidputs) (NCURSES_SP_DCLx
- chtype newmode,
- NCURSES_SP_OUTC outc)
+vidputs(chtype newmode, int (*outc) (int))
{
attr_t turn_on, turn_off;
int pair;
bool reverse = FALSE;
- bool can_color = (SP_PARM == 0 || SP_PARM->_coloron);
+ bool can_color = (SP == 0 || SP->_coloron);
#if NCURSES_EXT_FUNCS
- bool fix_pair0 = (SP_PARM != 0 && SP_PARM->_coloron && !SP_PARM->_default_color);
+ bool fix_pair0 = (SP != 0 && SP->_coloron && !SP->_default_color);
#else
#define fix_pair0 FALSE
#endif
newmode &= A_ATTRIBUTES;
-
- T((T_CALLED("vidputs(%p,%s)"), (void *) SP_PARM, _traceattr(newmode)));
-
- if (!IsTermInfo(SP_PARM))
- returnCode(ERR);
+ T((T_CALLED("vidputs(%s)"), _traceattr(newmode)));
/* this allows us to go on whether or not newterm() has been called */
- if (SP_PARM)
- PreviousAttr = AttrOf(SCREEN_ATTRS(SP_PARM));
+ if (SP)
+ PreviousAttr = AttrOf(SCREEN_ATTRS(SP));
TR(TRACE_ATTRS, ("previous attribute was %s", _traceattr(PreviousAttr)));
- if ((SP_PARM != 0)
+ if ((SP != 0)
&& (magic_cookie_glitch > 0)) {
#if USE_XMC_SUPPORT
static const chtype table[] =
@@ -150,7 +135,7 @@ NCURSES_SP_NAME(vidputs) (NCURSES_SP_DCLx
* the terminfo max_attributes value.
*/
for (n = 0; n < SIZEOF(table); ++n) {
- if ((table[n] & SP_PARM->_ok_attributes) == 0) {
+ if ((table[n] & SP->_ok_attributes) == 0) {
newmode &= ~table[n];
} else if ((table[n] & newmode) != 0) {
if (used++ >= limit) {
@@ -163,7 +148,7 @@ NCURSES_SP_NAME(vidputs) (NCURSES_SP_DCLx
}
}
#else
- newmode &= ~(SP_PARM->_xmc_suppress);
+ newmode &= ~(SP->_xmc_suppress);
#endif
TR(TRACE_ATTRS, ("suppressed attribute is %s", _traceattr(newmode)));
}
@@ -187,7 +172,7 @@ NCURSES_SP_NAME(vidputs) (NCURSES_SP_DCLx
* A_ALTCHARSET (256) down 2 to line up. We use the NCURSES_BITS
* macro so this will work properly for the wide-character layout.
*/
- unsigned value = (unsigned) no_color_video;
+ unsigned value = no_color_video;
attr_t mask = NCURSES_BITS((value & 63)
| ((value & 192) << 1)
| ((value & 256) >> 2), 8);
@@ -203,7 +188,7 @@ NCURSES_SP_NAME(vidputs) (NCURSES_SP_DCLx
if (newmode == PreviousAttr)
returnCode(OK);
- pair = PairNumber(newmode);
+ pair = PAIR_NUMBER(newmode);
if (reverse) {
newmode &= ~A_REVERSE;
@@ -223,10 +208,10 @@ NCURSES_SP_NAME(vidputs) (NCURSES_SP_DCLx
if (exit_attribute_mode) {
doPut(exit_attribute_mode);
} else {
- if (!SP_PARM || SP_PARM->_use_rmul) {
+ if (!SP || SP->_use_rmul) {
TurnOff(A_UNDERLINE, exit_underline_mode);
}
- if (!SP_PARM || SP_PARM->_use_rmso) {
+ if (!SP || SP->_use_rmso) {
TurnOff(A_STANDOUT, exit_standout_mode);
}
}
@@ -237,18 +222,16 @@ NCURSES_SP_NAME(vidputs) (NCURSES_SP_DCLx
} else if (set_attributes) {
if (turn_on || turn_off) {
TPUTS_TRACE("set_attributes");
- NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx
- tparm(set_attributes,
- (newmode & A_STANDOUT) != 0,
- (newmode & A_UNDERLINE) != 0,
- (newmode & A_REVERSE) != 0,
- (newmode & A_BLINK) != 0,
- (newmode & A_DIM) != 0,
- (newmode & A_BOLD) != 0,
- (newmode & A_INVIS) != 0,
- (newmode & A_PROTECT) != 0,
- (newmode & A_ALTCHARSET) != 0),
- 1, outc);
+ tputs(tparm(set_attributes,
+ (newmode & A_STANDOUT) != 0,
+ (newmode & A_UNDERLINE) != 0,
+ (newmode & A_REVERSE) != 0,
+ (newmode & A_BLINK) != 0,
+ (newmode & A_DIM) != 0,
+ (newmode & A_BOLD) != 0,
+ (newmode & A_INVIS) != 0,
+ (newmode & A_PROTECT) != 0,
+ (newmode & A_ALTCHARSET) != 0), 1, outc);
PreviousAttr &= ALL_BUT_COLOR;
}
SetColorsIf((pair != 0) || fix_pair0, PreviousAttr);
@@ -258,11 +241,11 @@ NCURSES_SP_NAME(vidputs) (NCURSES_SP_DCLx
TurnOff(A_ALTCHARSET, exit_alt_charset_mode);
- if (!SP_PARM || SP_PARM->_use_rmul) {
+ if (!SP || SP->_use_rmul) {
TurnOff(A_UNDERLINE, exit_underline_mode);
}
- if (!SP_PARM || SP_PARM->_use_rmso) {
+ if (!SP || SP->_use_rmso) {
TurnOff(A_STANDOUT, exit_standout_mode);
}
@@ -299,53 +282,28 @@ NCURSES_SP_NAME(vidputs) (NCURSES_SP_DCLx
if (reverse)
newmode |= A_REVERSE;
- if (SP_PARM)
- SetAttr(SCREEN_ATTRS(SP_PARM), newmode);
+ if (SP)
+ SetAttr(SCREEN_ATTRS(SP), newmode);
else
PreviousAttr = newmode;
returnCode(OK);
}
-#if NCURSES_SP_FUNCS
-NCURSES_EXPORT(int)
-vidputs(chtype newmode, NCURSES_OUTC outc)
-{
- SetSafeOutcWrapper(outc);
- return NCURSES_SP_NAME(vidputs) (CURRENT_SCREEN,
- newmode,
- _nc_outc_wrapper);
-}
-#endif
-
-NCURSES_EXPORT(int)
-NCURSES_SP_NAME(vidattr) (NCURSES_SP_DCLx chtype newmode)
-{
- T((T_CALLED("vidattr(%p,%s)"), (void *) SP_PARM, _traceattr(newmode)));
- returnCode(NCURSES_SP_NAME(vidputs) (NCURSES_SP_ARGx
- newmode,
- NCURSES_SP_NAME(_nc_outch)));
-}
-
-#if NCURSES_SP_FUNCS
NCURSES_EXPORT(int)
vidattr(chtype newmode)
{
- return NCURSES_SP_NAME(vidattr) (CURRENT_SCREEN, newmode);
+ T((T_CALLED("vidattr(%s)"), _traceattr(newmode)));
+
+ returnCode(vidputs(newmode, _nc_outch));
}
-#endif
NCURSES_EXPORT(chtype)
-NCURSES_SP_NAME(termattrs) (NCURSES_SP_DCL0)
+termattrs(void)
{
chtype attrs = A_NORMAL;
- T((T_CALLED("termattrs(%p)"), (void *) SP_PARM));
-#ifdef USE_TERM_DRIVER
- if (HasTerminal(SP_PARM))
- attrs = CallDriver(SP_PARM, conattr);
-#else
-
+ T((T_CALLED("termattrs()")));
if (enter_alt_charset_mode)
attrs |= A_ALTCHARSET;
@@ -373,17 +331,8 @@ NCURSES_SP_NAME(termattrs) (NCURSES_SP_DCL0)
if (enter_underline_mode)
attrs |= A_UNDERLINE;
- if (SP_PARM->_coloron)
+ if (SP->_coloron)
attrs |= A_COLOR;
-#endif
- returnChtype(attrs);
-}
-
-#if NCURSES_SP_FUNCS
-NCURSES_EXPORT(chtype)
-termattrs(void)
-{
- return NCURSES_SP_NAME(termattrs) (CURRENT_SCREEN);
+ returnChar(attrs);
}
-#endif
diff --git a/ncurses/tty/tty_update.c b/ncurses/tty/tty_update.c
index f0d2369c18d6..6a3a0c8e9341 100644
--- a/ncurses/tty/tty_update.c
+++ b/ncurses/tty/tty_update.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the *
@@ -30,7 +30,6 @@
* Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 *
* and: Eric S. Raymond <esr@snark.thyrsus.com> *
* and: Thomas E. Dickey 1996-on *
- * and: Juergen Pfeifer 2009 *
****************************************************************************/
/*-----------------------------------------------------------------
@@ -39,16 +38,12 @@
*
* The routine doupdate() and its dependents.
* All physical output is concentrated here (except _nc_outch()
- * in lib_tputs.c).
+ * in lib_tputs.c).
*
*-----------------------------------------------------------------*/
#include <curses.priv.h>
-#ifndef CUR
-#define CUR SP_TERMTYPE
-#endif
-
#if defined __HAIKU__ && defined __BEOS__
#undef __BEOS__
#endif
@@ -81,8 +76,9 @@
#endif
#include <ctype.h>
+#include <term.h>
-MODULE_ID("$Id: tty_update.c,v 1.264 2010/12/19 01:21:02 tom Exp $")
+MODULE_ID("$Id: tty_update.c,v 1.246 2008/08/30 20:08:19 tom Exp $")
/*
* This define controls the line-breakout optimization. Every once in a
@@ -95,7 +91,7 @@ MODULE_ID("$Id: tty_update.c,v 1.264 2010/12/19 01:21:02 tom Exp $")
*/
#define CHECK_INTERVAL 5
-#define FILL_BCE(sp) (sp->_coloron && !sp->_default_color && !back_color_erase)
+#define FILL_BCE() (SP->_coloron && !SP->_default_color && !back_color_erase)
static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
static NCURSES_CH_T normal = NewChar(BLANK_TEXT);
@@ -107,23 +103,13 @@ static NCURSES_CH_T normal = NewChar(BLANK_TEXT);
*/
/* #define POSITION_DEBUG */
-static NCURSES_INLINE NCURSES_CH_T ClrBlank(NCURSES_SP_DCLx WINDOW *win);
-
-#if NCURSES_SP_FUNCS
-static int ClrBottom(SCREEN *, int total);
-static void ClearScreen(SCREEN *, NCURSES_CH_T blank);
-static void ClrUpdate(SCREEN *);
-static void DelChar(SCREEN *, int count);
-static void InsStr(SCREEN *, NCURSES_CH_T * line, int count);
-static void TransformLine(SCREEN *, int const lineno);
-#else
+static NCURSES_INLINE NCURSES_CH_T ClrBlank(WINDOW *win);
static int ClrBottom(int total);
static void ClearScreen(NCURSES_CH_T blank);
static void ClrUpdate(void);
static void DelChar(int count);
static void InsStr(NCURSES_CH_T * line, int count);
static void TransformLine(int const lineno);
-#endif
#ifdef POSITION_DEBUG
/****************************************************************************
@@ -133,7 +119,7 @@ static void TransformLine(int const lineno);
****************************************************************************/
static void
-position_check(NCURSES_SP_DCLx int expected_y, int expected_x, char *legend)
+position_check(int expected_y, int expected_x, char *legend)
/* check to see if the real cursor position matches the virtual */
{
char buf[20];
@@ -143,10 +129,10 @@ position_check(NCURSES_SP_DCLx int expected_y, int expected_x, char *legend)
if (!_nc_tracing || (expected_y < 0 && expected_x < 0))
return;
- NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_ARG);
+ _nc_flush();
memset(buf, '\0', sizeof(buf));
- NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx "\033[6n"); /* only works on ANSI-compatibles */
- NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_ARG);
+ putp("\033[6n"); /* only works on ANSI-compatibles */
+ _nc_flush();
*(s = buf) = 0;
do {
int ask = sizeof(buf) - 1 - (s - buf);
@@ -166,12 +152,8 @@ position_check(NCURSES_SP_DCLx int expected_y, int expected_x, char *legend)
if (expected_y < 0)
expected_y = y - 1;
if (y - 1 != expected_y || x - 1 != expected_x) {
- NCURSES_SP_NAME(beep) (NCURSES_SP_ARG);
- NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx
- tparm("\033[%d;%dH",
- expected_y + 1,
- expected_x + 1),
- 1, NCURSES_SP_NAME(_nc_outch));
+ beep();
+ tputs(tparm("\033[%d;%dH", expected_y + 1, expected_x + 1), 1, _nc_outch);
_tracef("position seen (%d, %d) doesn't match expected one (%d, %d) in %s",
y - 1, x - 1, expected_y, expected_x, legend);
} else {
@@ -180,7 +162,7 @@ position_check(NCURSES_SP_DCLx int expected_y, int expected_x, char *legend)
}
}
#else
-#define position_check(sp, expected_y, expected_x, legend) /* nothing */
+#define position_check(expected_y, expected_x, legend) /* nothing */
#endif /* POSITION_DEBUG */
/****************************************************************************
@@ -190,22 +172,19 @@ position_check(NCURSES_SP_DCLx int expected_y, int expected_x, char *legend)
****************************************************************************/
static NCURSES_INLINE void
-GoTo(NCURSES_SP_DCLx int const row, int const col)
+GoTo(int const row, int const col)
{
- TR(TRACE_MOVE, ("GoTo(%p, %d, %d) from (%d, %d)",
- (void *) SP_PARM, row, col, SP_PARM->_cursrow, SP_PARM->_curscol));
+ TR(TRACE_MOVE, ("GoTo(%d, %d) from (%d, %d)",
+ row, col, SP->_cursrow, SP->_curscol));
- position_check(SP_PARM, SP_PARM->_cursrow, SP_PARM->_curscol, "GoTo");
+ position_check(SP->_cursrow, SP->_curscol, "GoTo");
- TINFO_MVCUR(NCURSES_SP_ARGx
- SP_PARM->_cursrow,
- SP_PARM->_curscol,
- row, col);
- position_check(SP_PARM, SP_PARM->_cursrow, SP_PARM->_curscol, "GoTo2");
+ mvcur(SP->_cursrow, SP->_curscol, row, col);
+ position_check(SP->_cursrow, SP->_curscol, "GoTo2");
}
static NCURSES_INLINE void
-PutAttrChar(NCURSES_SP_DCLx CARG_CH_T ch)
+PutAttrChar(CARG_CH_T ch)
{
int chlen = 1;
NCURSES_CH_T my_ch;
@@ -215,7 +194,7 @@ PutAttrChar(NCURSES_SP_DCLx CARG_CH_T ch)
TR(TRACE_CHARPUT, ("PutAttrChar(%s) at (%d, %d)",
_tracech_t(ch),
- SP_PARM->_cursrow, SP_PARM->_curscol));
+ SP->_cursrow, SP->_curscol));
#if USE_WIDEC_SUPPORT
/*
* If this is not a valid character, there is nothing more to do.
@@ -245,12 +224,12 @@ PutAttrChar(NCURSES_SP_DCLx CARG_CH_T ch)
*/
if (is8bits(CharOf(CHDEREF(ch)))
&& (isprint(CharOf(CHDEREF(ch)))
- || (SP_PARM->_legacy_coding > 0 && CharOf(CHDEREF(ch)) >= 160)
- || (SP_PARM->_legacy_coding > 1 && CharOf(CHDEREF(ch)) >= 128)
+ || (SP->_legacy_coding > 0 && CharOf(CHDEREF(ch)) >= 160)
+ || (SP->_legacy_coding > 1 && CharOf(CHDEREF(ch)) >= 128)
|| (AttrOf(attr) & A_ALTCHARSET
&& ((CharOfD(ch) < ACS_LEN
- && SP_PARM->_acs_map != 0
- && SP_PARM->_acs_map[CharOfD(ch)] != 0)
+ && SP->_acs_map != 0
+ && SP->_acs_map[CharOfD(ch)] != 0)
|| (CharOfD(ch) >= 128))))) {
;
} else {
@@ -262,7 +241,7 @@ PutAttrChar(NCURSES_SP_DCLx CARG_CH_T ch)
#endif
if ((AttrOf(attr) & A_ALTCHARSET)
- && SP_PARM->_acs_map != 0
+ && SP->_acs_map != 0
&& CharOfD(ch) < ACS_LEN) {
my_ch = CHDEREF(ch); /* work around const param */
#if USE_WIDEC_SUPPORT
@@ -272,8 +251,8 @@ PutAttrChar(NCURSES_SP_DCLx CARG_CH_T ch)
* character, and uses the wide-character mapping when we expect the
* normal one to be broken (by mis-design ;-).
*/
- if (SP_PARM->_screen_acs_fix
- && SP_PARM->_screen_acs_map[CharOf(my_ch)]) {
+ if (SP->_screen_acs_fix
+ && SP->_screen_acs_map[CharOf(my_ch)]) {
RemAttr(attr, A_ALTCHARSET);
my_ch = _nc_wacs[CharOf(my_ch)];
}
@@ -286,9 +265,9 @@ PutAttrChar(NCURSES_SP_DCLx CARG_CH_T ch)
*/
if (AttrOf(attr) & A_ALTCHARSET) {
int j = CharOfD(ch);
- chtype temp = UChar(SP_PARM->_acs_map[j]);
+ chtype temp = UChar(SP->_acs_map[j]);
- if (!(SP_PARM->_screen_acs_map[j])) {
+ if (!(SP->_screen_acs_map[j])) {
RemAttr(attr, A_ALTCHARSET);
if (temp == 0)
temp = ' ';
@@ -303,28 +282,28 @@ PutAttrChar(NCURSES_SP_DCLx CARG_CH_T ch)
ch = CHREF(tilde);
}
- UpdateAttrs(SP_PARM, attr);
+ UpdateAttrs(attr);
#if !USE_WIDEC_SUPPORT
/* FIXME - we do this special case for signal handling, should see how to
* make it work for wide characters.
*/
- if (SP_PARM->_outch != 0) {
- SP_PARM->_outch(NCURSES_SP_ARGx UChar(ch));
+ if (SP->_outch != 0) {
+ SP->_outch(UChar(ch));
} else
#endif
{
- PUTC(CHDEREF(ch), SP_PARM->_ofp); /* macro's fastest... */
+ PUTC(CHDEREF(ch), SP->_ofp); /* macro's fastest... */
COUNT_OUTCHARS(1);
}
- SP_PARM->_curscol += chlen;
+ SP->_curscol += chlen;
if (char_padding) {
TPUTS_TRACE("char_padding");
- NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx char_padding);
+ putp(char_padding);
}
}
static bool
-check_pending(NCURSES_SP_DCL0)
+check_pending(void)
/* check for pending input */
{
bool have_pending = FALSE;
@@ -334,13 +313,13 @@ check_pending(NCURSES_SP_DCL0)
* have the refreshing slow down drastically (or stop) if there's an
* unread character available.
*/
- if (SP_PARM->_fifohold != 0)
+ if (SP->_fifohold != 0)
return FALSE;
- if (SP_PARM->_checkfd >= 0) {
+ if (SP->_checkfd >= 0) {
#if USE_FUNC_POLL
struct pollfd fds[1];
- fds[0].fd = SP_PARM->_checkfd;
+ fds[0].fd = SP->_checkfd;
fds[0].events = POLLIN;
if (poll(fds, 1, 0) > 0) {
have_pending = TRUE;
@@ -368,52 +347,43 @@ check_pending(NCURSES_SP_DCL0)
ktimeout.tv_usec = 0;
FD_ZERO(&fdset);
- FD_SET(SP_PARM->_checkfd, &fdset);
- if (select(SP_PARM->_checkfd + 1, &fdset, NULL, NULL, &ktimeout) != 0) {
+ FD_SET(SP->_checkfd, &fdset);
+ if (select(SP->_checkfd + 1, &fdset, NULL, NULL, &ktimeout) != 0) {
have_pending = TRUE;
}
#endif
}
if (have_pending) {
- SP_PARM->_fifohold = 5;
- NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_ARG);
+ SP->_fifohold = 5;
+ _nc_flush();
}
return FALSE;
}
/* put char at lower right corner */
static void
-PutCharLR(NCURSES_SP_DCLx const ARG_CH_T ch)
+PutCharLR(const ARG_CH_T ch)
{
if (!auto_right_margin) {
/* we can put the char directly */
- PutAttrChar(NCURSES_SP_ARGx ch);
+ PutAttrChar(ch);
} else if (enter_am_mode && exit_am_mode) {
/* we can suppress automargin */
TPUTS_TRACE("exit_am_mode");
- NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx exit_am_mode);
+ putp(exit_am_mode);
- PutAttrChar(NCURSES_SP_ARGx ch);
- SP_PARM->_curscol--;
- position_check(SP_PARM,
- SP_PARM->_cursrow,
- SP_PARM->_curscol,
- "exit_am_mode");
+ PutAttrChar(ch);
+ SP->_curscol--;
+ position_check(SP->_cursrow, SP->_curscol, "exit_am_mode");
TPUTS_TRACE("enter_am_mode");
- NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx enter_am_mode);
+ putp(enter_am_mode);
} else if ((enter_insert_mode && exit_insert_mode)
|| insert_character || parm_ich) {
- GoTo(NCURSES_SP_ARGx
- screen_lines(SP_PARM) - 1,
- screen_columns(SP_PARM) - 2);
- PutAttrChar(NCURSES_SP_ARGx ch);
- GoTo(NCURSES_SP_ARGx
- screen_lines(SP_PARM) - 1,
- screen_columns(SP_PARM) - 2);
- InsStr(NCURSES_SP_ARGx
- NewScreen(SP_PARM)->_line[screen_lines(SP_PARM) - 1].text +
- screen_columns(SP_PARM) - 2, 1);
+ GoTo(screen_lines - 1, screen_columns - 2);
+ PutAttrChar(ch);
+ GoTo(screen_lines - 1, screen_columns - 2);
+ InsStr(newscr->_line[screen_lines - 1].text + screen_columns - 2, 1);
}
}
@@ -421,7 +391,7 @@ PutCharLR(NCURSES_SP_DCLx const ARG_CH_T ch)
* Wrap the cursor position, i.e., advance to the beginning of the next line.
*/
static void
-wrap_cursor(NCURSES_SP_DCL0)
+wrap_cursor(void)
{
if (eat_newline_glitch) {
/*
@@ -437,45 +407,40 @@ wrap_cursor(NCURSES_SP_DCL0)
* it's safe to just tell the code that the cursor is in hyperspace and
* let the next mvcur() call straighten things out.
*/
- SP_PARM->_curscol = -1;
- SP_PARM->_cursrow = -1;
+ SP->_curscol = -1;
+ SP->_cursrow = -1;
} else if (auto_right_margin) {
- SP_PARM->_curscol = 0;
- SP_PARM->_cursrow++;
+ SP->_curscol = 0;
+ SP->_cursrow++;
/*
* We've actually moved - but may have to work around problems with
* video attributes not working.
*/
- if (!move_standout_mode && AttrOf(SCREEN_ATTRS(SP_PARM))) {
+ if (!move_standout_mode && AttrOf(SCREEN_ATTRS(SP))) {
TR(TRACE_CHARPUT, ("turning off (%#lx) %s before wrapping",
- (unsigned long) AttrOf(SCREEN_ATTRS(SP_PARM)),
- _traceattr(AttrOf(SCREEN_ATTRS(SP_PARM)))));
- (void) VIDATTR(SP_PARM, A_NORMAL, 0);
+ (unsigned long) AttrOf(SCREEN_ATTRS(SP)),
+ _traceattr(AttrOf(SCREEN_ATTRS(SP)))));
+ (void) VIDATTR(A_NORMAL, 0);
}
} else {
- SP_PARM->_curscol--;
+ SP->_curscol--;
}
- position_check(SP_PARM,
- SP_PARM->_cursrow,
- SP_PARM->_curscol,
- "wrap_cursor");
+ position_check(SP->_cursrow, SP->_curscol, "wrap_cursor");
}
static NCURSES_INLINE void
-PutChar(NCURSES_SP_DCLx const ARG_CH_T ch)
+PutChar(const ARG_CH_T ch)
/* insert character, handling automargin stuff */
{
- if (SP_PARM->_cursrow == screen_lines(SP_PARM) - 1 &&
- SP_PARM->_curscol == screen_columns(SP_PARM) - 1) {
- PutCharLR(NCURSES_SP_ARGx ch);
- } else {
- PutAttrChar(NCURSES_SP_ARGx ch);
- }
+ if (SP->_cursrow == screen_lines - 1 && SP->_curscol == screen_columns - 1)
+ PutCharLR(ch);
+ else
+ PutAttrChar(ch);
- if (SP_PARM->_curscol >= screen_columns(SP_PARM))
- wrap_cursor(NCURSES_SP_ARG);
+ if (SP->_curscol >= screen_columns)
+ wrap_cursor();
- position_check(SP_PARM, SP_PARM->_cursrow, SP_PARM->_curscol, "PutChar");
+ position_check(SP->_cursrow, SP->_curscol, "PutChar");
}
/*
@@ -485,21 +450,19 @@ PutChar(NCURSES_SP_DCLx const ARG_CH_T ch)
* or can be output by clearing (A_COLOR in case of bce-terminal) are excluded.
*/
static NCURSES_INLINE bool
-can_clear_with(NCURSES_SP_DCLx ARG_CH_T ch)
+can_clear_with(ARG_CH_T ch)
{
- if (!back_color_erase && SP_PARM->_coloron) {
+ if (!back_color_erase && SP->_coloron) {
#if NCURSES_EXT_FUNCS
int pair;
- if (!SP_PARM->_default_color)
+ if (!SP->_default_color)
return FALSE;
- if (SP_PARM->_default_fg != C_MASK || SP_PARM->_default_bg != C_MASK)
+ if (SP->_default_fg != C_MASK || SP->_default_bg != C_MASK)
return FALSE;
if ((pair = GetPair(CHDEREF(ch))) != 0) {
short fg, bg;
- NCURSES_SP_NAME(pair_content) (NCURSES_SP_ARGx
- (short) pair,
- &fg, &bg);
+ pair_content(pair, &fg, &bg);
if (fg != C_MASK || bg != C_MASK)
return FALSE;
}
@@ -525,7 +488,7 @@ can_clear_with(NCURSES_SP_DCLx ARG_CH_T ch)
* This code is optimized using ech and rep.
*/
static int
-EmitRange(NCURSES_SP_DCLx const NCURSES_CH_T * ntext, int num)
+EmitRange(const NCURSES_CH_T * ntext, int num)
{
int i;
@@ -537,13 +500,13 @@ EmitRange(NCURSES_SP_DCLx const NCURSES_CH_T * ntext, int num)
NCURSES_CH_T ntext0;
while (num > 1 && !CharEq(ntext[0], ntext[1])) {
- PutChar(NCURSES_SP_ARGx CHREF(ntext[0]));
+ PutChar(CHREF(ntext[0]));
ntext++;
num--;
}
ntext0 = ntext[0];
if (num == 1) {
- PutChar(NCURSES_SP_ARGx CHREF(ntext0));
+ PutChar(CHREF(ntext0));
return 0;
}
runcount = 2;
@@ -560,11 +523,10 @@ EmitRange(NCURSES_SP_DCLx const NCURSES_CH_T * ntext, int num)
* which it would be marginally advantageous.
*/
if (erase_chars
- && runcount > SP_PARM->_ech_cost + SP_PARM->_cup_ch_cost
- && can_clear_with(NCURSES_SP_ARGx CHREF(ntext0))) {
- UpdateAttrs(SP_PARM, ntext0);
- NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx
- TPARM_1(erase_chars, runcount));
+ && runcount > SP->_ech_cost + SP->_cup_ch_cost
+ && can_clear_with(CHREF(ntext0))) {
+ UpdateAttrs(ntext0);
+ putp(TPARM_1(erase_chars, runcount));
/*
* If this is the last part of the given interval,
@@ -572,34 +534,27 @@ EmitRange(NCURSES_SP_DCLx const NCURSES_CH_T * ntext, int num)
* last update on the line.
*/
if (runcount < num) {
- GoTo(NCURSES_SP_ARGx
- SP_PARM->_cursrow,
- SP_PARM->_curscol + runcount);
+ GoTo(SP->_cursrow, SP->_curscol + runcount);
} else {
return 1; /* cursor stays in the middle */
}
- } else if (repeat_char && runcount > SP_PARM->_rep_cost) {
- bool wrap_possible = (SP_PARM->_curscol + runcount >=
- screen_columns(SP_PARM));
+ } else if (repeat_char && runcount > SP->_rep_cost) {
+ bool wrap_possible = (SP->_curscol + runcount >= screen_columns);
int rep_count = runcount;
if (wrap_possible)
rep_count--;
- UpdateAttrs(SP_PARM, ntext0);
- NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx
- TPARM_2(repeat_char,
- CharOf(ntext0),
- rep_count),
- rep_count,
- NCURSES_SP_NAME(_nc_outch));
- SP_PARM->_curscol += rep_count;
+ UpdateAttrs(ntext0);
+ tputs(TPARM_2(repeat_char, CharOf(ntext0), rep_count),
+ rep_count, _nc_outch);
+ SP->_curscol += rep_count;
if (wrap_possible)
- PutChar(NCURSES_SP_ARGx CHREF(ntext0));
+ PutChar(CHREF(ntext0));
} else {
for (i = 0; i < runcount; i++)
- PutChar(NCURSES_SP_ARGx CHREF(ntext[i]));
+ PutChar(CHREF(ntext[i]));
}
ntext += runcount;
num -= runcount;
@@ -608,7 +563,7 @@ EmitRange(NCURSES_SP_DCLx const NCURSES_CH_T * ntext, int num)
}
for (i = 0; i < num; i++)
- PutChar(NCURSES_SP_ARGx CHREF(ntext[i]));
+ PutChar(CHREF(ntext[i]));
return 0;
}
@@ -621,43 +576,39 @@ EmitRange(NCURSES_SP_DCLx const NCURSES_CH_T * ntext, int num)
* Returns: same as EmitRange
*/
static int
-PutRange(NCURSES_SP_DCLx
- const NCURSES_CH_T * otext,
+PutRange(const NCURSES_CH_T * otext,
const NCURSES_CH_T * ntext,
int row,
int first, int last)
{
int i, j, same;
- TR(TRACE_CHARPUT, ("PutRange(%p, %p, %p, %d, %d, %d)",
- (void *) SP_PARM,
- (const void *) otext,
- (const void *) ntext,
- row, first, last));
+ TR(TRACE_CHARPUT, ("PutRange(%p, %p, %d, %d, %d)",
+ otext, ntext, row, first, last));
if (otext != ntext
- && (last - first + 1) > SP_PARM->_inline_cost) {
+ && (last - first + 1) > SP->_inline_cost) {
for (j = first, same = 0; j <= last; j++) {
if (!same && isWidecExt(otext[j]))
continue;
if (CharEq(otext[j], ntext[j])) {
same++;
} else {
- if (same > SP_PARM->_inline_cost) {
- EmitRange(NCURSES_SP_ARGx ntext + first, j - same - first);
- GoTo(NCURSES_SP_ARGx row, first = j);
+ if (same > SP->_inline_cost) {
+ EmitRange(ntext + first, j - same - first);
+ GoTo(row, first = j);
}
same = 0;
}
}
- i = EmitRange(NCURSES_SP_ARGx ntext + first, j - same - first);
+ i = EmitRange(ntext + first, j - same - first);
/*
* Always return 1 for the next GoTo() after a PutRange() if we found
* identical characters at end of interval
*/
return (same == 0 ? i : 1);
}
- return EmitRange(NCURSES_SP_ARGx ntext + first, last - first + 1);
+ return EmitRange(ntext + first, last - first + 1);
}
/* leave unbracketed here so 'indent' works */
@@ -667,7 +618,7 @@ PutRange(NCURSES_SP_DCLx
if_USE_SCROLL_HINTS(win->_line[row].oldindex = row)
NCURSES_EXPORT(int)
-TINFO_DOUPDATE(NCURSES_SP_DCL0)
+doupdate(void)
{
int i;
int nonempty;
@@ -675,49 +626,30 @@ TINFO_DOUPDATE(NCURSES_SP_DCL0)
struct tms before, after;
#endif /* USE_TRACE_TIMES */
- T((T_CALLED("_nc_tinfo:doupdate(%p)"), (void *) SP_PARM));
+ T((T_CALLED("doupdate()")));
-#if !USE_REENTRANT
- /*
- * It is "legal" but unlikely that an application could assign a new
- * value to one of the standard windows. Check for that possibility
- * and try to recover.
- *
- * We do not allow applications to assign new values in the reentrant
- * model.
- */
-#define SyncScreens(internal,exported) \
- if (internal == 0) internal = exported; \
- if (internal != exported) exported = internal
-
- SyncScreens(CurScreen(SP_PARM), curscr);
- SyncScreens(NewScreen(SP_PARM), newscr);
- SyncScreens(StdScreen(SP_PARM), stdscr);
-#endif
-
- if (CurScreen(SP_PARM) == 0
- || NewScreen(SP_PARM) == 0
- || StdScreen(SP_PARM) == 0)
+ if (curscr == 0
+ || newscr == 0)
returnCode(ERR);
#ifdef TRACE
if (USE_TRACEF(TRACE_UPDATE)) {
- if (CurScreen(SP_PARM)->_clear)
+ if (curscr->_clear)
_tracef("curscr is clear");
else
- _tracedump("curscr", CurScreen(SP_PARM));
- _tracedump("newscr", NewScreen(SP_PARM));
+ _tracedump("curscr", curscr);
+ _tracedump("newscr", newscr);
_nc_unlock_global(tracef);
}
#endif /* TRACE */
_nc_signal_handler(FALSE);
- if (SP_PARM->_fifohold)
- SP_PARM->_fifohold--;
+ if (SP->_fifohold)
+ SP->_fifohold--;
#if USE_SIZECHANGE
- if (SP_PARM->_endwin || _nc_handle_sigwinch(SP_PARM)) {
+ if (SP->_endwin || _nc_handle_sigwinch(SP)) {
/*
* This is a transparent extension: XSI does not address it,
* and applications need not know that ncurses can do it.
@@ -726,20 +658,20 @@ TINFO_DOUPDATE(NCURSES_SP_DCL0)
* (this can happen in an xterm, for example), and resize the
* ncurses data structures accordingly.
*/
- _nc_update_screensize(SP_PARM);
+ _nc_update_screensize(SP);
}
#endif
- if (SP_PARM->_endwin) {
+ if (SP->_endwin) {
T(("coming back from shell mode"));
- NCURSES_SP_NAME(reset_prog_mode) (NCURSES_SP_ARG);
+ reset_prog_mode();
- NCURSES_SP_NAME(_nc_mvcur_resume) (NCURSES_SP_ARG);
- NCURSES_SP_NAME(_nc_screen_resume) (NCURSES_SP_ARG);
- SP_PARM->_mouse_resume(SP_PARM);
+ _nc_mvcur_resume();
+ _nc_screen_resume();
+ SP->_mouse_resume(SP);
- SP_PARM->_endwin = FALSE;
+ SP->_endwin = FALSE;
}
#if USE_TRACE_TIMES
/* zero the metering machinery */
@@ -763,11 +695,11 @@ TINFO_DOUPDATE(NCURSES_SP_DCL0)
int j, k;
attr_t rattr = A_NORMAL;
- for (i = 0; i < screen_lines(SP_PARM); i++) {
- for (j = 0; j < screen_columns(SP_PARM); j++) {
+ for (i = 0; i < screen_lines; i++) {
+ for (j = 0; j < screen_columns; j++) {
bool failed = FALSE;
- NCURSES_CH_T *thisline = NewScreen(SP_PARM)->_line[i].text;
- attr_t thisattr = AttrOf(thisline[j]) & SP_PARM->_xmc_triggers;
+ NCURSES_CH_T *thisline = newscr->_line[i].text;
+ attr_t thisattr = AttrOf(thisline[j]) & SP->_xmc_triggers;
attr_t turnon = thisattr & ~rattr;
/* is an attribute turned on here? */
@@ -785,8 +717,8 @@ TINFO_DOUPDATE(NCURSES_SP_DCL0)
* there's enough room to set the attribute before the first
* non-blank in the run.
*/
-#define SAFE(scr,a) (!((a) & (scr)->_xmc_triggers))
- if (ISBLANK(thisline[j]) && SAFE(SP_PARM, turnon)) {
+#define SAFE(a) (!((a) & SP->_xmc_triggers))
+ if (ISBLANK(thisline[j]) && SAFE(turnon)) {
RemAttr(thisline[j], turnon);
continue;
}
@@ -795,14 +727,14 @@ TINFO_DOUPDATE(NCURSES_SP_DCL0)
for (k = 1; k <= magic_cookie_glitch; k++) {
if (j - k < 0
|| !ISBLANK(thisline[j - k])
- || !SAFE(SP_PARM, AttrOf(thisline[j - k]))) {
+ || !SAFE(AttrOf(thisline[j - k]))) {
failed = TRUE;
TR(TRACE_ATTRS, ("No room at start in %d,%d%s%s",
i, j - k,
(ISBLANK(thisline[j - k])
? ""
: ":nonblank"),
- (SAFE(SP_PARM, AttrOf(thisline[j - k]))
+ (SAFE(AttrOf(thisline[j - k]))
? ""
: ":unsafe")));
break;
@@ -813,11 +745,10 @@ TINFO_DOUPDATE(NCURSES_SP_DCL0)
int m, n = j;
/* find end of span, if it's onscreen */
- for (m = i; m < screen_lines(SP_PARM); m++) {
- for (; n < screen_columns(SP_PARM); n++) {
- attr_t testattr =
- AttrOf(NewScreen(SP_PARM)->_line[m].text[n]);
- if ((testattr & SP_PARM->_xmc_triggers) == rattr) {
+ for (m = i; m < screen_lines; m++) {
+ for (; n < screen_columns; n++) {
+ attr_t testattr = AttrOf(newscr->_line[m].text[n]);
+ if ((testattr & SP->_xmc_triggers) == rattr) {
end_onscreen = TRUE;
TR(TRACE_ATTRS,
("Range attributed with %s ends at (%d, %d)",
@@ -833,8 +764,7 @@ TINFO_DOUPDATE(NCURSES_SP_DCL0)
foundit:;
if (end_onscreen) {
- NCURSES_CH_T *lastline =
- NewScreen(SP_PARM)->_line[m].text;
+ NCURSES_CH_T *lastline = newscr->_line[m].text;
/*
* If there are safely-attributed blanks at the end of
@@ -843,15 +773,15 @@ TINFO_DOUPDATE(NCURSES_SP_DCL0)
*/
while (n >= 0
&& ISBLANK(lastline[n])
- && SAFE(SP_PARM, AttrOf(lastline[n]))) {
+ && SAFE(AttrOf(lastline[n]))) {
RemAttr(lastline[n--], turnon);
}
/* check that there's enough room at end of span */
for (k = 1; k <= magic_cookie_glitch; k++) {
- if (n + k >= screen_columns(SP_PARM)
+ if (n + k >= screen_columns
|| !ISBLANK(lastline[n + k])
- || !SAFE(SP_PARM, AttrOf(lastline[n + k]))) {
+ || !SAFE(AttrOf(lastline[n + k]))) {
failed = TRUE;
TR(TRACE_ATTRS,
("No room at end in %d,%d%s%s",
@@ -859,7 +789,7 @@ TINFO_DOUPDATE(NCURSES_SP_DCL0)
(ISBLANK(lastline[n + k])
? ""
: ":nonblank"),
- (SAFE(SP_PARM, AttrOf(lastline[n + k]))
+ (SAFE(AttrOf(lastline[n + k]))
? ""
: ":unsafe")));
break;
@@ -876,12 +806,12 @@ TINFO_DOUPDATE(NCURSES_SP_DCL0)
_traceattr(turnon), i, j));
/* turn off new attributes over span */
- for (p = i; p < screen_lines(SP_PARM); p++) {
- for (; q < screen_columns(SP_PARM); q++) {
+ for (p = i; p < screen_lines; p++) {
+ for (; q < screen_columns; q++) {
attr_t testattr = AttrOf(newscr->_line[p].text[q]);
- if ((testattr & SP_PARM->_xmc_triggers) == rattr)
+ if ((testattr & SP->_xmc_triggers) == rattr)
goto foundend;
- RemAttr(NewScreen(SP_PARM)->_line[p].text[q], turnon);
+ RemAttr(newscr->_line[p].text[q], turnon);
}
q = 0;
}
@@ -907,7 +837,7 @@ TINFO_DOUPDATE(NCURSES_SP_DCL0)
/* show altered highlights after magic-cookie check */
if (USE_TRACEF(TRACE_UPDATE)) {
_tracef("After magic-cookie check...");
- _tracedump("newscr", NewScreen(SP_PARM));
+ _tracedump("newscr", newscr);
_nc_unlock_global(tracef);
}
#endif /* TRACE */
@@ -915,23 +845,23 @@ TINFO_DOUPDATE(NCURSES_SP_DCL0)
#endif /* USE_XMC_SUPPORT */
nonempty = 0;
- if (CurScreen(SP_PARM)->_clear || NewScreen(SP_PARM)->_clear) { /* force refresh ? */
- ClrUpdate(NCURSES_SP_ARG);
- CurScreen(SP_PARM)->_clear = FALSE; /* reset flag */
- NewScreen(SP_PARM)->_clear = FALSE; /* reset flag */
+ if (curscr->_clear || newscr->_clear) { /* force refresh ? */
+ ClrUpdate();
+ curscr->_clear = FALSE; /* reset flag */
+ newscr->_clear = FALSE; /* reset flag */
} else {
int changedlines = CHECK_INTERVAL;
- if (check_pending(NCURSES_SP_ARG))
+ if (check_pending())
goto cleanup;
- nonempty = min(screen_lines(SP_PARM), NewScreen(SP_PARM)->_maxy + 1);
+ nonempty = min(screen_lines, newscr->_maxy + 1);
- if (SP_PARM->_scrolling) {
- NCURSES_SP_NAME(_nc_scroll_optimize) (NCURSES_SP_ARG);
+ if (SP->_scrolling) {
+ _nc_scroll_optimize();
}
- nonempty = ClrBottom(NCURSES_SP_ARGx nonempty);
+ nonempty = ClrBottom(nonempty);
TR(TRACE_UPDATE, ("Transforming lines, nonempty %d", nonempty));
for (i = 0; i < nonempty; i++) {
@@ -939,7 +869,7 @@ TINFO_DOUPDATE(NCURSES_SP_DCL0)
* Here is our line-breakout optimization.
*/
if (changedlines == CHECK_INTERVAL) {
- if (check_pending(NCURSES_SP_ARG))
+ if (check_pending())
goto cleanup;
changedlines = 0;
}
@@ -950,35 +880,35 @@ TINFO_DOUPDATE(NCURSES_SP_DCL0)
* is normally set by _nc_scroll_window in the
* vertical-movement optimization code,
*/
- if (NewScreen(SP_PARM)->_line[i].firstchar != _NOCHANGE
- || CurScreen(SP_PARM)->_line[i].firstchar != _NOCHANGE) {
- TransformLine(NCURSES_SP_ARGx i);
+ if (newscr->_line[i].firstchar != _NOCHANGE
+ || curscr->_line[i].firstchar != _NOCHANGE) {
+ TransformLine(i);
changedlines++;
}
/* mark line changed successfully */
- if (i <= NewScreen(SP_PARM)->_maxy) {
- MARK_NOCHANGE(NewScreen(SP_PARM), i);
+ if (i <= newscr->_maxy) {
+ MARK_NOCHANGE(newscr, i);
}
- if (i <= CurScreen(SP_PARM)->_maxy) {
- MARK_NOCHANGE(CurScreen(SP_PARM), i);
+ if (i <= curscr->_maxy) {
+ MARK_NOCHANGE(curscr, i);
}
}
}
/* put everything back in sync */
- for (i = nonempty; i <= NewScreen(SP_PARM)->_maxy; i++) {
- MARK_NOCHANGE(NewScreen(SP_PARM), i);
+ for (i = nonempty; i <= newscr->_maxy; i++) {
+ MARK_NOCHANGE(newscr, i);
}
- for (i = nonempty; i <= CurScreen(SP_PARM)->_maxy; i++) {
- MARK_NOCHANGE(CurScreen(SP_PARM), i);
+ for (i = nonempty; i <= curscr->_maxy; i++) {
+ MARK_NOCHANGE(curscr, i);
}
- if (!NewScreen(SP_PARM)->_leaveok) {
- CurScreen(SP_PARM)->_curx = NewScreen(SP_PARM)->_curx;
- CurScreen(SP_PARM)->_cury = NewScreen(SP_PARM)->_cury;
+ if (!newscr->_leaveok) {
+ curscr->_curx = newscr->_curx;
+ curscr->_cury = newscr->_cury;
- GoTo(NCURSES_SP_ARGx CurScreen(SP_PARM)->_cury, CurScreen(SP_PARM)->_curx);
+ GoTo(curscr->_cury, curscr->_curx);
}
cleanup:
@@ -991,10 +921,10 @@ TINFO_DOUPDATE(NCURSES_SP_DCL0)
#if USE_XMC_SUPPORT
if (magic_cookie_glitch != 0)
#endif
- UpdateAttrs(SP_PARM, normal);
+ UpdateAttrs(normal);
- NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_ARG);
- WINDOW_ATTRS(CurScreen(SP_PARM)) = WINDOW_ATTRS(NewScreen(SP_PARM));
+ _nc_flush();
+ WINDOW_ATTRS(curscr) = WINDOW_ATTRS(newscr);
#if USE_TRACE_TIMES
(void) times(&after);
@@ -1010,14 +940,6 @@ TINFO_DOUPDATE(NCURSES_SP_DCL0)
returnCode(OK);
}
-#if NCURSES_SP_FUNCS && !defined(USE_TERM_DRIVER)
-NCURSES_EXPORT(int)
-doupdate(void)
-{
- return TINFO_DOUPDATE(CURRENT_SCREEN);
-}
-#endif
-
/*
* ClrBlank(win)
*
@@ -1029,14 +951,14 @@ doupdate(void)
* in the wbkgd() call. Assume 'stdscr' for this case.
*/
#define BCE_ATTRS (A_NORMAL|A_COLOR)
-#define BCE_BKGD(sp,win) (((win) == CurScreen(sp) ? StdScreen(sp) : (win))->_nc_bkgd)
+#define BCE_BKGD(win) (((win) == curscr ? stdscr : (win))->_nc_bkgd)
static NCURSES_INLINE NCURSES_CH_T
-ClrBlank(NCURSES_SP_DCLx WINDOW *win)
+ClrBlank(WINDOW *win)
{
NCURSES_CH_T blank = blankchar;
if (back_color_erase)
- AddAttr(blank, (AttrOf(BCE_BKGD(SP_PARM, win)) & BCE_ATTRS));
+ AddAttr(blank, (AttrOf(BCE_BKGD(win)) & BCE_ATTRS));
return blank;
}
@@ -1048,24 +970,23 @@ ClrBlank(NCURSES_SP_DCLx WINDOW *win)
*/
static void
-ClrUpdate(NCURSES_SP_DCL0)
+ClrUpdate(void)
{
+ int i;
+ NCURSES_CH_T blank = ClrBlank(stdscr);
+ int nonempty = min(screen_lines, newscr->_maxy + 1);
+
TR(TRACE_UPDATE, (T_CALLED("ClrUpdate")));
- if (0 != SP_PARM) {
- int i;
- NCURSES_CH_T blank = ClrBlank(NCURSES_SP_ARGx StdScreen(SP_PARM));
- int nonempty = min(screen_lines(SP_PARM),
- NewScreen(SP_PARM)->_maxy + 1);
- ClearScreen(NCURSES_SP_ARGx blank);
+ ClearScreen(blank);
- TR(TRACE_UPDATE, ("updating screen from scratch"));
+ TR(TRACE_UPDATE, ("updating screen from scratch"));
- nonempty = ClrBottom(NCURSES_SP_ARGx nonempty);
+ nonempty = ClrBottom(nonempty);
+
+ for (i = 0; i < nonempty; i++)
+ TransformLine(i);
- for (i = 0; i < nonempty; i++)
- TransformLine(NCURSES_SP_ARGx i);
- }
TR(TRACE_UPDATE, (T_RETURN("")));
}
@@ -1076,36 +997,35 @@ ClrUpdate(NCURSES_SP_DCL0)
*/
static void
-ClrToEOL(NCURSES_SP_DCLx NCURSES_CH_T blank, bool needclear)
+ClrToEOL(NCURSES_CH_T blank, bool needclear)
{
int j;
- if (SP_PARM != 0) {
- if (CurScreen(SP_PARM) != 0
- && SP_PARM->_cursrow >= 0) {
- for (j = SP_PARM->_curscol; j < screen_columns(SP_PARM); j++) {
- if (j >= 0) {
- NCURSES_CH_T *cp =
- &(CurScreen(SP_PARM)->_line[SP_PARM->_cursrow].text[j]);
-
- if (!CharEq(*cp, blank)) {
- *cp = blank;
- needclear = TRUE;
- }
+ if (curscr != 0
+ && SP->_cursrow >= 0) {
+ for (j = SP->_curscol; j < screen_columns; j++) {
+ if (j >= 0) {
+ NCURSES_CH_T *cp = &(curscr->_line[SP->_cursrow].text[j]);
+
+ if (!CharEq(*cp, blank)) {
+ *cp = blank;
+ needclear = TRUE;
}
}
}
+ } else {
+ needclear = TRUE;
}
- if (needclear && (SP_PARM != 0)) {
- UpdateAttrs(SP_PARM, blank);
+ if (needclear) {
+ UpdateAttrs(blank);
TPUTS_TRACE("clr_eol");
- if (clr_eol && SP_PARM->_el_cost <= (screen_columns(SP_PARM) - SP_PARM->_curscol)) {
- NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx clr_eol);
+ if (clr_eol && SP->_el_cost <= (screen_columns - SP->_curscol)) {
+ putp(clr_eol);
} else {
- int count = (screen_columns(SP_PARM) - SP_PARM->_curscol);
+ int count = (screen_columns - SP->_curscol);
while (count-- > 0)
- PutChar(NCURSES_SP_ARGx CHREF(blank));
+ PutChar(CHREF(blank));
}
}
}
@@ -1117,29 +1037,23 @@ ClrToEOL(NCURSES_SP_DCLx NCURSES_CH_T blank, bool needclear)
*/
static void
-ClrToEOS(NCURSES_SP_DCLx NCURSES_CH_T blank)
+ClrToEOS(NCURSES_CH_T blank)
{
int row, col;
- if (0 == SP_PARM)
- return;
-
- row = SP_PARM->_cursrow;
- col = SP_PARM->_curscol;
+ row = SP->_cursrow;
+ col = SP->_curscol;
- UpdateAttrs(SP_PARM, blank);
+ UpdateAttrs(blank);
TPUTS_TRACE("clr_eos");
- NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx
- clr_eos,
- screen_lines(SP_PARM) - row,
- NCURSES_SP_NAME(_nc_outch));
+ tputs(clr_eos, screen_lines - row, _nc_outch);
- while (col < screen_columns(SP_PARM))
- CurScreen(SP_PARM)->_line[row].text[col++] = blank;
+ while (col < screen_columns)
+ curscr->_line[row].text[col++] = blank;
- for (row++; row < screen_lines(SP_PARM); row++) {
- for (col = 0; col < screen_columns(SP_PARM); col++)
- CurScreen(SP_PARM)->_line[row].text[col] = blank;
+ for (row++; row < screen_lines; row++) {
+ for (col = 0; col < screen_columns; col++)
+ curscr->_line[row].text[col] = blank;
}
}
@@ -1151,26 +1065,26 @@ ClrToEOS(NCURSES_SP_DCLx NCURSES_CH_T blank)
* screen, checking if each is blank, and one or more are changed.
*/
static int
-ClrBottom(NCURSES_SP_DCLx int total)
+ClrBottom(int total)
{
int row;
int col;
int top = total;
- int last = min(screen_columns(SP_PARM), NewScreen(SP_PARM)->_maxx + 1);
- NCURSES_CH_T blank = NewScreen(SP_PARM)->_line[total - 1].text[last - 1];
+ int last = min(screen_columns, newscr->_maxx + 1);
+ NCURSES_CH_T blank = newscr->_line[total - 1].text[last - 1];
bool ok;
- if (clr_eos && can_clear_with(NCURSES_SP_ARGx CHREF(blank))) {
+ if (clr_eos && can_clear_with(CHREF(blank))) {
for (row = total - 1; row >= 0; row--) {
for (col = 0, ok = TRUE; ok && col < last; col++) {
- ok = (CharEq(NewScreen(SP_PARM)->_line[row].text[col], blank));
+ ok = (CharEq(newscr->_line[row].text[col], blank));
}
if (!ok)
break;
for (col = 0; ok && col < last; col++) {
- ok = (CharEq(CurScreen(SP_PARM)->_line[row].text[col], blank));
+ ok = (CharEq(curscr->_line[row].text[col], blank));
}
if (!ok)
top = row;
@@ -1178,11 +1092,11 @@ ClrBottom(NCURSES_SP_DCLx int total)
/* don't use clr_eos for just one line if clr_eol available */
if (top < total) {
- GoTo(NCURSES_SP_ARGx top, 0);
- ClrToEOS(NCURSES_SP_ARGx blank);
- if (SP_PARM->oldhash && SP_PARM->newhash) {
- for (row = top; row < screen_lines(SP_PARM); row++)
- SP_PARM->oldhash[row] = SP_PARM->newhash[row];
+ GoTo(top, 0);
+ ClrToEOS(blank);
+ if (SP->oldhash && SP->newhash) {
+ for (row = top; row < screen_lines; row++)
+ SP->oldhash[row] = SP->newhash[row];
}
}
}
@@ -1191,22 +1105,22 @@ ClrBottom(NCURSES_SP_DCLx int total)
#if USE_XMC_SUPPORT
#if USE_WIDEC_SUPPORT
-#define check_xmc_transition(sp, a, b) \
- ((((a)->attr ^ (b)->attr) & ~((a)->attr) & (sp)->_xmc_triggers) != 0)
-#define xmc_turn_on(sp,a,b) check_xmc_transition(sp,&(a), &(b))
+#define check_xmc_transition(a, b) \
+ ((((a)->attr ^ (b)->attr) & ~((a)->attr) & SP->_xmc_triggers) != 0)
+#define xmc_turn_on(a,b) check_xmc_transition(&(a), &(b))
#else
-#define xmc_turn_on(sp,a,b) ((((a)^(b)) & ~(a) & (sp)->_xmc_triggers) != 0)
+#define xmc_turn_on(a,b) ((((a)^(b)) & ~(a) & SP->_xmc_triggers) != 0)
#endif
-#define xmc_new(sp,r,c) NewScreen(sp)->_line[r].text[c]
-#define xmc_turn_off(sp,a,b) xmc_turn_on(sp,b,a)
+#define xmc_new(r,c) newscr->_line[r].text[c]
+#define xmc_turn_off(a,b) xmc_turn_on(b,a)
#endif /* USE_XMC_SUPPORT */
/*
** TransformLine(lineno)
**
** Transform the given line in curscr to the one in newscr, using
-** Insert/Delete Character if idcok && has_ic().
+** Insert/Delete Character if _nc_idcok && has_ic().
**
** firstChar = position of first different character in line
** oLastChar = position of last different character in old line
@@ -1221,19 +1135,19 @@ ClrBottom(NCURSES_SP_DCLx int total)
*/
static void
-TransformLine(NCURSES_SP_DCLx int const lineno)
+TransformLine(int const lineno)
{
int firstChar, oLastChar, nLastChar;
- NCURSES_CH_T *newLine = NewScreen(SP_PARM)->_line[lineno].text;
- NCURSES_CH_T *oldLine = CurScreen(SP_PARM)->_line[lineno].text;
+ NCURSES_CH_T *newLine = newscr->_line[lineno].text;
+ NCURSES_CH_T *oldLine = curscr->_line[lineno].text;
int n;
bool attrchanged = FALSE;
- TR(TRACE_UPDATE, (T_CALLED("TransformLine(%p, %d)"), (void *) SP_PARM, lineno));
+ TR(TRACE_UPDATE, (T_CALLED("TransformLine(%d)"), lineno));
/* copy new hash value to old one */
- if (SP_PARM->oldhash && SP_PARM->newhash)
- SP_PARM->oldhash[lineno] = SP_PARM->newhash[lineno];
+ if (SP->oldhash && SP->newhash)
+ SP->oldhash[lineno] = SP->newhash[lineno];
/*
* If we have colors, there is the possibility of having two color pairs
@@ -1241,20 +1155,19 @@ TransformLine(NCURSES_SP_DCLx int const lineno)
* for this case, and update the old line with the new line's colors when
* they are equivalent.
*/
- if (SP_PARM->_coloron) {
+ if (SP->_coloron) {
int oldPair;
int newPair;
- for (n = 0; n < screen_columns(SP_PARM); n++) {
+ for (n = 0; n < screen_columns; n++) {
if (!CharEq(newLine[n], oldLine[n])) {
oldPair = GetPair(oldLine[n]);
newPair = GetPair(newLine[n]);
if (oldPair != newPair
&& unColor(oldLine[n]) == unColor(newLine[n])) {
- if (oldPair < SP_PARM->_pair_limit
- && newPair < SP_PARM->_pair_limit
- && (SP_PARM->_color_pairs[oldPair] ==
- SP_PARM->_color_pairs[newPair])) {
+ if (oldPair < COLOR_PAIRS
+ && newPair < COLOR_PAIRS
+ && SP->_color_pairs[oldPair] == SP->_color_pairs[newPair]) {
SetPair(oldLine[n], GetPair(newLine[n]));
}
}
@@ -1264,7 +1177,7 @@ TransformLine(NCURSES_SP_DCLx int const lineno)
if (ceol_standout_glitch && clr_eol) {
firstChar = 0;
- while (firstChar < screen_columns(SP_PARM)) {
+ while (firstChar < screen_columns) {
if (!SameAttrOf(newLine[firstChar], oldLine[firstChar])) {
attrchanged = TRUE;
break;
@@ -1276,13 +1189,9 @@ TransformLine(NCURSES_SP_DCLx int const lineno)
firstChar = 0;
if (attrchanged) { /* we may have to disregard the whole line */
- GoTo(NCURSES_SP_ARGx lineno, firstChar);
- ClrToEOL(NCURSES_SP_ARGx
- ClrBlank(NCURSES_SP_ARGx
- CurScreen(SP_PARM)), FALSE);
- PutRange(NCURSES_SP_ARGx
- oldLine, newLine, lineno, 0,
- screen_columns(SP_PARM) - 1);
+ GoTo(lineno, firstChar);
+ ClrToEOL(ClrBlank(curscr), FALSE);
+ PutRange(oldLine, newLine, lineno, 0, (screen_columns - 1));
#if USE_XMC_SUPPORT
/*
@@ -1297,8 +1206,8 @@ TransformLine(NCURSES_SP_DCLx int const lineno)
* following operation.
*/
} else if (magic_cookie_glitch > 0) {
- GoTo(NCURSES_SP_ARGx lineno, firstChar);
- for (n = 0; n < screen_columns(SP_PARM); n++) {
+ GoTo(lineno, firstChar);
+ for (n = 0; n < screen_columns; n++) {
int m = n + magic_cookie_glitch;
/* check for turn-on:
@@ -1307,30 +1216,26 @@ TransformLine(NCURSES_SP_DCLx int const lineno)
*/
if (ISBLANK(newLine[n])
&& ((n > 0
- && xmc_turn_on(SP_PARM, newLine[n - 1], newLine[n]))
+ && xmc_turn_on(newLine[n - 1], newLine[n]))
|| (n == 0
&& lineno > 0
- && xmc_turn_on(SP_PARM,
- xmc_new(SP_PARM, lineno - 1,
- screen_columns(SP_PARM) - 1),
+ && xmc_turn_on(xmc_new(lineno - 1, screen_columns - 1),
newLine[n])))) {
n = m;
}
- PutChar(NCURSES_SP_ARGx CHREF(newLine[n]));
+ PutChar(CHREF(newLine[n]));
/* check for turn-off:
* If we are writing an attributed non-blank, where the
* next cell is blank, and not attributed.
*/
if (!ISBLANK(newLine[n])
- && ((n + 1 < screen_columns(SP_PARM)
- && xmc_turn_off(SP_PARM, newLine[n], newLine[n + 1]))
- || (n + 1 >= screen_columns(SP_PARM)
- && lineno + 1 < screen_lines(SP_PARM)
- && xmc_turn_off(SP_PARM,
- newLine[n],
- xmc_new(SP_PARM, lineno + 1, 0))))) {
+ && ((n + 1 < screen_columns
+ && xmc_turn_off(newLine[n], newLine[n + 1]))
+ || (n + 1 >= screen_columns
+ && lineno + 1 < screen_lines
+ && xmc_turn_off(newLine[n], xmc_new(lineno + 1, 0))))) {
n = m;
}
@@ -1341,42 +1246,38 @@ TransformLine(NCURSES_SP_DCLx int const lineno)
/* it may be cheap to clear leading whitespace with clr_bol */
blank = newLine[0];
- if (clr_bol && can_clear_with(NCURSES_SP_ARGx CHREF(blank))) {
+ if (clr_bol && can_clear_with(CHREF(blank))) {
int oFirstChar, nFirstChar;
- for (oFirstChar = 0;
- oFirstChar < screen_columns(SP_PARM);
- oFirstChar++)
+ for (oFirstChar = 0; oFirstChar < screen_columns; oFirstChar++)
if (!CharEq(oldLine[oFirstChar], blank))
break;
- for (nFirstChar = 0;
- nFirstChar < screen_columns(SP_PARM);
- nFirstChar++)
+ for (nFirstChar = 0; nFirstChar < screen_columns; nFirstChar++)
if (!CharEq(newLine[nFirstChar], blank))
break;
if (nFirstChar == oFirstChar) {
firstChar = nFirstChar;
/* find the first differing character */
- while (firstChar < screen_columns(SP_PARM)
+ while (firstChar < screen_columns
&& CharEq(newLine[firstChar], oldLine[firstChar]))
firstChar++;
} else if (oFirstChar > nFirstChar) {
firstChar = nFirstChar;
} else { /* oFirstChar < nFirstChar */
firstChar = oFirstChar;
- if (SP_PARM->_el1_cost < nFirstChar - oFirstChar) {
- if (nFirstChar >= screen_columns(SP_PARM)
- && SP_PARM->_el_cost <= SP_PARM->_el1_cost) {
- GoTo(NCURSES_SP_ARGx lineno, 0);
- UpdateAttrs(SP_PARM, blank);
+ if (SP->_el1_cost < nFirstChar - oFirstChar) {
+ if (nFirstChar >= screen_columns
+ && SP->_el_cost <= SP->_el1_cost) {
+ GoTo(lineno, 0);
+ UpdateAttrs(blank);
TPUTS_TRACE("clr_eol");
- NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx clr_eol);
+ putp(clr_eol);
} else {
- GoTo(NCURSES_SP_ARGx lineno, nFirstChar - 1);
- UpdateAttrs(SP_PARM, blank);
+ GoTo(lineno, nFirstChar - 1);
+ UpdateAttrs(blank);
TPUTS_TRACE("clr_bol");
- NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx clr_bol);
+ putp(clr_bol);
}
while (firstChar < nFirstChar)
@@ -1385,81 +1286,64 @@ TransformLine(NCURSES_SP_DCLx int const lineno)
}
} else {
/* find the first differing character */
- while (firstChar < screen_columns(SP_PARM)
+ while (firstChar < screen_columns
&& CharEq(newLine[firstChar], oldLine[firstChar]))
firstChar++;
}
/* if there wasn't one, we're done */
- if (firstChar >= screen_columns(SP_PARM)) {
+ if (firstChar >= screen_columns) {
TR(TRACE_UPDATE, (T_RETURN("")));
return;
}
- blank = newLine[screen_columns(SP_PARM) - 1];
+ blank = newLine[screen_columns - 1];
- if (!can_clear_with(NCURSES_SP_ARGx CHREF(blank))) {
+ if (!can_clear_with(CHREF(blank))) {
/* find the last differing character */
- nLastChar = screen_columns(SP_PARM) - 1;
+ nLastChar = screen_columns - 1;
while (nLastChar > firstChar
&& CharEq(newLine[nLastChar], oldLine[nLastChar]))
nLastChar--;
if (nLastChar >= firstChar) {
- GoTo(NCURSES_SP_ARGx lineno, firstChar);
- PutRange(NCURSES_SP_ARGx
- oldLine,
- newLine,
- lineno,
- firstChar,
- nLastChar);
+ GoTo(lineno, firstChar);
+ PutRange(oldLine, newLine, lineno, firstChar, nLastChar);
memcpy(oldLine + firstChar,
newLine + firstChar,
- (unsigned) (nLastChar - firstChar + 1) * sizeof(NCURSES_CH_T));
+ (nLastChar - firstChar + 1) * sizeof(NCURSES_CH_T));
}
TR(TRACE_UPDATE, (T_RETURN("")));
return;
}
/* find last non-blank character on old line */
- oLastChar = screen_columns(SP_PARM) - 1;
+ oLastChar = screen_columns - 1;
while (oLastChar > firstChar && CharEq(oldLine[oLastChar], blank))
oLastChar--;
/* find last non-blank character on new line */
- nLastChar = screen_columns(SP_PARM) - 1;
+ nLastChar = screen_columns - 1;
while (nLastChar > firstChar && CharEq(newLine[nLastChar], blank))
nLastChar--;
if ((nLastChar == firstChar)
- && (SP_PARM->_el_cost < (oLastChar - nLastChar))) {
- GoTo(NCURSES_SP_ARGx lineno, firstChar);
+ && (SP->_el_cost < (oLastChar - nLastChar))) {
+ GoTo(lineno, firstChar);
if (!CharEq(newLine[firstChar], blank))
- PutChar(NCURSES_SP_ARGx CHREF(newLine[firstChar]));
- ClrToEOL(NCURSES_SP_ARGx blank, FALSE);
+ PutChar(CHREF(newLine[firstChar]));
+ ClrToEOL(blank, FALSE);
} else if ((nLastChar != oLastChar)
&& (!CharEq(newLine[nLastChar], oldLine[oLastChar])
- || !(SP_PARM->_nc_sp_idcok
- && NCURSES_SP_NAME(has_ic) (NCURSES_SP_ARG)))) {
- GoTo(NCURSES_SP_ARGx lineno, firstChar);
- if ((oLastChar - nLastChar) > SP_PARM->_el_cost) {
- if (PutRange(NCURSES_SP_ARGx
- oldLine,
- newLine,
- lineno,
- firstChar,
- nLastChar)) {
- GoTo(NCURSES_SP_ARGx lineno, nLastChar + 1);
- }
- ClrToEOL(NCURSES_SP_ARGx blank, FALSE);
+ || !(_nc_idcok && has_ic()))) {
+ GoTo(lineno, firstChar);
+ if ((oLastChar - nLastChar) > SP->_el_cost) {
+ if (PutRange(oldLine, newLine, lineno, firstChar, nLastChar))
+ GoTo(lineno, nLastChar + 1);
+ ClrToEOL(blank, FALSE);
} else {
n = max(nLastChar, oLastChar);
- PutRange(NCURSES_SP_ARGx
- oldLine,
- newLine,
- lineno,
- firstChar,
- n);
+ PutRange(oldLine, newLine, lineno, firstChar, n);
}
} else {
int nLastNonblank = nLastChar;
@@ -1480,13 +1364,8 @@ TransformLine(NCURSES_SP_DCLx int const lineno)
n = min(oLastChar, nLastChar);
if (n >= firstChar) {
- GoTo(NCURSES_SP_ARGx lineno, firstChar);
- PutRange(NCURSES_SP_ARGx
- oldLine,
- newLine,
- lineno,
- firstChar,
- n);
+ GoTo(lineno, firstChar);
+ PutRange(oldLine, newLine, lineno, firstChar, n);
}
if (oLastChar < nLastChar) {
@@ -1497,26 +1376,21 @@ TransformLine(NCURSES_SP_DCLx int const lineno)
--oLastChar;
}
#endif
- GoTo(NCURSES_SP_ARGx lineno, n + 1);
+ GoTo(lineno, n + 1);
if ((nLastChar < nLastNonblank)
- || InsCharCost(SP_PARM, nLastChar - oLastChar) > (m - n)) {
- PutRange(NCURSES_SP_ARGx
- oldLine,
- newLine,
- lineno,
- n + 1,
- m);
+ || InsCharCost(nLastChar - oLastChar) > (m - n)) {
+ PutRange(oldLine, newLine, lineno, n + 1, m);
} else {
- InsStr(NCURSES_SP_ARGx &newLine[n + 1], nLastChar - oLastChar);
+ InsStr(&newLine[n + 1], nLastChar - oLastChar);
}
} else if (oLastChar > nLastChar) {
- GoTo(NCURSES_SP_ARGx lineno, n + 1);
- if (DelCharCost(SP_PARM, oLastChar - nLastChar)
- > SP_PARM->_el_cost + nLastNonblank - (n + 1)) {
- if (PutRange(NCURSES_SP_ARGx oldLine, newLine, lineno,
+ GoTo(lineno, n + 1);
+ if (DelCharCost(oLastChar - nLastChar)
+ > SP->_el_cost + nLastNonblank - (n + 1)) {
+ if (PutRange(oldLine, newLine, lineno,
n + 1, nLastNonblank))
- GoTo(NCURSES_SP_ARGx lineno, nLastNonblank + 1);
- ClrToEOL(NCURSES_SP_ARGx blank, FALSE);
+ GoTo(lineno, nLastNonblank + 1);
+ ClrToEOL(blank, FALSE);
} else {
/*
* The delete-char sequence will
@@ -1526,18 +1400,18 @@ TransformLine(NCURSES_SP_DCLx int const lineno)
* setting the video attributes from
* the last character on the row.
*/
- UpdateAttrs(SP_PARM, blank);
- DelChar(NCURSES_SP_ARGx oLastChar - nLastChar);
+ UpdateAttrs(blank);
+ DelChar(oLastChar - nLastChar);
}
}
}
}
/* update the code's internal representation */
- if (screen_columns(SP_PARM) > firstChar)
+ if (screen_columns > firstChar)
memcpy(oldLine + firstChar,
newLine + firstChar,
- (unsigned) (screen_columns(SP_PARM) - firstChar) * sizeof(NCURSES_CH_T));
+ (screen_columns - firstChar) * sizeof(NCURSES_CH_T));
TR(TRACE_UPDATE, (T_RETURN("")));
return;
}
@@ -1550,7 +1424,7 @@ TransformLine(NCURSES_SP_DCLx int const lineno)
*/
static void
-ClearScreen(NCURSES_SP_DCLx NCURSES_CH_T blank)
+ClearScreen(NCURSES_CH_T blank)
{
int i, j;
bool fast_clear = (clear_screen || clr_eos || clr_eol);
@@ -1558,13 +1432,9 @@ ClearScreen(NCURSES_SP_DCLx NCURSES_CH_T blank)
TR(TRACE_UPDATE, ("ClearScreen() called"));
#if NCURSES_EXT_FUNCS
- if (SP_PARM->_coloron
- && !SP_PARM->_default_color) {
- NCURSES_SP_NAME(_nc_do_color) (NCURSES_SP_ARGx
- (short) GET_SCREEN_PAIR(SP_PARM),
- 0,
- FALSE,
- NCURSES_SP_NAME(_nc_outch));
+ if (SP->_coloron
+ && !SP->_default_color) {
+ _nc_do_color(GET_SCREEN_PAIR(SP), 0, FALSE, _nc_outch);
if (!back_color_erase) {
fast_clear = FALSE;
}
@@ -1573,46 +1443,42 @@ ClearScreen(NCURSES_SP_DCLx NCURSES_CH_T blank)
if (fast_clear) {
if (clear_screen) {
- UpdateAttrs(SP_PARM, blank);
+ UpdateAttrs(blank);
TPUTS_TRACE("clear_screen");
- NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx clear_screen);
- SP_PARM->_cursrow = SP_PARM->_curscol = 0;
- position_check(SP_PARM,
- SP_PARM->_cursrow,
- SP_PARM->_curscol,
- "ClearScreen");
+ putp(clear_screen);
+ SP->_cursrow = SP->_curscol = 0;
+ position_check(SP->_cursrow, SP->_curscol, "ClearScreen");
} else if (clr_eos) {
- SP_PARM->_cursrow = SP_PARM->_curscol = -1;
- GoTo(NCURSES_SP_ARGx 0, 0);
- UpdateAttrs(SP_PARM, blank);
+ SP->_cursrow = SP->_curscol = -1;
+ GoTo(0, 0);
+
+ UpdateAttrs(blank);
TPUTS_TRACE("clr_eos");
- NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx
- clr_eos,
- screen_lines(SP_PARM),
- NCURSES_SP_NAME(_nc_outch));
+ tputs(clr_eos, screen_lines, _nc_outch);
} else if (clr_eol) {
- SP_PARM->_cursrow = SP_PARM->_curscol = -1;
- UpdateAttrs(SP_PARM, blank);
- for (i = 0; i < screen_lines(SP_PARM); i++) {
- GoTo(NCURSES_SP_ARGx i, 0);
+ SP->_cursrow = SP->_curscol = -1;
+
+ UpdateAttrs(blank);
+ for (i = 0; i < screen_lines; i++) {
+ GoTo(i, 0);
TPUTS_TRACE("clr_eol");
- NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx clr_eol);
+ putp(clr_eol);
}
- GoTo(NCURSES_SP_ARGx 0, 0);
+ GoTo(0, 0);
}
} else {
- UpdateAttrs(SP_PARM, blank);
- for (i = 0; i < screen_lines(SP_PARM); i++) {
- GoTo(NCURSES_SP_ARGx i, 0);
- for (j = 0; j < screen_columns(SP_PARM); j++)
- PutChar(NCURSES_SP_ARGx CHREF(blank));
+ UpdateAttrs(blank);
+ for (i = 0; i < screen_lines; i++) {
+ GoTo(i, 0);
+ for (j = 0; j < screen_columns; j++)
+ PutChar(CHREF(blank));
}
- GoTo(NCURSES_SP_ARGx 0, 0);
+ GoTo(0, 0);
}
- for (i = 0; i < screen_lines(SP_PARM); i++) {
- for (j = 0; j < screen_columns(SP_PARM); j++)
- CurScreen(SP_PARM)->_line[i].text[j] = blank;
+ for (i = 0; i < screen_lines; i++) {
+ for (j = 0; j < screen_columns; j++)
+ curscr->_line[i].text[j] = blank;
}
TR(TRACE_UPDATE, ("screen cleared"));
@@ -1626,54 +1492,49 @@ ClearScreen(NCURSES_SP_DCLx NCURSES_CH_T blank)
*/
static void
-InsStr(NCURSES_SP_DCLx NCURSES_CH_T * line, int count)
+InsStr(NCURSES_CH_T * line, int count)
{
- TR(TRACE_UPDATE, ("InsStr(%p, %p,%d) called",
- (void *) SP_PARM,
- (void *) line, count));
+ TR(TRACE_UPDATE, ("InsStr(%p,%d) called", line, count));
/* Prefer parm_ich as it has the smallest cost - no need to shift
* the whole line on each character. */
/* The order must match that of InsCharCost. */
if (parm_ich) {
TPUTS_TRACE("parm_ich");
- NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx
- TPARM_1(parm_ich, count),
- count,
- NCURSES_SP_NAME(_nc_outch));
+ tputs(TPARM_1(parm_ich, count), count, _nc_outch);
while (count) {
- PutAttrChar(NCURSES_SP_ARGx CHREF(*line));
+ PutAttrChar(CHREF(*line));
line++;
count--;
}
} else if (enter_insert_mode && exit_insert_mode) {
TPUTS_TRACE("enter_insert_mode");
- NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx enter_insert_mode);
+ putp(enter_insert_mode);
while (count) {
- PutAttrChar(NCURSES_SP_ARGx CHREF(*line));
+ PutAttrChar(CHREF(*line));
if (insert_padding) {
TPUTS_TRACE("insert_padding");
- NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx insert_padding);
+ putp(insert_padding);
}
line++;
count--;
}
TPUTS_TRACE("exit_insert_mode");
- NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx exit_insert_mode);
+ putp(exit_insert_mode);
} else {
while (count) {
TPUTS_TRACE("insert_character");
- NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx insert_character);
- PutAttrChar(NCURSES_SP_ARGx CHREF(*line));
+ putp(insert_character);
+ PutAttrChar(CHREF(*line));
if (insert_padding) {
TPUTS_TRACE("insert_padding");
- NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx insert_padding);
+ putp(insert_padding);
}
line++;
count--;
}
}
- position_check(SP_PARM, SP_PARM->_cursrow, SP_PARM->_curscol, "InsStr");
+ position_check(SP->_cursrow, SP->_curscol, "InsStr");
}
/*
@@ -1684,25 +1545,22 @@ InsStr(NCURSES_SP_DCLx NCURSES_CH_T * line, int count)
*/
static void
-DelChar(NCURSES_SP_DCLx int count)
+DelChar(int count)
{
int n;
- TR(TRACE_UPDATE, ("DelChar(%p, %d) called, position = (%ld,%ld)",
- (void *) SP_PARM, count,
- (long) NewScreen(SP_PARM)->_cury,
- (long) NewScreen(SP_PARM)->_curx));
+ TR(TRACE_UPDATE, ("DelChar(%d) called, position = (%ld,%ld)",
+ count,
+ (long) newscr->_cury,
+ (long) newscr->_curx));
if (parm_dch) {
TPUTS_TRACE("parm_dch");
- NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx
- TPARM_1(parm_dch, count),
- count,
- NCURSES_SP_NAME(_nc_outch));
+ tputs(TPARM_1(parm_dch, count), count, _nc_outch);
} else {
for (n = 0; n < count; n++) {
TPUTS_TRACE("delete_character");
- NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx delete_character);
+ putp(delete_character);
}
}
}
@@ -1741,66 +1599,54 @@ DelChar(NCURSES_SP_DCLx int count)
/* Try to scroll up assuming given csr (miny, maxy). Returns ERR on failure */
static int
-scroll_csr_forward(NCURSES_SP_DCLx
- int n,
- int top,
- int bot,
- int miny,
- int maxy,
- NCURSES_CH_T blank)
+scroll_csr_forward(int n, int top, int bot, int miny, int maxy, NCURSES_CH_T blank)
{
int i;
if (n == 1 && scroll_forward && top == miny && bot == maxy) {
- GoTo(NCURSES_SP_ARGx bot, 0);
- UpdateAttrs(SP_PARM, blank);
+ GoTo(bot, 0);
+ UpdateAttrs(blank);
TPUTS_TRACE("scroll_forward");
- NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx scroll_forward);
+ putp(scroll_forward);
} else if (n == 1 && delete_line && bot == maxy) {
- GoTo(NCURSES_SP_ARGx top, 0);
- UpdateAttrs(SP_PARM, blank);
+ GoTo(top, 0);
+ UpdateAttrs(blank);
TPUTS_TRACE("delete_line");
- NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx delete_line);
+ putp(delete_line);
} else if (parm_index && top == miny && bot == maxy) {
- GoTo(NCURSES_SP_ARGx bot, 0);
- UpdateAttrs(SP_PARM, blank);
+ GoTo(bot, 0);
+ UpdateAttrs(blank);
TPUTS_TRACE("parm_index");
- NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx
- TPARM_2(parm_index, n, 0),
- n,
- NCURSES_SP_NAME(_nc_outch));
+ tputs(TPARM_2(parm_index, n, 0), n, _nc_outch);
} else if (parm_delete_line && bot == maxy) {
- GoTo(NCURSES_SP_ARGx top, 0);
- UpdateAttrs(SP_PARM, blank);
+ GoTo(top, 0);
+ UpdateAttrs(blank);
TPUTS_TRACE("parm_delete_line");
- NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx
- TPARM_2(parm_delete_line, n, 0),
- n,
- NCURSES_SP_NAME(_nc_outch));
+ tputs(TPARM_2(parm_delete_line, n, 0), n, _nc_outch);
} else if (scroll_forward && top == miny && bot == maxy) {
- GoTo(NCURSES_SP_ARGx bot, 0);
- UpdateAttrs(SP_PARM, blank);
+ GoTo(bot, 0);
+ UpdateAttrs(blank);
for (i = 0; i < n; i++) {
TPUTS_TRACE("scroll_forward");
- NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx scroll_forward);
+ putp(scroll_forward);
}
} else if (delete_line && bot == maxy) {
- GoTo(NCURSES_SP_ARGx top, 0);
- UpdateAttrs(SP_PARM, blank);
+ GoTo(top, 0);
+ UpdateAttrs(blank);
for (i = 0; i < n; i++) {
TPUTS_TRACE("delete_line");
- NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx delete_line);
+ putp(delete_line);
}
} else
return ERR;
#if NCURSES_EXT_FUNCS
- if (FILL_BCE(SP_PARM)) {
+ if (FILL_BCE()) {
int j;
for (i = 0; i < n; i++) {
- GoTo(NCURSES_SP_ARGx bot - i, 0);
- for (j = 0; j < screen_columns(SP_PARM); j++)
- PutChar(NCURSES_SP_ARGx CHREF(blank));
+ GoTo(bot - i, 0);
+ for (j = 0; j < screen_columns; j++)
+ PutChar(CHREF(blank));
}
}
#endif
@@ -1810,66 +1656,55 @@ scroll_csr_forward(NCURSES_SP_DCLx
/* Try to scroll down assuming given csr (miny, maxy). Returns ERR on failure */
/* n > 0 */
static int
-scroll_csr_backward(NCURSES_SP_DCLx
- int n,
- int top,
- int bot,
- int miny,
- int maxy,
+scroll_csr_backward(int n, int top, int bot, int miny, int maxy,
NCURSES_CH_T blank)
{
int i;
if (n == 1 && scroll_reverse && top == miny && bot == maxy) {
- GoTo(NCURSES_SP_ARGx top, 0);
- UpdateAttrs(SP_PARM, blank);
+ GoTo(top, 0);
+ UpdateAttrs(blank);
TPUTS_TRACE("scroll_reverse");
- NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx scroll_reverse);
+ putp(scroll_reverse);
} else if (n == 1 && insert_line && bot == maxy) {
- GoTo(NCURSES_SP_ARGx top, 0);
- UpdateAttrs(SP_PARM, blank);
+ GoTo(top, 0);
+ UpdateAttrs(blank);
TPUTS_TRACE("insert_line");
- NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx insert_line);
+ putp(insert_line);
} else if (parm_rindex && top == miny && bot == maxy) {
- GoTo(NCURSES_SP_ARGx top, 0);
- UpdateAttrs(SP_PARM, blank);
+ GoTo(top, 0);
+ UpdateAttrs(blank);
TPUTS_TRACE("parm_rindex");
- NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx
- TPARM_2(parm_rindex, n, 0),
- n,
- NCURSES_SP_NAME(_nc_outch));
+ tputs(TPARM_2(parm_rindex, n, 0), n, _nc_outch);
} else if (parm_insert_line && bot == maxy) {
- GoTo(NCURSES_SP_ARGx top, 0);
- UpdateAttrs(SP_PARM, blank);
+ GoTo(top, 0);
+ UpdateAttrs(blank);
TPUTS_TRACE("parm_insert_line");
- NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx
- TPARM_2(parm_insert_line, n, 0),
- n,
- NCURSES_SP_NAME(_nc_outch));
+ tputs(TPARM_2(parm_insert_line, n, 0), n, _nc_outch);
} else if (scroll_reverse && top == miny && bot == maxy) {
- GoTo(NCURSES_SP_ARGx top, 0);
- UpdateAttrs(SP_PARM, blank);
+ GoTo(top, 0);
+ UpdateAttrs(blank);
for (i = 0; i < n; i++) {
TPUTS_TRACE("scroll_reverse");
- NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx scroll_reverse);
+ putp(scroll_reverse);
}
} else if (insert_line && bot == maxy) {
- GoTo(NCURSES_SP_ARGx top, 0);
- UpdateAttrs(SP_PARM, blank);
+ GoTo(top, 0);
+ UpdateAttrs(blank);
for (i = 0; i < n; i++) {
TPUTS_TRACE("insert_line");
- NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx insert_line);
+ putp(insert_line);
}
} else
return ERR;
#if NCURSES_EXT_FUNCS
- if (FILL_BCE(SP_PARM)) {
+ if (FILL_BCE()) {
int j;
for (i = 0; i < n; i++) {
- GoTo(NCURSES_SP_ARGx top + i, 0);
- for (j = 0; j < screen_columns(SP_PARM); j++)
- PutChar(NCURSES_SP_ARGx CHREF(blank));
+ GoTo(top + i, 0);
+ for (j = 0; j < screen_columns; j++)
+ PutChar(CHREF(blank));
}
}
#endif
@@ -1879,46 +1714,40 @@ scroll_csr_backward(NCURSES_SP_DCLx
/* scroll by using delete_line at del and insert_line at ins */
/* n > 0 */
static int
-scroll_idl(NCURSES_SP_DCLx int n, int del, int ins, NCURSES_CH_T blank)
+scroll_idl(int n, int del, int ins, NCURSES_CH_T blank)
{
int i;
if (!((parm_delete_line || delete_line) && (parm_insert_line || insert_line)))
return ERR;
- GoTo(NCURSES_SP_ARGx del, 0);
- UpdateAttrs(SP_PARM, blank);
+ GoTo(del, 0);
+ UpdateAttrs(blank);
if (n == 1 && delete_line) {
TPUTS_TRACE("delete_line");
- NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx delete_line);
+ putp(delete_line);
} else if (parm_delete_line) {
TPUTS_TRACE("parm_delete_line");
- NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx
- TPARM_2(parm_delete_line, n, 0),
- n,
- NCURSES_SP_NAME(_nc_outch));
+ tputs(TPARM_2(parm_delete_line, n, 0), n, _nc_outch);
} else { /* if (delete_line) */
for (i = 0; i < n; i++) {
TPUTS_TRACE("delete_line");
- NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx delete_line);
+ putp(delete_line);
}
}
- GoTo(NCURSES_SP_ARGx ins, 0);
- UpdateAttrs(SP_PARM, blank);
+ GoTo(ins, 0);
+ UpdateAttrs(blank);
if (n == 1 && insert_line) {
TPUTS_TRACE("insert_line");
- NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx insert_line);
+ putp(insert_line);
} else if (parm_insert_line) {
TPUTS_TRACE("parm_insert_line");
- NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx
- TPARM_2(parm_insert_line, n, 0),
- n,
- NCURSES_SP_NAME(_nc_outch));
+ tputs(TPARM_2(parm_insert_line, n, 0), n, _nc_outch);
} else { /* if (insert_line) */
for (i = 0; i < n; i++) {
TPUTS_TRACE("insert_line");
- NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx insert_line);
+ putp(insert_line);
}
}
@@ -1934,25 +1763,15 @@ scroll_idl(NCURSES_SP_DCLx int n, int del, int ins, NCURSES_CH_T blank)
* save/restore cursor capabilities if the terminal has them.
*/
NCURSES_EXPORT(int)
-NCURSES_SP_NAME(_nc_scrolln) (NCURSES_SP_DCLx
- int n,
- int top,
- int bot,
- int maxy)
+_nc_scrolln(int n, int top, int bot, int maxy)
/* scroll region from top to bot by n lines */
{
- NCURSES_CH_T blank;
+ NCURSES_CH_T blank = ClrBlank(stdscr);
int i;
bool cursor_saved = FALSE;
int res;
- TR(TRACE_MOVE, ("_nc_scrolln(%p, %d, %d, %d, %d)",
- (void *) SP_PARM, n, top, bot, maxy));
-
- if (!IsValidScreen(SP_PARM))
- return (ERR);
-
- blank = ClrBlank(NCURSES_SP_ARGx StdScreen(SP_PARM));
+ TR(TRACE_MOVE, ("mvcur_scrolln(%d, %d, %d, %d)", n, top, bot, maxy));
#if USE_XMC_SUPPORT
/*
@@ -1968,36 +1787,34 @@ NCURSES_SP_NAME(_nc_scrolln) (NCURSES_SP_DCLx
* Explicitly clear if stuff pushed off top of region might
* be saved by the terminal.
*/
- res = scroll_csr_forward(NCURSES_SP_ARGx n, top, bot, 0, maxy, blank);
+ res = scroll_csr_forward(n, top, bot, 0, maxy, blank);
if (res == ERR && change_scroll_region) {
if ((((n == 1 && scroll_forward) || parm_index)
- && (SP_PARM->_cursrow == bot || SP_PARM->_cursrow == bot - 1))
+ && (SP->_cursrow == bot || SP->_cursrow == bot - 1))
&& save_cursor && restore_cursor) {
cursor_saved = TRUE;
TPUTS_TRACE("save_cursor");
- NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx save_cursor);
+ putp(save_cursor);
}
TPUTS_TRACE("change_scroll_region");
- NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx
- TPARM_2(change_scroll_region, top, bot));
+ putp(TPARM_2(change_scroll_region, top, bot));
if (cursor_saved) {
TPUTS_TRACE("restore_cursor");
- NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx restore_cursor);
+ putp(restore_cursor);
} else {
- SP_PARM->_cursrow = SP_PARM->_curscol = -1;
+ SP->_cursrow = SP->_curscol = -1;
}
- res = scroll_csr_forward(NCURSES_SP_ARGx n, top, bot, top, bot, blank);
+ res = scroll_csr_forward(n, top, bot, top, bot, blank);
TPUTS_TRACE("change_scroll_region");
- NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx
- TPARM_2(change_scroll_region, 0, maxy));
- SP_PARM->_cursrow = SP_PARM->_curscol = -1;
+ putp(TPARM_2(change_scroll_region, 0, maxy));
+ SP->_cursrow = SP->_curscol = -1;
}
- if (res == ERR && SP_PARM->_nc_sp_idlok)
- res = scroll_idl(NCURSES_SP_ARGx n, top, bot - n + 1, blank);
+ if (res == ERR && _nc_idlok)
+ res = scroll_idl(n, top, bot - n + 1, blank);
/*
* Clear the newly shifted-in text.
@@ -2006,49 +1823,44 @@ NCURSES_SP_NAME(_nc_scrolln) (NCURSES_SP_DCLx
&& (non_dest_scroll_region || (memory_below && bot == maxy))) {
static const NCURSES_CH_T blank2 = NewChar(BLANK_TEXT);
if (bot == maxy && clr_eos) {
- GoTo(NCURSES_SP_ARGx bot - n + 1, 0);
- ClrToEOS(NCURSES_SP_ARGx blank2);
+ GoTo(bot - n + 1, 0);
+ ClrToEOS(blank2);
} else {
for (i = 0; i < n; i++) {
- GoTo(NCURSES_SP_ARGx bot - i, 0);
- ClrToEOL(NCURSES_SP_ARGx blank2, FALSE);
+ GoTo(bot - i, 0);
+ ClrToEOL(blank2, FALSE);
}
}
}
} else { /* (n < 0) - scroll down (backward) */
- res = scroll_csr_backward(NCURSES_SP_ARGx -n, top, bot, 0, maxy, blank);
+ res = scroll_csr_backward(-n, top, bot, 0, maxy, blank);
if (res == ERR && change_scroll_region) {
- if (top != 0
- && (SP_PARM->_cursrow == top ||
- SP_PARM->_cursrow == top - 1)
+ if (top != 0 && (SP->_cursrow == top || SP->_cursrow == top - 1)
&& save_cursor && restore_cursor) {
cursor_saved = TRUE;
TPUTS_TRACE("save_cursor");
- NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx save_cursor);
+ putp(save_cursor);
}
TPUTS_TRACE("change_scroll_region");
- NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx
- TPARM_2(change_scroll_region, top, bot));
+ putp(TPARM_2(change_scroll_region, top, bot));
if (cursor_saved) {
TPUTS_TRACE("restore_cursor");
- NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx restore_cursor);
+ putp(restore_cursor);
} else {
- SP_PARM->_cursrow = SP_PARM->_curscol = -1;
+ SP->_cursrow = SP->_curscol = -1;
}
- res = scroll_csr_backward(NCURSES_SP_ARGx
- -n, top, bot, top, bot, blank);
+ res = scroll_csr_backward(-n, top, bot, top, bot, blank);
TPUTS_TRACE("change_scroll_region");
- NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx
- TPARM_2(change_scroll_region, 0, maxy));
- SP_PARM->_cursrow = SP_PARM->_curscol = -1;
+ putp(TPARM_2(change_scroll_region, 0, maxy));
+ SP->_cursrow = SP->_curscol = -1;
}
- if (res == ERR && SP_PARM->_nc_sp_idlok)
- res = scroll_idl(NCURSES_SP_ARGx -n, bot + n + 1, top, blank);
+ if (res == ERR && _nc_idlok)
+ res = scroll_idl(-n, bot + n + 1, top, blank);
/*
* Clear the newly shifted-in text.
@@ -2057,8 +1869,8 @@ NCURSES_SP_NAME(_nc_scrolln) (NCURSES_SP_DCLx
&& (non_dest_scroll_region || (memory_above && top == 0))) {
static const NCURSES_CH_T blank2 = NewChar(BLANK_TEXT);
for (i = 0; i < -n; i++) {
- GoTo(NCURSES_SP_ARGx i + top, 0);
- ClrToEOL(NCURSES_SP_ARGx blank2, FALSE);
+ GoTo(i + top, 0);
+ ClrToEOL(blank2, FALSE);
}
}
}
@@ -2066,163 +1878,99 @@ NCURSES_SP_NAME(_nc_scrolln) (NCURSES_SP_DCLx
if (res == ERR)
return (ERR);
- _nc_scroll_window(CurScreen(SP_PARM), n,
- (NCURSES_SIZE_T) top,
- (NCURSES_SIZE_T) bot,
- blank);
+ _nc_scroll_window(curscr, n, top, bot, blank);
/* shift hash values too - they can be reused */
- NCURSES_SP_NAME(_nc_scroll_oldhash) (NCURSES_SP_ARGx n, top, bot);
+ _nc_scroll_oldhash(n, top, bot);
return (OK);
}
-#if NCURSES_SP_FUNCS
-NCURSES_EXPORT(int)
-_nc_scrolln(int n, int top, int bot, int maxy)
-{
- return NCURSES_SP_NAME(_nc_scrolln) (CURRENT_SCREEN, n, top, bot, maxy);
-}
-#endif
-
NCURSES_EXPORT(void)
-NCURSES_SP_NAME(_nc_screen_resume) (NCURSES_SP_DCL0)
+_nc_screen_resume(void)
{
- assert(SP_PARM);
-
/* make sure terminal is in a sane known state */
- SetAttr(SCREEN_ATTRS(SP_PARM), A_NORMAL);
- NewScreen(SP_PARM)->_clear = TRUE;
+ SetAttr(SCREEN_ATTRS(SP), A_NORMAL);
+ newscr->_clear = TRUE;
/* reset color pairs and definitions */
- if (SP_PARM->_coloron || SP_PARM->_color_defs)
- NCURSES_SP_NAME(_nc_reset_colors) (NCURSES_SP_ARG);
+ if (SP->_coloron || SP->_color_defs)
+ _nc_reset_colors();
/* restore user-defined colors, if any */
- if (SP_PARM->_color_defs < 0) {
+ if (SP->_color_defs < 0) {
int n;
- SP_PARM->_color_defs = -(SP_PARM->_color_defs);
- for (n = 0; n < SP_PARM->_color_defs; ++n) {
- if (SP_PARM->_color_table[n].init) {
- NCURSES_SP_NAME(init_color) (NCURSES_SP_ARGx
- (short) n,
- SP_PARM->_color_table[n].r,
- SP_PARM->_color_table[n].g,
- SP_PARM->_color_table[n].b);
+ SP->_color_defs = -(SP->_color_defs);
+ for (n = 0; n < SP->_color_defs; ++n) {
+ if (SP->_color_table[n].init) {
+ init_color(n,
+ SP->_color_table[n].r,
+ SP->_color_table[n].g,
+ SP->_color_table[n].b);
}
}
}
if (exit_attribute_mode)
- NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx exit_attribute_mode);
+ putp(exit_attribute_mode);
else {
/* turn off attributes */
if (exit_alt_charset_mode)
- NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx exit_alt_charset_mode);
+ putp(exit_alt_charset_mode);
if (exit_standout_mode)
- NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx exit_standout_mode);
+ putp(exit_standout_mode);
if (exit_underline_mode)
- NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx exit_underline_mode);
+ putp(exit_underline_mode);
}
if (exit_insert_mode)
- NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx exit_insert_mode);
+ putp(exit_insert_mode);
if (enter_am_mode && exit_am_mode)
- NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx
- (auto_right_margin
- ? enter_am_mode
- : exit_am_mode));
+ putp(auto_right_margin ? enter_am_mode : exit_am_mode);
}
-#if NCURSES_SP_FUNCS
-NCURSES_EXPORT(void)
-_nc_screen_resume(void)
-{
- NCURSES_SP_NAME(_nc_screen_resume) (CURRENT_SCREEN);
-}
-#endif
-
-NCURSES_EXPORT(void)
-NCURSES_SP_NAME(_nc_screen_init) (NCURSES_SP_DCL0)
-{
- NCURSES_SP_NAME(_nc_screen_resume) (NCURSES_SP_ARG);
-}
-
-#if NCURSES_SP_FUNCS
NCURSES_EXPORT(void)
_nc_screen_init(void)
{
- NCURSES_SP_NAME(_nc_screen_init) (CURRENT_SCREEN);
+ _nc_screen_resume();
}
-#endif
/* wrap up screen handling */
NCURSES_EXPORT(void)
-NCURSES_SP_NAME(_nc_screen_wrap) (NCURSES_SP_DCL0)
+_nc_screen_wrap(void)
{
- if (SP_PARM == 0)
- return;
-
- UpdateAttrs(SP_PARM, normal);
+ UpdateAttrs(normal);
#if NCURSES_EXT_FUNCS
- if (SP_PARM->_coloron
- && !SP_PARM->_default_color) {
+ if (SP->_coloron
+ && !SP->_default_color) {
static const NCURSES_CH_T blank = NewChar(BLANK_TEXT);
- SP_PARM->_default_color = TRUE;
- NCURSES_SP_NAME(_nc_do_color) (NCURSES_SP_ARGx
- -1,
- 0,
- FALSE,
- NCURSES_SP_NAME(_nc_outch));
- SP_PARM->_default_color = FALSE;
-
- TINFO_MVCUR(NCURSES_SP_ARGx
- SP_PARM->_cursrow,
- SP_PARM->_curscol,
- screen_lines(SP_PARM) - 1,
- 0);
-
- ClrToEOL(NCURSES_SP_ARGx blank, TRUE);
+ SP->_default_color = TRUE;
+ _nc_do_color(-1, 0, FALSE, _nc_outch);
+ SP->_default_color = FALSE;
+
+ mvcur(SP->_cursrow, SP->_curscol, screen_lines - 1, 0);
+
+ ClrToEOL(blank, TRUE);
}
#endif
- if (SP_PARM->_color_defs) {
- NCURSES_SP_NAME(_nc_reset_colors) (NCURSES_SP_ARG);
+ if (SP->_color_defs) {
+ _nc_reset_colors();
}
}
-#if NCURSES_SP_FUNCS
-NCURSES_EXPORT(void)
-_nc_screen_wrap(void)
-{
- NCURSES_SP_NAME(_nc_screen_wrap) (CURRENT_SCREEN);
-}
-#endif
-
#if USE_XMC_SUPPORT
NCURSES_EXPORT(void)
-NCURSES_SP_NAME(_nc_do_xmc_glitch) (NCURSES_SP_DCLx attr_t previous)
+_nc_do_xmc_glitch(attr_t previous)
{
- if (SP_PARM != 0) {
- attr_t chg = XMC_CHANGES(previous ^ AttrOf(SCREEN_ATTRS(SP_PARM)));
-
- while (chg != 0) {
- if (chg & 1) {
- SP_PARM->_curscol += magic_cookie_glitch;
- if (SP_PARM->_curscol >= SP_PARM->_columns)
- wrap_cursor(NCURSES_SP_ARG);
- TR(TRACE_UPDATE, ("bumped to %d,%d after cookie",
- SP_PARM->_cursrow, SP_PARM->_curscol));
- }
- chg >>= 1;
+ attr_t chg = XMC_CHANGES(previous ^ AttrOf(SCREEN_ATTRS(SP)));
+
+ while (chg != 0) {
+ if (chg & 1) {
+ SP->_curscol += magic_cookie_glitch;
+ if (SP->_curscol >= SP->_columns)
+ wrap_cursor();
+ TR(TRACE_UPDATE, ("bumped to %d,%d after cookie", SP->_cursrow, SP->_curscol));
}
+ chg >>= 1;
}
}
-
-#if NCURSES_SP_FUNCS
-NCURSES_EXPORT(void)
-_nc_do_xmc_glitch(attr_t previous)
-{
- NCURSES_SP_NAME(_nc_do_xmc_glitch) (CURRENT_SCREEN, previous);
-}
-#endif
-
#endif /* USE_XMC_SUPPORT */