386BSD 0.1 development

[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..897660a 100644 (file)
--- a/usr/src/lib/libcurses/addch.c
+++ b/usr/src/lib/libcurses/addch.c
@@ -1,101 +1,49 @@
+/*
+ * Copyright (c) 1981 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)addch.c    5.5 (Berkeley) 6/1/90";
+#endif /* not lint */
+

 # include      "curses.ext"
 
 /*
  *     This routine adds the character to the current position
  *
 # include      "curses.ext"
 
 /*
  *     This routine adds the character to the current position
  *

- * @(#)addch.c 1.5 (Berkeley) %G%

  */
 waddch(win, c)
  */
 waddch(win, c)

-reg WINDOW     *win;
+WINDOW *win;

 char           c;
 {
 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;
-
-               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;
-}
-
-/*
- * set_ch:
- *     Set the first and last change flags for this window.
- */
-static
-set_ch(win, y, x, ch, orig)
-reg WINDOW     *win;
-int            y, x;
-WINDOW         *orig; {
-
-       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;
-       }
+    return waddbytes(win, &c, 1);

 }
 }