new version from arnold

[unix-history] / usr / src / lib / libcurses / addch.c

diff --git a/usr/src/lib/libcurses/addch.c b/usr/src/lib/libcurses/addch.c
index 27a13f1..c9a3dd7 100644 (file)
--- a/usr/src/lib/libcurses/addch.c
+++ b/usr/src/lib/libcurses/addch.c
@@ -3,7 +3,7 @@
 /*
  *     This routine adds the character to the current position
  *
 /*
  *     This routine adds the character to the current position
  *

- * %G% (Berkeley) @(#)addch.c  1.4
+ * @(#)addch.c 1.6 (Berkeley) %G%

  */
 waddch(win, c)
 reg WINDOW     *win;
  */
 waddch(win, c)
 reg WINDOW     *win;


@@ -36,9 +36,9 @@ char          c;
 # endif
                if (win->_flags & _STANDOUT)
                        c |= _STANDOUT;
 # endif
                if (win->_flags & _STANDOUT)
                        c |= _STANDOUT;

-               set_ch(win, y, x, c);
+               set_ch(win, y, x, c, NULL);

                for (wp = win->_nextp; wp != win; wp = wp->_nextp)
                for (wp = win->_nextp; wp != win; wp = wp->_nextp)

-                       set_ch(wp, y, x, c);
+                       set_ch(wp, y, x, c, win);

                win->_y[y][x++] = c;
                if (x >= win->_maxx) {
                        x = 0;
                win->_y[y][x++] = c;
                if (x >= win->_maxx) {
                        x = 0;


@@ -79,20 +79,23 @@ newline:
  *     Set the first and last change flags for this window.
  */
 static
  *     Set the first and last change flags for this window.
  */
 static

-set_ch(win, y, x, ch)
+set_ch(win, y, x, ch, orig)

 reg WINDOW     *win;
 reg WINDOW     *win;

-int            y, x; {
+int            y, x;
+WINDOW         *orig; {

 
 

-       if (win->_orig != NULL) {
-               y += win->_begy - win->_orig->_begy;
-               x += win->_begx - win->_orig->_begx;
+       if (orig != NULL) {
+               y -= win->_begy - orig->_begy;
+               x -= win->_begx - orig->_begx;

        }
        }

+       if (y < 0 || y >= win->_maxy || x < 0 || x >= win->_maxx)
+               return;

        if (win->_y[y][x] != ch) {
                if (win->_firstch[y] == _NOCHANGE)
        if (win->_y[y][x] != ch) {
                if (win->_firstch[y] == _NOCHANGE)

-                       win->_firstch[y] = win->_lastch[y] = x;
+                       win->_firstch[y] = win->_lastch[y] = x + win->_ch_off;

                else if (x < win->_firstch[y])
                else if (x < win->_firstch[y])

-                       win->_firstch[y] = x;
+                       win->_firstch[y] = x + win->_ch_off;

                else if (x > win->_lastch[y])
                else if (x > win->_lastch[y])

-                       win->_lastch[y] = x;
+                       win->_lastch[y] = x + win->_ch_off;

        }
 }
        }
 }