ncurses 5.6 - patch 20080308

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

diff --git a/ncurses/base/lib_colorset.c b/ncurses/base/lib_colorset.c
index cd3f7f6638db68d246b77f5fa4e94232a9f92a4f..a973c5350c8facbe70cd3a71a706d4160e7a182b 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-2003,2005 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                                          *
  ****************************************************************************/
 
 /*
@@ -40,7 +41,7 @@
 #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.11 2005/01/29 21:40:51 tom Exp $")
 
 NCURSES_EXPORT(int)
 wcolor_set(WINDOW *win, short color_pair_number, void *opts)
@@ -50,9 +51,9 @@ wcolor_set(WINDOW *win, short color_pair_number, void *opts)
        && !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);
+       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);
        returnCode(OK);
     } else
        returnCode(ERR);