386BSD 0.1 development

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

diff --git a/usr/src/lib/libcurses/getch.c b/usr/src/lib/libcurses/getch.c
index 04060d1..95b3875 100644 (file)
--- a/usr/src/lib/libcurses/getch.c
+++ b/usr/src/lib/libcurses/getch.c
@@ -1,9 +1,45 @@
+/*
+ * 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[] = "@(#)getch.c    5.6 (Berkeley) 6/1/90";
+#endif /* not lint */
+

 # include      "curses.ext"
 
 /*
  *     This routine reads in a character from the window.
  *
 # include      "curses.ext"
 
 /*
  *     This routine reads in a character from the window.
  *

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

  */
 wgetch(win)
 reg WINDOW     *win; {
  */
 wgetch(win)
 reg WINDOW     *win; {


@@ -12,13 +48,13 @@ reg WINDOW  *win; {
        reg char        inp;
 
        if (!win->_scroll && (win->_flags&_FULLWIN)
        reg char        inp;
 
        if (!win->_scroll && (win->_flags&_FULLWIN)

-           && win->_curx == win->_maxx && win->_cury == win->_maxy)
+           && win->_curx == win->_maxx - 1 && win->_cury == win->_maxy - 1)

                return ERR;
 # ifdef DEBUG
        fprintf(outf, "WGETCH: _echoit = %c, _rawmode = %c\n", _echoit ? 'T' : 'F', _rawmode ? 'T' : 'F');
 # endif
        if (_echoit && !_rawmode) {
                return ERR;
 # ifdef DEBUG
        fprintf(outf, "WGETCH: _echoit = %c, _rawmode = %c\n", _echoit ? 'T' : 'F', _rawmode ? 'T' : 'F');
 # endif
        if (_echoit && !_rawmode) {

-               raw();
+               cbreak();

                weset++;
        }
        inp = getchar();
                weset++;
        }
        inp = getchar();


@@ -26,10 +62,11 @@ reg WINDOW  *win; {
        fprintf(outf,"WGETCH got '%s'\n",unctrl(inp));
 # endif
        if (_echoit) {
        fprintf(outf,"WGETCH got '%s'\n",unctrl(inp));
 # endif
        if (_echoit) {

-               mvwaddch(curscr, win->_cury, win->_curx, inp);
+               mvwaddch(curscr, win->_cury + win->_begy,
+                       win->_curx + win->_begx, inp);

                waddch(win, inp);
        }
        if (weset)
                waddch(win, inp);
        }
        if (weset)

-               noraw();
+               nocbreak();

        return inp;
 }
        return inp;
 }