date and time created 88/12/22 13:04:38 by sam

[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..50c5774 100644 (file)
--- a/usr/src/lib/libcurses/getch.c
+++ b/usr/src/lib/libcurses/getch.c
@@ -1,9 +1,29 @@
+/*
+ * Copyright (c) 1981 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not 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 MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)getch.c    5.5 (Berkeley) %G%";
+#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 +32,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 +46,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;
 }