Update to ncurses-5.0-20000325

1 files changed, 168 insertions, 163 deletions

diff --git a/lib/libcurses/tty/lib_vidattr.c b/lib/libcurses/tty/lib_vidattr.c
index 8e836442f0f..9a38f0588f5 100644
--- a/lib/libcurses/tty/lib_vidattr.c
+++ b/lib/libcurses/tty/lib_vidattr.c
@@ -1,7 +1,7 @@
-/*	$OpenBSD: lib_vidattr.c,v 1.3 1999/11/28 17:49:55 millert Exp $	*/
+/*	$OpenBSD: lib_vidattr.c,v 1.4 2000/03/26 16:45:04 millert Exp $	*/
 
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998,1999,2000 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            *
@@ -66,7 +66,7 @@
 #include <curses.priv.h>
 #include <term.h>
 
-MODULE_ID("$From: lib_vidattr.c,v 1.24 1999/11/14 02:53:43 tom Exp $")
+MODULE_ID("$From: lib_vidattr.c,v 1.26 2000/03/26 02:56:20 tom Exp $");
 
 #define doPut(mode) TPUTS_TRACE(#mode); tputs(mode, 1, outc)
 
@@ -78,212 +78,217 @@ MODULE_ID("$From: lib_vidattr.c,v 1.24 1999/11/14 02:53:43 tom Exp $")
 
 	/* if there is no current screen, assume we *can* do color */
 #define SetColorsIf(why,old_attr) \
