ncurses 5.7 - patch 20100522

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

diff --git a/ncurses/base/lib_wattron.c b/ncurses/base/lib_wattron.c
index 5d1a6a9d22b9de12ebae144afae987bdc1a4933e..3806285e2a387a337370ab4609d37c00af727661 100644 (file)
--- a/ncurses/base/lib_wattron.c
+++ b/ncurses/base/lib_wattron.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998,2000 Free Software Foundation, Inc.                   *
+ * Copyright (c) 1998-2009,2010 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            *
@@ -29,6 +29,7 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
+ *     and: Thomas E. Dickey                        1996-on                 *
  ****************************************************************************/
 
 /*
@@ -41,15 +42,22 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_wattron.c,v 1.7 2002/07/20 17:07:16 tom Exp $")
+MODULE_ID("$Id: lib_wattron.c,v 1.11 2010/03/31 23:38:02 tom Exp $")
 
 NCURSES_EXPORT(int)
 wattr_on(WINDOW *win, attr_t at, void *opts GCC_UNUSED)
 {
-    T((T_CALLED("wattr_on(%p,%s)"), win, _traceattr(at)));
-    if (win) {
-       T(("... current %s", _traceattr(win->_attrs)));
-       toggle_attr_on(win->_attrs, at);
+    T((T_CALLED("wattr_on(%p,%s)"), (void *) win, _traceattr(at)));
+    if (win != 0) {
+       T(("... current %s (%d)",
+          _traceattr(WINDOW_ATTRS(win)),
+          GET_WINDOW_PAIR(win)));
+
+       if_EXT_COLORS({
+           if (at & A_COLOR)
+               win->_color = PairNumber(at);
+       });
+       toggle_attr_on(WINDOW_ATTRS(win), at);
        returnCode(OK);
     } else
        returnCode(ERR);