BSD 4_3_Reno release

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

diff --git a/usr/src/lib/libcurses/delch.c b/usr/src/lib/libcurses/delch.c
index 29d2fe7..727e89f 100644 (file)
--- a/usr/src/lib/libcurses/delch.c
+++ b/usr/src/lib/libcurses/delch.c
@@ -1,26 +1,46 @@
+/*
+ * Copyright (c) 1981 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that: (1) source distributions retain this entire copyright
+ * notice and comment, and (2) distributions including binaries display
+ * the following acknowledgement:  ``This product includes software
+ * developed by the University of California, Berkeley and its contributors''
+ * in the documentation or other materials provided with the distribution
+ * and in all advertising materials mentioning features or use of this
+ * software. 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 ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)delch.c    5.4 (Berkeley) 6/1/90";
+#endif /* not lint */
+

 # include      "curses.ext"
 
 /*
  *     This routine performs an insert-char on the line, leaving
  * (_cury,_curx) unchanged.
  *
 # include      "curses.ext"
 
 /*
  *     This routine performs an insert-char on the line, leaving
  * (_cury,_curx) unchanged.
  *

- * @(#)delch.c 1.1 (Berkeley) %G%

  */
 wdelch(win)
 reg WINDOW     *win; {
 
        reg char        *temp1, *temp2;
        reg char        *end;
  */
 wdelch(win)
 reg WINDOW     *win; {
 
        reg char        *temp1, *temp2;
        reg char        *end;

+       reg int         lch;

 
        end = &win->_y[win->_cury][win->_maxx - 1];
 
        end = &win->_y[win->_cury][win->_maxx - 1];

-       temp2 = &win->_y[win->_cury][win->_curx + 1];
-       temp1 = temp2 - 1;
+       temp1 = &win->_y[win->_cury][win->_curx];
+       temp2 = temp1 + 1;

        while (temp1 < end)
                *temp1++ = *temp2++;
        *temp1 = ' ';
        while (temp1 < end)
                *temp1++ = *temp2++;
        *temp1 = ' ';

-       win->_lastch[win->_cury] = win->_maxx - 1;
-       if (win->_firstch[win->_cury] == _NOCHANGE ||
-           win->_firstch[win->_cury] > win->_curx)
-               win->_firstch[win->_cury] = win->_curx;
+       touchline(win, win->_cury, win->_curx, win->_maxx - 1);

        return OK;
 }
        return OK;
 }