/****************************************************************************
- * Copyright (c) 1998,1999,2000 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2001,2002 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 *
*
*-----------------------------------------------------------------*/
+#include <curses.priv.h>
+
#ifdef __BEOS__
+#undef false
+#undef true
#include <OS.h>
#endif
-#include <curses.priv.h>
-
#if defined(TRACE) && HAVE_SYS_TIMES_H && HAVE_TIMES
#define USE_TRACE_TIMES 1
#else
#include <term.h>
-MODULE_ID("$Id: tty_update.c,v 1.146 2000/10/07 01:11:44 tom Exp $")
+MODULE_ID("$Id: tty_update.c,v 1.177 2002/09/28 20:41:55 tom Exp $")
/*
* This define controls the line-breakout optimization. Every once in a
*/
/* #define POSITION_DEBUG */
-static inline chtype ClrBlank(WINDOW *win);
+static inline NCURSES_CH_T ClrBlank(WINDOW *win);
static int ClrBottom(int total);
-static void ClearScreen(chtype blank);
+static void ClearScreen(NCURSES_CH_T blank);
static void ClrUpdate(void);
static void DelChar(int count);
-static void InsStr(chtype * line, int count);
+static void InsStr(NCURSES_CH_T * line, int count);
static void TransformLine(int const lineno);
#ifdef POSITION_DEBUG
static inline void
GoTo(int const row, int const col)
{
- chtype oldattr = SP->_current_attr;
+ attr_t oldattr = SP->_current_attr;
TR(TRACE_MOVE, ("GoTo(%d, %d) from (%d, %d)",
row, col, SP->_cursrow, SP->_curscol));
}
static inline void
-PutAttrChar(chtype ch)
+PutAttrChar(CARG_CH_T ch)
{
- int data;
+ PUTC_DATA;
+ NCURSES_CH_T tilde;
- if (tilde_glitch && (TextOf(ch) == '~'))
- ch = ('`' | AttrOf(ch));
+ if (tilde_glitch && (CharOfD(ch) == L('~'))) {
+ SetChar(tilde, L('`'), AttrOfD(ch));
+ ch = CHREF(tilde);
+ }
TR(TRACE_CHARPUT, ("PutAttrChar(%s) at (%d, %d)",
- _tracechtype(ch),
+ _tracech_t(ch),
SP->_cursrow, SP->_curscol));
- UpdateAttrs(ch);
- data = TextOf(ch);
+ UpdateAttrs(AttrOfD(ch));
+#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->_outch != 0) {
- SP->_outch(data);
- } else {
- putc(data, SP->_ofp); /* macro's fastest... */
+ SP->_outch((int) ch);
+ } else
+#endif
+ {
+ PUTC(CHDEREF(ch), SP->_ofp); /* macro's fastest... */
#ifdef TRACE
_nc_outchars++;
#endif /* TRACE */
return FALSE;
}
-/*
- * No one supports recursive inline functions. However, gcc is quieter if we
- * instantiate the recursive part separately.
- */
-#if CC_HAS_INLINE_FUNCS
-static void callPutChar(chtype const);
-#else
-#define callPutChar(ch) PutChar(ch)
-#endif
-
-static inline void PutChar(chtype const ch); /* forward declaration */
-
/* put char at lower right corner */
static void
-PutCharLR(chtype const ch)
+PutCharLR(const ARG_CH_T ch)
{
if (!auto_right_margin) {
/* we can put the char directly */
} else if ((enter_insert_mode && exit_insert_mode)
|| insert_character || parm_ich) {
GoTo(screen_lines - 1, screen_columns - 2);
- callPutChar(ch);
+ PutAttrChar(ch);
GoTo(screen_lines - 1, screen_columns - 2);
InsStr(newscr->_line[screen_lines - 1].text + screen_columns - 2, 1);
}
}
static inline void
-PutChar(chtype const ch)
+PutChar(const ARG_CH_T ch)
/* insert character, handling automargin stuff */
{
if (SP->_cursrow == screen_lines - 1 && SP->_curscol == screen_columns - 1)
* or can be output by clearing (A_COLOR in case of bce-terminal) are excluded.
*/
static inline bool
-can_clear_with(chtype ch)
+can_clear_with(ARG_CH_T ch)
{
if (!back_color_erase && SP->_coloron) {
- if (ch & A_COLOR)
- return FALSE;
#if NCURSES_EXT_FUNCS
if (!SP->_default_color)
return FALSE;
if (SP->_default_fg != C_MASK || SP->_default_bg != C_MASK)
return FALSE;
+ if (AttrOfD(ch) & A_COLOR) {
+ short fg, bg;
+ pair_content(PAIR_NUMBER(AttrOfD(ch)), &fg, &bg);
+ if (fg != C_MASK || bg != C_MASK)
+ return FALSE;
+ }
+#else
+ if (AttrOfD(ch) & A_COLOR)
+ return FALSE;
#endif
}
- return ((ch & ~(NONBLANK_ATTR | A_COLOR)) == BLANK);
+ return (ISBLANK(CHDEREF(ch)) &&
+ (AttrOfD(ch) & ~(NONBLANK_ATTR | A_COLOR)) == BLANK_ATTR);
}
/*
* This code is optimized using ech and rep.
*/
static int
-EmitRange(const chtype * ntext, int num)
+EmitRange(const NCURSES_CH_T * ntext, int num)
{
int i;
if (erase_chars || repeat_char) {
while (num > 0) {
int runcount;
- chtype ntext0;
+ NCURSES_CH_T ntext0;
- while (num > 1 && ntext[0] != ntext[1]) {
- PutChar(ntext[0]);
+ while (num > 1 && !CharEq(ntext[0], ntext[1])) {
+ PutChar(CHREF(ntext[0]));
ntext++;
num--;
}
ntext0 = ntext[0];
if (num == 1) {
- PutChar(ntext0);
+ PutChar(CHREF(ntext0));
return 0;
}
runcount = 2;
- while (runcount < num && ntext[runcount] == ntext0)
+ while (runcount < num && CharEq(ntext[runcount], ntext0))
runcount++;
/*
*/
if (erase_chars
&& runcount > SP->_ech_cost + SP->_cup_ch_cost
- && can_clear_with(ntext0)) {
- UpdateAttrs(ntext0);
+ && can_clear_with(CHREF(ntext0))) {
+ UpdateAttrs(AttrOf(ntext0));
putp(tparm(erase_chars, runcount));
/*
if (wrap_possible)
rep_count--;
- UpdateAttrs(ntext0);
- putp(tparm(repeat_char, TextOf(ntext0), rep_count));
+ UpdateAttrs(AttrOf(ntext0));
+ putp(tparm(repeat_char, CharOf(ntext0), rep_count));
SP->_curscol += rep_count;
if (wrap_possible)
- PutChar(ntext0);
+ PutChar(CHREF(ntext0));
} else {
for (i = 0; i < runcount; i++)
- PutChar(ntext[i]);
+ PutChar(CHREF(ntext[i]));
}
ntext += runcount;
num -= runcount;
}
for (i = 0; i < num; i++)
- PutChar(ntext[i]);
+ PutChar(CHREF(ntext[i]));
return 0;
}
* Returns: same as EmitRange
*/
static int
-PutRange(
- const chtype * otext,
- const chtype * ntext,
- int row,
- int first, int last)
+PutRange(const NCURSES_CH_T * otext,
+ const NCURSES_CH_T * ntext,
+ int row,
+ int first, int last)
{
int j, run;
if (otext != ntext
&& (last - first + 1) > SP->_inline_cost) {
for (j = first, run = 0; j <= last; j++) {
- if (otext[j] == ntext[j]) {
+ if (!run && isnac(otext[j]))
+ continue;
+ if (CharEq(otext[j], ntext[j])) {
run++;
} else {
if (run > SP->_inline_cost) {
return EmitRange(ntext + first, last - first + 1);
}
-#if CC_HAS_INLINE_FUNCS
-static void
-callPutChar(chtype const ch)
-{
- PutChar(ch);
-}
-#endif
-
/* leave unbracketed here so 'indent' works */
#define MARK_NOCHANGE(win,row) \
win->_line[row].firstchar = _NOCHANGE; \
win->_line[row].lastchar = _NOCHANGE; \
if_USE_SCROLL_HINTS(win->_line[row].oldindex = row)
-int
+NCURSES_EXPORT(int)
doupdate(void)
{
int i;
for (i = 0; i < screen_lines; i++) {
for (j = 0; j < screen_columns; j++) {
bool failed = FALSE;
- chtype turnon = AttrOf(newscr->_line[i].text[j]) & ~rattr;
+ attr_t turnon = AttrOf(newscr->_line[i].text[j]) & ~rattr;
/* is an attribute turned on here? */
if (turnon == 0) {
* ensure there's enough room to set the attribute before
* the first non-blank in the run.
*/
-#define SAFE(a) (!((a) & (chtype)~NONBLANK_ATTR))
- if (TextOf(newscr->_line[i].text[j]) == ' ' && SAFE(turnon)) {
- newscr->_line[i].text[j] &= ~turnon;
+#define SAFE(a) (!((a) & (attr_t)~NONBLANK_ATTR))
+ if (ISBLANK(newscr->_line[i].text[j]) && SAFE(turnon)) {
+ RemAttr(newscr->_line[i].text[j], turnon);
continue;
}
/* check that there's enough room at start of span */
for (k = 1; k <= magic_cookie_glitch; k++) {
if (j - k < 0
- || TextOf(newscr->_line[i].text[j - k]) != ' '
+ || !ISBLANK(newscr->_line[i].text[j - k])
|| !SAFE(AttrOf(newscr->_line[i].text[j - k])))
failed = TRUE;
}
foundit:;
if (end_onscreen) {
- chtype *lastline = newscr->_line[m].text;
+ NCURSES_CH_T *lastline = newscr->_line[m].text;
/*
* If there are safely-attributed blanks at the
* of span.
*/
while (n >= 0
- && TextOf(lastline[n]) == ' '
+ && ISBLANK(lastline[n])
&& SAFE(AttrOf(lastline[n])))
- lastline[n--] &= ~turnon;
+ 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
- || TextOf(lastline[n + k]) != ' '
+ || !ISBLANK(lastline[n + k])
|| !SAFE(AttrOf(lastline[n + k])))
failed = TRUE;
}
for (; q < screen_columns; q++) {
if (AttrOf(newscr->_line[p].text[q]) == rattr)
goto foundend;
- newscr->_line[p].text[q] &= ~turnon;
+ RemAttr(newscr->_line[p].text[q], turnon);
}
q = 0;
}
* for cookies before the first nonblank character
*/
for (k = 1; k <= magic_cookie_glitch; k++)
- newscr->_line[i].text[j - k] |= turnon;
+ AddAttr(newscr->_line[i].text[j - k], turnon);
}
rattr = AttrOf(newscr->_line[i].text[j]);
/* mark line changed successfully */
if (i <= newscr->_maxy) {
- MARK_NOCHANGE(newscr, i)
+ MARK_NOCHANGE(newscr, i);
}
if (i <= curscr->_maxy) {
- MARK_NOCHANGE(curscr, i)
+ MARK_NOCHANGE(curscr, i);
}
}
}
/* put everything back in sync */
for (i = nonempty; i <= newscr->_maxy; i++) {
- MARK_NOCHANGE(newscr, i)
+ MARK_NOCHANGE(newscr, i);
}
for (i = nonempty; i <= curscr->_maxy; i++) {
- MARK_NOCHANGE(curscr, i)
+ MARK_NOCHANGE(curscr, i);
}
if (!newscr->_leaveok) {
TR(TRACE_TIMES,
("Update cost: %ld chars, %ld clocks system time, %ld clocks user time",
_nc_outchars,
- after.tms_stime - before.tms_stime,
- after.tms_utime - before.tms_utime));
+ (long) (after.tms_stime - before.tms_stime),
+ (long) (after.tms_utime - before.tms_utime)));
#endif /* USE_TRACE_TIMES */
_nc_signal_handler(TRUE);
* in the wbkgd() call. Assume 'stdscr' for this case.
*/
#define BCE_ATTRS (A_NORMAL|A_COLOR)
-#define BCE_BKGD(win) (((win) == curscr ? stdscr : (win))->_bkgd)
+#define BCE_BKGD(win) (((win) == curscr ? stdscr : (win))->_nc_bkgd)
-static inline chtype
+static inline NCURSES_CH_T
ClrBlank(WINDOW *win)
{
- chtype blank = BLANK;
+ NCURSES_CH_T blank = NewChar(BLANK_TEXT);
if (back_color_erase)
- blank |= (BCE_BKGD(win) & BCE_ATTRS);
+ AddAttr(blank, (AttrOf(BCE_BKGD(win)) & BCE_ATTRS));
return blank;
}
ClrUpdate(void)
{
int i;
- chtype blank = ClrBlank(stdscr);
+ NCURSES_CH_T blank = ClrBlank(stdscr);
int nonempty = min(screen_lines, newscr->_maxy + 1);
TR(TRACE_UPDATE, ("ClrUpdate() called"));
*/
static void
-ClrToEOL(chtype blank, bool needclear)
+ClrToEOL(NCURSES_CH_T blank, bool needclear)
{
int j;
&& SP->_cursrow >= 0) {
for (j = SP->_curscol; j < screen_columns; j++) {
if (j >= 0) {
- chtype *cp = &(curscr->_line[SP->_cursrow].text[j]);
+ NCURSES_CH_T *cp = &(curscr->_line[SP->_cursrow].text[j]);
- if (*cp != blank) {
+ if (!CharEq(*cp, blank)) {
*cp = blank;
needclear = TRUE;
}
}
if (needclear) {
- UpdateAttrs(blank);
+ UpdateAttrs(AttrOf(blank));
TPUTS_TRACE("clr_eol");
if (SP->_el_cost > (screen_columns - SP->_curscol)) {
int count = (screen_columns - SP->_curscol);
while (count-- > 0)
- PutChar(blank);
+ PutChar(CHREF(blank));
} else {
putp(clr_eol);
}
*/
static void
-ClrToEOS(chtype blank)
+ClrToEOS(NCURSES_CH_T blank)
{
int row, col;
row = SP->_cursrow;
col = SP->_curscol;
- UpdateAttrs(blank);
+ UpdateAttrs(AttrOf(blank));
TPUTS_TRACE("clr_eos");
tputs(clr_eos, screen_lines - row, _nc_outch);
int col;
int top = total;
int last = min(screen_columns, newscr->_maxx + 1);
- chtype blank = ClrBlank(stdscr);
+ NCURSES_CH_T blank = ClrBlank(stdscr);
bool ok;
- if (clr_eos && can_clear_with(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 = (newscr->_line[row].text[col] == blank);
+ ok = (CharEq(newscr->_line[row].text[col], blank));
}
if (!ok)
break;
for (col = 0; ok && col < last; col++) {
- ok = (curscr->_line[row].text[col] == blank);
+ ok = (CharEq(curscr->_line[row].text[col], blank));
}
if (!ok)
top = row;
return total;
}
+#if USE_XMC_SUPPORT
+#if USE_WIDEC_SUPPORT
+static inline bool
+check_xmc_transition(NCURSES_CH_T * a, NCURSES_CH_T * b)
+{
+ if (((a->attr ^ b->attr) & ~(a->attr) & SP->_xmc_triggers) != 0) {
+ return TRUE;
+ }
+ return FALSE;
+}
+#define xmc_turn_on(a,b) check_xmc_transition(&(a), &(b))
+#else
+#define xmc_turn_on(a,b) ((((a)^(b)) & ~(a) & SP->_xmc_triggers) != 0)
+#endif
+
+#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)
**
TransformLine(int const lineno)
{
int firstChar, oLastChar, nLastChar;
- chtype *newLine = newscr->_line[lineno].text;
- chtype *oldLine = curscr->_line[lineno].text;
+ NCURSES_CH_T *newLine = newscr->_line[lineno].text;
+ NCURSES_CH_T *oldLine = curscr->_line[lineno].text;
int n;
bool attrchanged = FALSE;
if (SP->oldhash && SP->newhash)
SP->oldhash[lineno] = SP->newhash[lineno];
-#define ColorOf(n) ((n) & A_COLOR)
-#define unColor(n) ((n) & ALL_BUT_COLOR)
+#define ColorOf(n) (AttrOf(n) & A_COLOR)
+#define unColor(n) (AttrOf(n) & ALL_BUT_COLOR)
/*
* If we have colors, there is the possibility of having two color pairs
* that display as the same colors. For instance, Lynx does this. Check
* they are equivalent.
*/
if (SP->_coloron) {
- chtype oldColor;
- chtype newColor;
+ attr_t oldColor;
+ attr_t newColor;
int oldPair;
int newPair;
for (n = 0; n < screen_columns; n++) {
- if (newLine[n] != oldLine[n]) {
+ if (!CharEq(newLine[n], oldLine[n])) {
oldColor = ColorOf(oldLine[n]);
newColor = ColorOf(newLine[n]);
if (oldColor != newColor
if (oldPair < COLOR_PAIRS
&& newPair < COLOR_PAIRS
&& SP->_color_pairs[oldPair] == SP->_color_pairs[newPair]) {
- oldLine[n] &= ~A_COLOR;
- oldLine[n] |= ColorOf(newLine[n]);
+ RemAttr(oldLine[n], A_COLOR);
+ AddAttr(oldLine[n], ColorOf(newLine[n]));
}
}
}
PutRange(oldLine, newLine, lineno, 0, (screen_columns - 1));
#if USE_XMC_SUPPORT
-#define NEW(r,c) newscr->_line[r].text[c]
-#define xmc_turn_on(a,b) ((((a)^(b)) & ~(a) & SP->_xmc_triggers) != 0)
-#define xmc_turn_off(a,b) xmc_turn_on(b,a)
-
/*
* This is a very simple loop to paint characters which may have the
* magic cookie glitch embedded. It doesn't know much about video
* If we are writing an attributed blank, where the
* previous cell is not attributed.
*/
- if (TextOf(newLine[n]) == ' '
+ if (ISBLANK(newLine[n])
&& ((n > 0
&& xmc_turn_on(newLine[n - 1], newLine[n]))
|| (n == 0
&& lineno > 0
- && xmc_turn_on(NEW(lineno - 1, screen_columns - 1),
+ && xmc_turn_on(xmc_new(lineno - 1, screen_columns - 1),
newLine[n])))) {
n = m;
}
- PutChar(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 (TextOf(newLine[n]) != ' '
+ if (!ISBLANK(newLine[n])
&& ((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], NEW(lineno + 1, 0))))) {
+ && xmc_turn_off(newLine[n], xmc_new(lineno + 1, 0))))) {
n = m;
}
}
-#undef NEW
#endif
} else {
- chtype blank;
+ NCURSES_CH_T blank;
/* find the first differing character */
while (firstChar < screen_columns &&
- newLine[firstChar] == oldLine[firstChar])
+ CharEq(newLine[firstChar], oldLine[firstChar]))
firstChar++;
/* if there wasn't one, we're done */
return;
/* it may be cheap to clear leading whitespace with clr_bol */
- if (clr_bol && can_clear_with(blank = newLine[0])) {
+ if (clr_bol && (blank = newLine[0], can_clear_with(CHREF(blank)))) {
int oFirstChar, nFirstChar;
for (oFirstChar = 0; oFirstChar < screen_columns; oFirstChar++)
- if (oldLine[oFirstChar] != blank)
+ if (!CharEq(oldLine[oFirstChar], blank))
break;
for (nFirstChar = 0; nFirstChar < screen_columns; nFirstChar++)
- if (newLine[nFirstChar] != blank)
+ if (!CharEq(newLine[nFirstChar], blank))
break;
if (nFirstChar > oFirstChar + SP->_el1_cost) {
if (nFirstChar >= screen_columns && SP->_el_cost <= SP->_el1_cost) {
GoTo(lineno, 0);
- UpdateAttrs(blank);
+ UpdateAttrs(AttrOf(blank));
TPUTS_TRACE("clr_eol");
putp(clr_eol);
} else {
GoTo(lineno, nFirstChar - 1);
- UpdateAttrs(blank);
+ UpdateAttrs(AttrOf(blank));
TPUTS_TRACE("clr_bol");
putp(clr_bol);
}
blank = newLine[screen_columns - 1];
- if (!can_clear_with(blank)) {
+ if (!can_clear_with(CHREF(blank))) {
/* find the last differing character */
nLastChar = screen_columns - 1;
while (nLastChar > firstChar
- && newLine[nLastChar] == oldLine[nLastChar])
+ && CharEq(newLine[nLastChar], oldLine[nLastChar]))
nLastChar--;
if (nLastChar >= firstChar) {
PutRange(oldLine, newLine, lineno, firstChar, nLastChar);
memcpy(oldLine + firstChar,
newLine + firstChar,
- (nLastChar - firstChar + 1) * sizeof(chtype));
+ (nLastChar - firstChar + 1) * sizeof(NCURSES_CH_T));
}
return;
}
/* find last non-blank character on old line */
oLastChar = screen_columns - 1;
- while (oLastChar > firstChar && oldLine[oLastChar] == blank)
+ while (oLastChar > firstChar && CharEq(oldLine[oLastChar], blank))
oLastChar--;
/* find last non-blank character on new line */
nLastChar = screen_columns - 1;
- while (nLastChar > firstChar && newLine[nLastChar] == blank)
+ while (nLastChar > firstChar && CharEq(newLine[nLastChar], blank))
nLastChar--;
if ((nLastChar == firstChar)
&& (SP->_el_cost < (oLastChar - nLastChar))) {
GoTo(lineno, firstChar);
- if (newLine[firstChar] != blank)
- PutChar(newLine[firstChar]);
+ if (!CharEq(newLine[firstChar], blank))
+ PutChar(CHREF(newLine[firstChar]));
ClrToEOL(blank, FALSE);
} else if ((nLastChar != oLastChar)
- && (newLine[nLastChar] != oldLine[oLastChar]
+ && (!CharEq(newLine[nLastChar], oldLine[oLastChar])
|| !(_nc_idcok && has_ic()))) {
GoTo(lineno, firstChar);
if ((oLastChar - nLastChar) > SP->_el_cost) {
int oLastNonblank = oLastChar;
/* find the last characters that really differ */
- while (newLine[nLastChar] == oldLine[oLastChar]) {
- if (nLastChar != 0
- && oLastChar != 0) {
- nLastChar--;
- oLastChar--;
- } else {
+ /* can be -1 if no characters differ */
+ while (CharEq(newLine[nLastChar], oldLine[oLastChar])) {
+ /* don't split a wide char */
+ if (isnac(newLine[nLastChar]) &&
+ !CharEq(newLine[nLastChar - 1], oldLine[oLastChar - 1]))
+ break;
+ nLastChar--;
+ oLastChar--;
+ if (nLastChar == -1 || oLastChar == -1)
break;
- }
}
n = min(oLastChar, nLastChar);
* setting the video attributes from
* the last character on the row.
*/
- UpdateAttrs(blank);
+ UpdateAttrs(AttrOf(blank));
DelChar(oLastChar - nLastChar);
}
}
if (screen_columns > firstChar)
memcpy(oldLine + firstChar,
newLine + firstChar,
- (screen_columns - firstChar) * sizeof(chtype));
+ (screen_columns - firstChar) * sizeof(NCURSES_CH_T));
}
/*
*/
static void
-ClearScreen(chtype blank)
+ClearScreen(NCURSES_CH_T blank)
{
int i, j;
bool fast_clear = (clear_screen || clr_eos || clr_eol);
#if NCURSES_EXT_FUNCS
if (SP->_coloron
&& !SP->_default_color) {
- _nc_do_color(COLOR_PAIR(SP->_current_attr), 0, FALSE, _nc_outch);
+ _nc_do_color((int) COLOR_PAIR(SP->_current_attr), 0, FALSE, _nc_outch);
if (!back_color_erase) {
fast_clear = FALSE;
}
if (fast_clear) {
if (clear_screen) {
- UpdateAttrs(blank);
+ UpdateAttrs(AttrOf(blank));
TPUTS_TRACE("clear_screen");
putp(clear_screen);
SP->_cursrow = SP->_curscol = 0;
SP->_cursrow = SP->_curscol = -1;
GoTo(0, 0);
- UpdateAttrs(blank);
+ UpdateAttrs(AttrOf(blank));
TPUTS_TRACE("clr_eos");
putp(clr_eos);
} else if (clr_eol) {
SP->_cursrow = SP->_curscol = -1;
- UpdateAttrs(blank);
+ UpdateAttrs(AttrOf(blank));
for (i = 0; i < screen_lines; i++) {
GoTo(i, 0);
TPUTS_TRACE("clr_eol");
GoTo(0, 0);
}
} else {
- UpdateAttrs(blank);
+ UpdateAttrs(AttrOf(blank));
for (i = 0; i < screen_lines; i++) {
GoTo(i, 0);
for (j = 0; j < screen_columns; j++)
- PutChar(blank);
+ PutChar(CHREF(blank));
}
GoTo(0, 0);
}
*/
static void
-InsStr(chtype * line, int count)
+InsStr(NCURSES_CH_T * line, int count)
{
TR(TRACE_UPDATE, ("InsStr(%p,%d) called", line, count));
TPUTS_TRACE("parm_ich");
tputs(tparm(parm_ich, count), count, _nc_outch);
while (count) {
- PutAttrChar(*line);
+ PutAttrChar(CHREF(*line));
line++;
count--;
}
TPUTS_TRACE("enter_insert_mode");
putp(enter_insert_mode);
while (count) {
- PutAttrChar(*line);
+ PutAttrChar(CHREF(*line));
if (insert_padding) {
TPUTS_TRACE("insert_padding");
putp(insert_padding);
while (count) {
TPUTS_TRACE("insert_character");
putp(insert_character);
- PutAttrChar(*line);
+ PutAttrChar(CHREF(*line));
if (insert_padding) {
TPUTS_TRACE("insert_padding");
putp(insert_padding);
** Emit a string without waiting for update.
*/
-void
+NCURSES_EXPORT(void)
_nc_outstr(const char *str)
{
(void) putp(str);
/* Try to scroll up assuming given csr (miny, maxy). Returns ERR on failure */
static int
-scroll_csr_forward(int n, int top, int bot, int miny, int maxy, chtype blank)
+scroll_csr_forward(int n, int top, int bot, int miny, int maxy, NCURSES_CH_T blank)
{
- int i, j;
+ int i;
if (n == 1 && scroll_forward && top == miny && bot == maxy) {
GoTo(bot, 0);
- UpdateAttrs(blank);
+ UpdateAttrs(AttrOf(blank));
TPUTS_TRACE("scroll_forward");
tputs(scroll_forward, 0, _nc_outch);
} else if (n == 1 && delete_line && bot == maxy) {
GoTo(top, 0);
- UpdateAttrs(blank);
+ UpdateAttrs(AttrOf(blank));
TPUTS_TRACE("delete_line");
tputs(delete_line, 0, _nc_outch);
} else if (parm_index && top == miny && bot == maxy) {
GoTo(bot, 0);
- UpdateAttrs(blank);
+ UpdateAttrs(AttrOf(blank));
TPUTS_TRACE("parm_index");
tputs(tparm(parm_index, n, 0), n, _nc_outch);
} else if (parm_delete_line && bot == maxy) {
GoTo(top, 0);
- UpdateAttrs(blank);
+ UpdateAttrs(AttrOf(blank));
TPUTS_TRACE("parm_delete_line");
tputs(tparm(parm_delete_line, n, 0), n, _nc_outch);
} else if (scroll_forward && top == miny && bot == maxy) {
GoTo(bot, 0);
- UpdateAttrs(blank);
+ UpdateAttrs(AttrOf(blank));
for (i = 0; i < n; i++) {
TPUTS_TRACE("scroll_forward");
tputs(scroll_forward, 0, _nc_outch);
}
} else if (delete_line && bot == maxy) {
GoTo(top, 0);
- UpdateAttrs(blank);
+ UpdateAttrs(AttrOf(blank));
for (i = 0; i < n; i++) {
TPUTS_TRACE("delete_line");
tputs(delete_line, 0, _nc_outch);
#if NCURSES_EXT_FUNCS
if (FILL_BCE()) {
+ int j;
for (i = 0; i < n; i++) {
GoTo(bot - i, 0);
for (j = 0; j < screen_columns; j++)
- PutChar(blank);
+ PutChar(CHREF(blank));
}
}
#endif
/* Try to scroll down assuming given csr (miny, maxy). Returns ERR on failure */
/* n > 0 */
static int
-scroll_csr_backward(int n, int top, int bot, int miny, int maxy, chtype blank)
+scroll_csr_backward(int n, int top, int bot, int miny, int maxy,
+ NCURSES_CH_T blank)
{
- int i, j;
+ int i;
if (n == 1 && scroll_reverse && top == miny && bot == maxy) {
GoTo(top, 0);
- UpdateAttrs(blank);
+ UpdateAttrs(AttrOf(blank));
TPUTS_TRACE("scroll_reverse");
tputs(scroll_reverse, 0, _nc_outch);
} else if (n == 1 && insert_line && bot == maxy) {
GoTo(top, 0);
- UpdateAttrs(blank);
+ UpdateAttrs(AttrOf(blank));
TPUTS_TRACE("insert_line");
tputs(insert_line, 0, _nc_outch);
} else if (parm_rindex && top == miny && bot == maxy) {
GoTo(top, 0);
- UpdateAttrs(blank);
+ UpdateAttrs(AttrOf(blank));
TPUTS_TRACE("parm_rindex");
tputs(tparm(parm_rindex, n, 0), n, _nc_outch);
} else if (parm_insert_line && bot == maxy) {
GoTo(top, 0);
- UpdateAttrs(blank);
+ UpdateAttrs(AttrOf(blank));
TPUTS_TRACE("parm_insert_line");
tputs(tparm(parm_insert_line, n, 0), n, _nc_outch);
} else if (scroll_reverse && top == miny && bot == maxy) {
GoTo(top, 0);
- UpdateAttrs(blank);
+ UpdateAttrs(AttrOf(blank));
for (i = 0; i < n; i++) {
TPUTS_TRACE("scroll_reverse");
tputs(scroll_reverse, 0, _nc_outch);
}
} else if (insert_line && bot == maxy) {
GoTo(top, 0);
- UpdateAttrs(blank);
+ UpdateAttrs(AttrOf(blank));
for (i = 0; i < n; i++) {
TPUTS_TRACE("insert_line");
tputs(insert_line, 0, _nc_outch);
#if NCURSES_EXT_FUNCS
if (FILL_BCE()) {
+ int j;
for (i = 0; i < n; i++) {
GoTo(top + i, 0);
for (j = 0; j < screen_columns; j++)
- PutChar(blank);
+ PutChar(CHREF(blank));
}
}
#endif
/* scroll by using delete_line at del and insert_line at ins */
/* n > 0 */
static int
-scroll_idl(int n, int del, int ins, chtype blank)
+scroll_idl(int n, int del, int ins, NCURSES_CH_T blank)
{
int i;
return ERR;
GoTo(del, 0);
- UpdateAttrs(blank);
+ UpdateAttrs(AttrOf(blank));
if (n == 1 && delete_line) {
TPUTS_TRACE("delete_line");
tputs(delete_line, 0, _nc_outch);
}
GoTo(ins, 0);
- UpdateAttrs(blank);
+ UpdateAttrs(AttrOf(blank));
if (n == 1 && insert_line) {
TPUTS_TRACE("insert_line");
tputs(insert_line, 0, _nc_outch);
return OK;
}
-int
+NCURSES_EXPORT(int)
_nc_scrolln(int n, int top, int bot, int maxy)
/* scroll region from top to bot by n lines */
{
- chtype blank = ClrBlank(stdscr);
+ NCURSES_CH_T blank = ClrBlank(stdscr);
int i;
bool cursor_saved = FALSE;
int res;
*/
if (res != ERR
&& (non_dest_scroll_region || (memory_below && bot == maxy))) {
+ NCURSES_CH_T blank2 = NewChar(BLANK_TEXT);
if (bot == maxy && clr_eos) {
GoTo(bot - n, 0);
- ClrToEOS(BLANK);
+ ClrToEOS(blank2);
} else {
for (i = 0; i < n; i++) {
GoTo(bot - i, 0);
- ClrToEOL(BLANK, FALSE);
+ ClrToEOL(blank2, FALSE);
}
}
}
*/
if (res != ERR
&& (non_dest_scroll_region || (memory_above && top == 0))) {
+ NCURSES_CH_T blank2 = NewChar(BLANK_TEXT);
for (i = 0; i < -n; i++) {
GoTo(i + top, 0);
- ClrToEOL(BLANK, FALSE);
+ ClrToEOL(blank2, FALSE);
}
}
}
return (OK);
}
-void
+NCURSES_EXPORT(void)
_nc_screen_resume(void)
{
/* make sure terminal is in a sane known state */
SP->_current_attr = A_NORMAL;
newscr->_clear = TRUE;
- if (SP->_coloron == TRUE && orig_pair)
- putp(orig_pair);
+ /* reset color pairs and definitions */
+ if (SP->_coloron || SP->_color_defs)
+ _nc_reset_colors();
+
+ /* restore user-defined colors, if any */
+ if (SP->_color_defs < 0) {
+ int n;
+ 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)
putp(exit_attribute_mode);
else {
putp(auto_right_margin ? enter_am_mode : exit_am_mode);
}
-void
+NCURSES_EXPORT(void)
_nc_screen_init(void)
{
_nc_screen_resume();
}
/* wrap up screen handling */
-void
+NCURSES_EXPORT(void)
_nc_screen_wrap(void)
{
UpdateAttrs(A_NORMAL);
#if NCURSES_EXT_FUNCS
if (SP->_coloron
&& !SP->_default_color) {
+ NCURSES_CH_T blank = NewChar(BLANK_TEXT);
SP->_default_color = TRUE;
_nc_do_color(-1, 0, FALSE, _nc_outch);
SP->_default_color = FALSE;
SP->_cursrow = screen_lines - 1;
SP->_curscol = 0;
- ClrToEOL(BLANK, TRUE);
+ ClrToEOL(blank, TRUE);
}
#endif
+ if (SP->_color_defs) {
+ _nc_reset_colors();
+ }
}
#if USE_XMC_SUPPORT
-void
+NCURSES_EXPORT(void)
_nc_do_xmc_glitch(attr_t previous)
{
attr_t chg = XMC_CHANGES(previous ^ SP->_current_attr);
projects / ncurses.git / blobdiff