-	if (can_color && (1)) { \
+	if (can_color && (why)) { \
 		int old_pair = PAIR_NUMBER(old_attr); \
 		T(("old pair = %d -- new pair = %d", old_pair, pair)); \
 		if ((pair != old_pair) \
 		 || (fix_pair0 && (pair == 0)) \
 		 || (reverse ^ ((old_attr & A_REVERSE) != 0))) { \
-			_nc_do_color(pair, reverse, outc); \
+			_nc_do_color(old_pair, pair, reverse, outc); \
 		} \
 	}
 
-int vidputs(attr_t newmode, int  (*outc)(int))
+int
+vidputs(attr_t newmode, int (*outc) (int))
 {
-static attr_t previous_attr = A_NORMAL;
-attr_t turn_on, turn_off;
-int pair;
-bool reverse = FALSE;
-bool used_ncv = FALSE;
-bool can_color = (SP == 0 || SP->_coloron);
+    static attr_t previous_attr = A_NORMAL;
+    attr_t turn_on, turn_off;
+    int pair;
+    bool reverse = FALSE;
+    bool used_ncv = FALSE;
+    bool can_color = (SP == 0 || SP->_coloron);
 #ifdef NCURSES_EXT_FUNCS
-bool fix_pair0 = (SP != 0 && SP->_coloron && !SP->_default_color);
+    bool fix_pair0 = (SP != 0 && SP->_coloron && !SP->_default_color);
 #else
 #define fix_pair0 FALSE
 #endif
 
-	T((T_CALLED("vidputs(%s)"), _traceattr(newmode)));
+    T((T_CALLED("vidputs(%s)"), _traceattr(newmode)));
 
-	/* this allows us to go on whether or not newterm() has been called */
-	if (SP)
-		previous_attr = SP->_current_attr;
+    /* this allows us to go on whether or not newterm() has been called */
+    if (SP)
+	previous_attr = SP->_current_attr;
 
-	T(("previous attribute was %s", _traceattr(previous_attr)));
+    T(("previous attribute was %s", _traceattr(previous_attr)));
 
 #if !USE_XMC_SUPPORT
-	if ((SP != 0)
-	 && (magic_cookie_glitch > 0))
-		newmode &= ~(SP->_xmc_suppress);
+    if ((SP != 0)
+	&& (magic_cookie_glitch > 0))
+	newmode &= ~(SP->_xmc_suppress);
 #endif
 
-	/*
-	 * If we have a terminal that cannot combine color with video
-	 * attributes, use the colors in preference.
-	 */
-	if ((newmode & A_COLOR)
-	 && (no_color_video > 0)) {
-		static const struct {
-			attr_t video;
-			unsigned bit;
-		} table[] = {
-			{ A_STANDOUT,		1 },
-			{ A_UNDERLINE,		2 },
-			{ A_REVERSE,		4 },
-			{ A_BLINK,		8 },
-			{ A_DIM,		16 },
-			{ A_BOLD, 		32 },
-			{ A_INVIS,		64 },
-			{ A_PROTECT,		128 },
-			{ A_ALTCHARSET,		256 },
-		};
-		size_t n;
-		for (n = 0; n < SIZEOF(table); n++) {
-			if ((table[n].bit & no_color_video)
-			 && (table[n].video & newmode)) {
-				used_ncv = TRUE;
-				if (table[n].video == A_REVERSE)
-					reverse = TRUE;
-				else
-					newmode &= ~table[n].video;
-			}
-		}
+    /*
+     * If we have a terminal that cannot combine color with video
+     * attributes, use the colors in preference.
+     */
+    if ((newmode & A_COLOR)
+	&& (no_color_video > 0)) {
+	/* *INDENT-OFF* */
+	static const struct {
+	    attr_t video;
+	    unsigned bit;
+	} table[] = {
+	    { A_STANDOUT,       1 },
+	    { A_UNDERLINE,      2 },
+	    { A_REVERSE,        4 },
+	    { A_BLINK,          8 },
+	    { A_DIM,            16 },
+	    { A_BOLD,           32 },
+	    { A_INVIS,          64 },
+	    { A_PROTECT,        128 },
+	    { A_ALTCHARSET,     256 },
+	};
+	/* *INDENT-ON* */
+
+	size_t n;
+	for (n = 0; n < SIZEOF(table); n++) {
+	    if ((table[n].bit & no_color_video)
+		&& (table[n].video & newmode)) {
+		used_ncv = TRUE;
+		if (table[n].video == A_REVERSE)
+		    reverse = TRUE;
+		else
+		    newmode &= ~table[n].video;
+	    }
 	}
+    }
 
-	if (newmode == previous_attr)
-		returnCode(OK);
+    if (newmode == previous_attr)
+	returnCode(OK);
+
+    pair = PAIR_NUMBER(newmode);
+
+    if (reverse) {
+	newmode &= ~A_REVERSE;
+    }
 
-	pair = PAIR_NUMBER(newmode);
+    turn_off = (~newmode & previous_attr) & ALL_BUT_COLOR;
+    turn_on = (newmode & ~previous_attr) & ALL_BUT_COLOR;
 
-	if (reverse) {
-		newmode &= ~A_REVERSE;
+    SetColorsIf(((pair == 0) && !fix_pair0), previous_attr);
+
+    if (newmode == A_NORMAL) {
+	if ((previous_attr & A_ALTCHARSET) && exit_alt_charset_mode) {
+	    doPut(exit_alt_charset_mode);
+	    previous_attr &= ~A_ALTCHARSET;
+	}
+	if (previous_attr) {
+	    doPut(exit_attribute_mode);
+	    previous_attr &= ~A_COLOR;
 	}
 
-	turn_off = (~newmode & previous_attr) & ALL_BUT_COLOR;
-	turn_on  = (newmode & ~previous_attr) & ALL_BUT_COLOR;
-
-	SetColorsIf(pair == 0, previous_attr);
-
-	if (newmode == A_NORMAL) {
-		if((previous_attr & A_ALTCHARSET) && exit_alt_charset_mode) {
-			doPut(exit_alt_charset_mode);
-			previous_attr &= ~A_ALTCHARSET;
-		}
-		if (previous_attr) {
-			doPut(exit_attribute_mode);
-			if (fix_pair0) _nc_do_color(0, FALSE, _nc_outch);
-			previous_attr &= ~A_COLOR;
-		}
-
-		SetColorsIf(pair != 0, previous_attr);
-	} else if (set_attributes && !used_ncv) {
-		if (turn_on || turn_off) {
-			TPUTS_TRACE("set_attributes");
-			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);
-			previous_attr &= ~A_COLOR;
-		}
-		SetColorsIf(pair != 0, previous_attr);
-	} else {
-
-		T(("turning %s off", _traceattr(turn_off)));
-
-		TurnOff(A_ALTCHARSET,  exit_alt_charset_mode);
-
-		if (!SP || SP->_use_rmul) {
-			TurnOff(A_UNDERLINE,   exit_underline_mode);
-		}
-
-		if (!SP || SP->_use_rmso) {
-			TurnOff(A_STANDOUT,    exit_standout_mode);
-		}
-
-		if (turn_off && exit_attribute_mode) {
-			doPut(exit_attribute_mode);
-			if (fix_pair0) _nc_do_color(0, FALSE, _nc_outch);
-			turn_on  |= (newmode & (chtype)(~A_COLOR));
-			previous_attr &= ~A_COLOR;
-		}
-		SetColorsIf(pair != 0, previous_attr);
-
-		T(("turning %s on", _traceattr(turn_on)));
-
-		TurnOn (A_ALTCHARSET, enter_alt_charset_mode);
-		TurnOn (A_BLINK,      enter_blink_mode);
-		TurnOn (A_BOLD,       enter_bold_mode);
-		TurnOn (A_DIM,        enter_dim_mode);
-		TurnOn (A_REVERSE,    enter_reverse_mode);
-		TurnOn (A_STANDOUT,   enter_standout_mode);
-		TurnOn (A_PROTECT,    enter_protected_mode);
-		TurnOn (A_INVIS,      enter_secure_mode);
-		TurnOn (A_UNDERLINE,  enter_underline_mode);
-		TurnOn (A_HORIZONTAL, enter_horizontal_hl_mode);
-		TurnOn (A_LEFT,       enter_left_hl_mode);
-		TurnOn (A_LOW,        enter_low_hl_mode);
-		TurnOn (A_RIGHT,      enter_right_hl_mode);
-		TurnOn (A_TOP,        enter_top_hl_mode);
-		TurnOn (A_VERTICAL,   enter_vertical_hl_mode);
+	SetColorsIf((pair != 0) || fix_pair0, previous_attr);
+    } else if (set_attributes && !used_ncv) {
+	if (turn_on || turn_off) {
+	    TPUTS_TRACE("set_attributes");
+	    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);
+	    previous_attr &= ~A_COLOR;
 	}
+	SetColorsIf((pair != 0) || fix_pair0, previous_attr);
+    } else {
 
-	if (reverse)
-		newmode |= A_REVERSE;
+	T(("turning %s off", _traceattr(turn_off)));
 
-	if (SP)
-		SP->_current_attr = newmode;
-	else
-		previous_attr = newmode;
+	TurnOff(A_ALTCHARSET, exit_alt_charset_mode);
 
-	returnCode(OK);
+	if (!SP || SP->_use_rmul) {
+	    TurnOff(A_UNDERLINE, exit_underline_mode);
+	}
+
+	if (!SP || SP->_use_rmso) {
+	    TurnOff(A_STANDOUT, exit_standout_mode);
+	}
+
+	if (turn_off && exit_attribute_mode) {
+	    doPut(exit_attribute_mode);
+	    turn_on |= (newmode & (chtype) (~A_COLOR));
+	    previous_attr &= ~A_COLOR;
+	}
+	SetColorsIf((pair != 0) || fix_pair0, previous_attr);
+
+	T(("turning %s on", _traceattr(turn_on)));
+	/* *INDENT-OFF* */
+	TurnOn(A_ALTCHARSET,	enter_alt_charset_mode);
+	TurnOn(A_BLINK,		enter_blink_mode);
+	TurnOn(A_BOLD,		enter_bold_mode);
+	TurnOn(A_DIM,		enter_dim_mode);
+	TurnOn(A_REVERSE,	enter_reverse_mode);
+	TurnOn(A_STANDOUT,	enter_standout_mode);
+	TurnOn(A_PROTECT,	enter_protected_mode);
+	TurnOn(A_INVIS,		enter_secure_mode);
+	TurnOn(A_UNDERLINE,	enter_underline_mode);
+	TurnOn(A_HORIZONTAL,	enter_horizontal_hl_mode);
+	TurnOn(A_LEFT,		enter_left_hl_mode);
+	TurnOn(A_LOW,		enter_low_hl_mode);
+	TurnOn(A_RIGHT,		enter_right_hl_mode);
+	TurnOn(A_TOP,		enter_top_hl_mode);
+	TurnOn(A_VERTICAL,	enter_vertical_hl_mode);
+	/* *INDENT-ON* */
+
+    }
+
+    if (reverse)
+	newmode |= A_REVERSE;
+
+    if (SP)
+	SP->_current_attr = newmode;
+    else
+	previous_attr = newmode;
+
+    returnCode(OK);
 }
 
-int vidattr(attr_t newmode)
+int
+vidattr(attr_t newmode)
 {
-	T((T_CALLED("vidattr(%s)"), _traceattr(newmode)));
+    T((T_CALLED("vidattr(%s)"), _traceattr(newmode)));
 
-	returnCode(vidputs(newmode, _nc_outch));
+    returnCode(vidputs(newmode, _nc_outch));
 }
 
-chtype termattrs(void)
+chtype
+termattrs(void)
 {
-	chtype attrs = A_NORMAL;
+    chtype attrs = A_NORMAL;
 
-	if (enter_alt_charset_mode)
-		attrs |= A_ALTCHARSET;
+    if (enter_alt_charset_mode)
+	attrs |= A_ALTCHARSET;
 
-	if (enter_blink_mode)
-		attrs |= A_BLINK;
+    if (enter_blink_mode)
+	attrs |= A_BLINK;
 
-	if (enter_bold_mode)
-		attrs |= A_BOLD;
+    if (enter_bold_mode)
+	attrs |= A_BOLD;
 
-	if (enter_dim_mode)
-		attrs |= A_DIM;
+    if (enter_dim_mode)
+	attrs |= A_DIM;
 
-	if (enter_reverse_mode)
-		attrs |= A_REVERSE;
+    if (enter_reverse_mode)
+	attrs |= A_REVERSE;
 
-	if (enter_standout_mode)
-		attrs |= A_STANDOUT;
+    if (enter_standout_mode)
+	attrs |= A_STANDOUT;
 
-	if (enter_protected_mode)
-		attrs |= A_PROTECT;
+    if (enter_protected_mode)
+	attrs |= A_PROTECT;
 
-	if (enter_secure_mode)
-		attrs |= A_INVIS;
+    if (enter_secure_mode)
+	attrs |= A_INVIS;
 
-	if (enter_underline_mode)
-		attrs |= A_UNDERLINE;
+    if (enter_underline_mode)
+	attrs |= A_UNDERLINE;
 
-	if (SP->_coloron)
-		attrs |= A_COLOR;
+    if (SP->_coloron)
+	attrs |= A_COLOR;
 
-	return(attrs);
+    return (attrs);
 }
-