move entry/exit debugging to 21.1

[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 53bd7a1..f4b7bb6 100644 (file)
--- a/usr/src/lib/libcurses/addch.c
+++ b/usr/src/lib/libcurses/addch.c
@@ -1,101 +1,40 @@
-# include      "curses.ext"
-

 /*
 /*

- *     This routine adds the character to the current position
+ * Copyright (c) 1981, 1993, 1994
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- * @(#)addch.c 1.5 (Berkeley) %G%
+ * %sccs.include.redist.c%

  */
  */

-waddch(win, c)
-reg WINDOW     *win;
-char           c;
-{
-       reg int         x, y;
-       reg WINDOW      *wp;

 
 

-       x = win->_curx;
-       y = win->_cury;
-# ifdef FULLDEBUG
-       fprintf(outf, "ADDCH('%c') at (%d, %d)\n", c, y, x);
-# endif
-       if (y >= win->_maxy || x >= win->_maxx || y < 0 || x < 0)
-               return ERR;
-       switch (c) {
-         case '\t':
-         {
-               reg int         newx;
+#ifndef lint
+static char sccsid[] = "@(#)addch.c    8.2 (Berkeley) %G%";
+#endif /* not lint */

 
 

-               for (newx = x + (8 - (x & 07)); x < newx; x++)
-                       if (waddch(win, ' ') == ERR)
-                               return ERR;
-               return OK;
-         }
-
-         default:
-# ifdef FULLDEBUG
-               fprintf(outf, "ADDCH: 1: y = %d, x = %d, firstch = %d, lastch = %d\n", y, x, win->_firstch[y], win->_lastch[y]);
-# endif
-               if (win->_flags & _STANDOUT)
-                       c |= _STANDOUT;
-               set_ch(win, y, x, c, NULL);
-               for (wp = win->_nextp; wp != win; wp = wp->_nextp)
-                       set_ch(wp, y, x, c, win);
-               win->_y[y][x++] = c;
-               if (x >= win->_maxx) {
-                       x = 0;
-newline:
-                       if (++y >= win->_maxy)
-                               if (win->_scroll) {
-                                       wrefresh(win);
-                                       scroll(win);
-                                       --y;
-                               }
-                               else
-                                       return ERR;
-               }
-# ifdef FULLDEBUG
-               fprintf(outf, "ADDCH: 2: y = %d, x = %d, firstch = %d, lastch = %d\n", y, x, win->_firstch[y], win->_lastch[y]);
-# endif
-               break;
-         case '\n':
-               wclrtoeol(win);
-               if (!NONL)
-                       x = 0;
-               goto newline;
-         case '\r':
-               x = 0;
-               break;
-         case '\b':
-               if (--x < 0)
-                       x = 0;
-               break;
-       }
-       win->_curx = x;
-       win->_cury = y;
-       return OK;
-}
+#include "curses.h"

 
 /*
 
 /*

- * set_ch:
- *     Set the first and last change flags for this window.
+ * waddch --
+ *     Add the character to the current position in the given window.
+ *

  */
  */

-static
-set_ch(win, y, x, ch, orig)
-reg WINDOW     *win;
-int            y, x;
-WINDOW         *orig; {
+int
+waddch(win, ch)
+       WINDOW *win;
+       int ch;
+{
+       __LDATA buf;
+
+       buf.ch = ch;
+       buf.attr = 0;
+       return (__waddch(win, &buf));
+}
+
+int
+__waddch(win, dp)
+       WINDOW *win;
+       __LDATA *dp;
+{
+       char buf[2];

 
 

-       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)
-                       win->_firstch[y] = win->_lastch[y] = x;
-               else if (x < win->_firstch[y])
-                       win->_firstch[y] = x;
-               else if (x > win->_lastch[y])
-                       win->_lastch[y] = x;
-       }
+       buf[0] = dp->ch;
+       return (__waddbytes(win, buf, 1, dp->attr & __STANDOUT));

 }
 }