ncurses 5.6 - patch 20070602

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

diff --git a/ncurses/base/lib_chgat.c b/ncurses/base/lib_chgat.c
index 54e66ed1ffae6743b0d9b4e21f44c080b74da4af..89eefa7e82feb24e643b6320d2cfd5d0abae4d01 100644 (file)
--- a/ncurses/base/lib_chgat.c
+++ b/ncurses/base/lib_chgat.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998,2000,2001 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            *
  *                                                                          *
  * 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,21 +42,25 @@
 
 #include <curses.priv.h>
 
 
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_chgat.c,v 1.5 2001/06/03 00:05:02 skimo Exp $")
+MODULE_ID("$Id: lib_chgat.c,v 1.7 2006/07/15 22:07:11 tom Exp $")

 
 NCURSES_EXPORT(int)
 
 NCURSES_EXPORT(int)

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

 {
     int i;
 
     T((T_CALLED("wchgat(%p,%d,%s,%d)"), win, n, _traceattr(attr), color));
 
     if (win) {
 {
     int i;
 
     T((T_CALLED("wchgat(%p,%d,%s,%d)"), win, n, _traceattr(attr), color));
 
     if (win) {

+       struct ldat *line = &(win->_line[win->_cury]);
+

        toggle_attr_on(attr, COLOR_PAIR(color));
 
        toggle_attr_on(attr, COLOR_PAIR(color));
 

-       for (i = win->_curx; i <= win->_maxx && (n == -1 || (n-- > 0)); i++)
-           SetAttr(win->_line[win->_cury].text[i], attr);
+       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(OK);
     } else