ncurses 5.6

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

diff --git a/ncurses/base/lib_wattron.c b/ncurses/base/lib_wattron.c
index a951c576fa4491babaa74d91589b6546f05485fc..2e17d965e94a95af3b9c11deb1f9b167a35162c8 100644 (file)
--- a/ncurses/base/lib_wattron.c
+++ b/ncurses/base/lib_wattron.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998-2005,2006 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,23 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_wattron.c,v 1.4 1998/05/10 12:02:28 tom Exp $")
+MODULE_ID("$Id: lib_wattron.c,v 1.9 2006/05/27 19:30:46 tom Exp $")
 
-int wattr_on(WINDOW *win, NCURSES_CONST attr_t at, void *opts GCC_UNUSED)
+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);
-               returnCode(OK);
-       } else
-               returnCode(ERR);
+    T((T_CALLED("wattr_on(%p,%s)"), 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 = PAIR_NUMBER(at);
+       });
+       toggle_attr_on(WINDOW_ATTRS(win), at);
+       returnCode(OK);
+    } else
+       returnCode(ERR);
 }