X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2Flib_slkcolor.c;h=6681c5b05f8bac2479083aad81cb614e2fbef5e0;hp=01af185b16fd717c9f679961ff13422de789fb03;hb=78e49873c69dc0494bb34c62f897f8b446584a33;hpb=eae581c0044c1c0ef9caa17fc9b9ae6ef4c93cca diff --git a/ncurses/base/lib_slkcolor.c b/ncurses/base/lib_slkcolor.c index 01af185b..6681c5b0 100644 --- a/ncurses/base/lib_slkcolor.c +++ b/ncurses/base/lib_slkcolor.c @@ -38,23 +38,31 @@ */ #include -MODULE_ID("$Id: lib_slkcolor.c,v 1.13 2009/01/25 00:48:07 tom Exp $") +MODULE_ID("$Id: lib_slkcolor.c,v 1.14 2009/02/15 00:33:48 tom Exp $") NCURSES_EXPORT(int) -slk_color(short color_pair_number) +NCURSES_SP_NAME(slk_color) (NCURSES_SP_DCLx short color_pair_number) { int code = ERR; T((T_CALLED("slk_color(%d)"), color_pair_number)); - if (SP != 0 - && SP->_slk != 0 + if (SP_PARM != 0 + && SP_PARM->_slk != 0 && color_pair_number >= 0 - && color_pair_number < SP->_pair_limit) { - TR(TRACE_ATTRS, ("... current is %s", _tracech_t(CHREF(SP->_slk->attr)))); - SetPair(SP->_slk->attr, color_pair_number); - TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP->_slk->attr)))); + && color_pair_number < SP_PARM->_pair_limit) { + TR(TRACE_ATTRS, ("... current is %s", _tracech_t(CHREF(SP_PARM->_slk->attr)))); + SetPair(SP_PARM->_slk->attr, color_pair_number); + TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP_PARM->_slk->attr)))); code = OK; } returnCode(code); } + +#if NCURSES_SP_FUNCS +NCURSES_EXPORT(int) +slk_color(short color_pair_number) +{ + return NCURSES_SP_NAME(slk_color) (CURRENT_SCREEN, color_pair_number); +} +#endif