ncurses 6.0 - patch 20170401

[ncurses.git] / ncurses / base / lib_colorset.c

diff --git a/ncurses/base/lib_colorset.c b/ncurses/base/lib_colorset.c
index cd3f7f6638db68d246b77f5fa4e94232a9f92a4f..f3aef7e3911084abb5e237a819c21fda6ea7483e 100644 (file)
--- a/ncurses/base/lib_colorset.c
+++ b/ncurses/base/lib_colorset.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2002,2003 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2004,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            *
@@ -27,7 +27,8 @@
  ****************************************************************************/
 
 /****************************************************************************
- *  Author: Juergen Pfeifer, 1998                                           *
+ *  Author: Juergen Pfeifer,  1998                                          *
+ *     and: Thomas E. Dickey, 2005-on                                       *
  ****************************************************************************/
 
 /*
@@ -40,20 +41,24 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_colorset.c,v 1.10 2003/12/07 00:15:27 tom Exp $")
+MODULE_ID("$Id: lib_colorset.c,v 1.15 2017/03/16 23:45:30 tom Exp $")
 
 NCURSES_EXPORT(int)
-wcolor_set(WINDOW *win, short color_pair_number, void *opts)
+wcolor_set(WINDOW *win, NCURSES_PAIRS_T pair_arg, void *opts)
 {
-    T((T_CALLED("wcolor_set(%p,%d)"), win, color_pair_number));
+    int code = ERR;
+    int color_pair = pair_arg;
+
+    T((T_CALLED("wcolor_set(%p,%d)"), (void *) win, color_pair));
+    set_extended_pair(opts, color_pair);
     if (win
-       && !opts
-       && (color_pair_number >= 0)
-       && (color_pair_number < COLOR_PAIRS)) {
-       TR(TRACE_ATTRS, ("... current %ld", (long) PAIR_NUMBER(win->_attrs)));
-       win->_attrs &= ALL_BUT_COLOR;
-       win->_attrs |= COLOR_PAIR(color_pair_number);
-       returnCode(OK);
-    } else
-       returnCode(ERR);
+       && (SP != 0)
+       && (color_pair >= 0)
+       && (color_pair < SP->_pair_limit)) {
+       TR(TRACE_ATTRS, ("... current %ld", (long) GET_WINDOW_PAIR(win)));
+       SET_WINDOW_PAIR(win, color_pair);
+       if_EXT_COLORS(win->_color = color_pair);
+       code = OK;
+    }
+    returnCode(code);
 }