diff options
Diffstat (limited to 'ncurses/base/lib_colorset.c')
| -rw-r--r-- | ncurses/base/lib_colorset.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/ncurses/base/lib_colorset.c b/ncurses/base/lib_colorset.c index e935486..387edef 100644 --- a/ncurses/base/lib_colorset.c +++ b/ncurses/base/lib_colorset.c @@ -1,5 +1,6 @@ /**************************************************************************** - * Copyright (c) 1998-2009,2014 Free Software Foundation, Inc. * + * Copyright 2020 Thomas E. Dickey * + * Copyright 1998-2014,2017 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 * @@ -41,22 +42,23 @@ #include <curses.priv.h> #include <ctype.h> -MODULE_ID("$Id: lib_colorset.c,v 1.14 2014/02/01 22:10:42 tom Exp $") +MODULE_ID("$Id: lib_colorset.c,v 1.16 2020/02/02 23:34:34 tom Exp $") NCURSES_EXPORT(int) -wcolor_set(WINDOW *win, NCURSES_PAIRS_T color_pair_number, void *opts) +wcolor_set(WINDOW *win, NCURSES_PAIRS_T pair_arg, void *opts) { int code = ERR; + int color_pair = pair_arg; - T((T_CALLED("wcolor_set(%p,%d)"), (void *) win, (int) color_pair_number)); + T((T_CALLED("wcolor_set(%p,%d)"), (void *) win, color_pair)); + set_extended_pair(opts, color_pair); if (win - && !opts && (SP != 0) - && (color_pair_number >= 0) - && (color_pair_number < SP->_pair_limit)) { + && (color_pair >= 0) + && (color_pair < SP->_pair_limit)) { TR(TRACE_ATTRS, ("... current %ld", (long) GET_WINDOW_PAIR(win))); - SET_WINDOW_PAIR(win, color_pair_number); - if_EXT_COLORS(win->_color = color_pair_number); + SET_WINDOW_PAIR(win, color_pair); + if_EXT_COLORS(win->_color = color_pair); code = OK; } returnCode(code); |