diff options
author | 2000-10-08 22:46:53 +0000 | |
---|---|---|
committer | 2000-10-08 22:46:53 +0000 | |
commit | 91421ef511f3d137bc8cbea1d63f2c50663d7a1f (patch) | |
tree | d1326167c538bf562ffc9cfee9ecbc91a458846e /lib/libcurses/base/lib_color.c | |
parent | Update to ncurses-5.1-20001007 version: (diff) | |
download | wireguard-openbsd-91421ef511f3d137bc8cbea1d63f2c50663d7a1f.tar.xz wireguard-openbsd-91421ef511f3d137bc8cbea1d63f2c50663d7a1f.zip |
update to ncurses-5.1-20001007
Diffstat (limited to 'lib/libcurses/base/lib_color.c')
-rw-r--r-- | lib/libcurses/base/lib_color.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/libcurses/base/lib_color.c b/lib/libcurses/base/lib_color.c index a1a195453c4..952698083d0 100644 --- a/lib/libcurses/base/lib_color.c +++ b/lib/libcurses/base/lib_color.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lib_color.c,v 1.8 2000/06/19 03:53:40 millert Exp $ */ +/* $OpenBSD: lib_color.c,v 1.9 2000/10/08 22:46:58 millert Exp $ */ /**************************************************************************** * Copyright (c) 1998,1999,2000 Free Software Foundation, Inc. * @@ -43,7 +43,7 @@ #include <term.h> #include <tic.h> -MODULE_ID("$From: lib_color.c,v 1.51 2000/05/20 20:09:22 tom Exp $") +MODULE_ID("$From: lib_color.c,v 1.53 2000/09/02 18:02:15 tom Exp $") /* * These should be screen structure members. They need to be globals for @@ -87,7 +87,7 @@ static const color_t hls_palette[] = }; /* *INDENT-ON* */ -#ifdef NCURSES_EXT_FUNCS +#if NCURSES_EXT_FUNCS /* * These are called from _nc_do_color(), which in turn is called from * vidattr - so we have to assume that SP may be null. @@ -267,7 +267,7 @@ init_pair(short pair, short f, short b) if ((pair < 0) || (pair >= COLOR_PAIRS)) returnCode(ERR); -#ifdef NCURSES_EXT_FUNCS +#if NCURSES_EXT_FUNCS if (SP->_default_color) { if (f < 0) f = C_MASK; @@ -440,7 +440,7 @@ _nc_do_color(int old_pair, int pair, bool reverse, int (*outc) (int)) pair_content(old_pair, &old_fg, &old_bg); if ((fg == C_MASK && old_fg != C_MASK) || (bg == C_MASK && old_bg != C_MASK)) { -#ifdef NCURSES_EXT_FUNCS +#if NCURSES_EXT_FUNCS /* * A minor optimization - but extension. If "AX" is specified in * the terminal description, treat it as screen's indicator of ECMA @@ -460,7 +460,7 @@ _nc_do_color(int old_pair, int pair, bool reverse, int (*outc) (int)) return; } -#ifdef NCURSES_EXT_FUNCS +#if NCURSES_EXT_FUNCS if (fg == C_MASK) fg = default_fg(); if (bg == C_MASK) @@ -473,7 +473,7 @@ _nc_do_color(int old_pair, int pair, bool reverse, int (*outc) (int)) bg = xx; } - T(("setting colors: pair = %d, fg = %d, bg = %d", pair, fg, bg)); + TR(TRACE_ATTRS, ("setting colors: pair = %d, fg = %d, bg = %d", pair, fg, bg)); if (fg != C_MASK) { set_foreground_color(fg, outc); |