ncurses 5.9 - patch 20120903

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

diff --git a/ncurses/base/lib_chgat.c b/ncurses/base/lib_chgat.c
index 7690ae4a2af3b685c488c15b526bb60bc147edcc..cdddaeae995c65fbe3e33c0d018b9e82d3d1e266 100644 (file)
--- a/ncurses/base/lib_chgat.c
+++ b/ncurses/base/lib_chgat.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998 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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -29,6 +29,8 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *

+ *     and: Sven Verdoolaege                        2001                    *
+ *     and: Thomas E. Dickey                        2005                    *

  ****************************************************************************/
 
 /*
  ****************************************************************************/
 
 /*


@@ -40,23 +42,27 @@
 
 #include <curses.priv.h>
 
 
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_chgat.c,v 1.2 1998/02/11 12:14:00 tom Exp $")
+MODULE_ID("$Id: lib_chgat.c,v 1.9 2010/03/31 23:38:02 tom Exp $")

 
 

-int wchgat(WINDOW *win, int n, attr_t attr, short color, const void *opts GCC_UNUSED)
+NCURSES_EXPORT(int)
+wchgat(WINDOW *win, int n, attr_t attr, short color, const void *opts GCC_UNUSED)

 {
 {

-    int        i;
+    int i;

 
 

-    T((T_CALLED("wchgat(%p,%d,%s,%d)"), win, n, _traceattr(attr), color));
+    T((T_CALLED("wchgat(%p,%d,%s,%d)"), (void *) win, n, _traceattr(attr), color));

 
     if (win) {
 
     if (win) {

-      toggle_attr_on(attr,COLOR_PAIR(color));
+       struct ldat *line = &(win->_line[win->_cury]);

 
 

-      for (i = win->_curx; i <= win->_maxx && (n == -1 || (n-- > 0)); i++)
-       win->_line[win->_cury].text[i]
-         = TextOf(win->_line[win->_cury].text[i]) | attr;
+       toggle_attr_on(attr, ColorPair(color));

 
 

-      returnCode(OK);
-    }
-    else
-      returnCode(ERR);
+       for (i = win->_curx; i <= win->_maxx && (n == -1 || (n-- > 0)); i++) {
+           SetAttr(line->text[i], attr);
+           SetPair(line->text[i], color);
+           CHANGED_CELL(line, i);
+       }
+
+       returnCode(OK);
+    } else
+       returnCode(ERR);

 }
 }