ncurses 5.7 - patch 20100717

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

diff --git a/ncurses/base/lib_colorset.c b/ncurses/base/lib_colorset.c
index d9fc5c28dc0112a7d27d59b3b756ae00bb5051b9..6210a0e8a8f9cd9f1514058a97eb9b989ec15fe6 100644 (file)
--- a/ncurses/base/lib_colorset.c
+++ b/ncurses/base/lib_colorset.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998-2005,2009 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 <juergen.pfeifer@gmx.net> 1998                  *
+ *  Author: Juergen Pfeifer,  1998                                          *
+ *     and: Thomas E. Dickey, 2005-on                                       *
  ****************************************************************************/
 
 /*
@@ -40,17 +41,23 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_colorset.c,v 1.5 1999/05/16 17:13:43 juergen Exp $")
+MODULE_ID("$Id: lib_colorset.c,v 1.13 2009/10/24 22:02:14 tom Exp $")
 
-int wcolor_set(WINDOW *win, short color_pair_number, void *opts)
+NCURSES_EXPORT(int)
+wcolor_set(WINDOW *win, short color_pair_number, void *opts)
 {
-       T((T_CALLED("wcolor_set(%p,%d)"), win, color_pair_number));
-       if (win && !opts && (color_pair_number >= 0) && (color_pair_number < COLOR_PAIRS)) {
-               T(("... current %ld", (long) PAIR_NUMBER(win->_attrs)));
-               toggle_attr_on(win->_attrs,COLOR_PAIR(color_pair_number));
-               returnCode(OK);
-       } else
-               returnCode(ERR);
-}
-
+    int code = ERR;
 
+    T((T_CALLED("wcolor_set(%p,%d)"), (void *) win, color_pair_number));
+    if (win
+       && !opts
+       && (SP != 0)
+       && (color_pair_number >= 0)
+       && (color_pair_number < 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);
+       code = OK;
+    }
+    returnCode(code);
+}