massive cleanup, welcome to the 90's!

SCCS-vsn: lib/libcurses/curses.c 5.8
SCCS-vsn: lib/libcurses/curses.h 5.10

diff --git a/usr/src/lib/libcurses/curses.c b/usr/src/lib/libcurses/curses.c
index de8d04a..ed0e405 100644 (file)
--- a/usr/src/lib/libcurses/curses.c
+++ b/usr/src/lib/libcurses/curses.c
@@ -9,46 +9,38 @@
 static char sccsid[] = "@(#)curses.c   5.8 (Berkeley) %G%";
 #endif /* not lint */
 
 static char sccsid[] = "@(#)curses.c   5.8 (Berkeley) %G%";
 #endif /* not lint */
 

-/*
- * Define global variables
- *
- */
-# include      "curses.h"
-
-bool   _echoit         = TRUE, /* set if stty indicates ECHO           */
-       _rawmode        = FALSE,/* set if stty indicates RAW mode       */
-       My_term         = FALSE,/* set if user specifies terminal type  */
-       _endwin         = FALSE;/* set if endwin has been called        */
-
-char   ttytype[50],            /* long name of tty                     */
-       *Def_term       = "unknown";    /* default terminal type        */
-
-int    _tty_ch         = 0,    /* file channel which is a tty          */
-       LINES,                  /* number of lines allowed on screen    */
-       COLS,                   /* number of columns allowed on screen  */
-       _res_flg;               /* sgtty flags for reseting later       */
+#include <curses.h>

 
 

-WINDOW *stdscr         = NULL,
-       *curscr         = NULL;
-
-# ifdef DEBUG
-FILE   *outf;                  /* debug output file                    */
-# endif
-
-SGTTY  _tty;                   /* tty modes                            */
-
-bool   AM, BS, CA, DA, DB, EO, HC, HZ, IN, MI, MS, NC, NS, OS, UL, XB, XN,
-       XT, XS, XX;
-char   *AL, *BC, *BT, *CD, *CE, *CL, *CM, *CR, *CS, *DC, *DL, *DM,
-       *DO, *ED, *EI, *K0, *K1, *K2, *K3, *K4, *K5, *K6, *K7, *K8,
-       *K9, *HO, *IC, *IM, *IP, *KD, *KE, *KH, *KL, *KR, *KS, *KU,
-       *LL, *MA, *ND, *NL, *RC, *SC, *SE, *SF, *SO, *SR, *TA, *TE,
-       *TI, *UC, *UE, *UP, *US, *VB, *VS, *VE, *AL_PARM, *DL_PARM,
-       *UP_PARM, *DOWN_PARM, *LEFT_PARM, *RIGHT_PARM;
-char   PC;
+/* Private. */
+int    __echoit = 1;                   /* If stty indicates ECHO. */
+int    __endwin = 0;                   /* If endwin has been called. */
+int    __pfast;
+int    __rawmode = 0;                  /* If stty indicates RAW mode. */

 
 /*
 
 /*

- * From the tty modes...
+ * Public.
+ *
+ * XXX
+ * UPPERCASE isn't used by libcurses, and is left for backward
+ * compatibility only.

  */
  */

-
-bool   GT, NONL, UPPERCASE, normtty, _pfast;
+WINDOW *curscr;                        /* Current screen. */
+WINDOW *stdscr;                        /* Standard screen. */
+int     COLS;                          /* Columns on the screen. */
+int     LINES;                         /* Lines on the screen. */
+int     My_term = 0;                   /* Use Def_term regardless. */
+char   *Def_term = "unknown";          /* Default terminal type. */
+char    GT;                            /* Gtty indicates tabs. */
+char    NONL;                          /* Term can't hack LF doing a CR. */
+char    UPPERCASE;                     /* Terminal is uppercase only. */
+
+char   AM, BS, CA, DA, EO, HC, HZ, IN, MI, MS, NC, NS, OS,
+       PC, UL, XB, XN, XT, XS, XX;
+char   *AL, *BC, *BT, *CD, *CE, *CL, *CM, *CR, *CS, *DC, *DL,
+       *DM, *DO, *ED, *EI, *K0, *K1, *K2, *K3, *K4, *K5, *K6,
+       *K7, *K8, *K9, *HO, *IC, *IM, *IP, *KD, *KE, *KH, *KL,
+       *KR, *KS, *KU, *LL, *MA, *ND, *NL, *RC, *SC, *SE, *SF,
+       *SO, *SR, *TA, *TE, *TI, *UC, *UE, *UP, *US, *VB, *VS,
+       *VE,
+       *AL_PARM, *DL_PARM, *UP_PARM, *DOWN_PARM, *LEFT_PARM,
+       *RIGHT_PARM;

diff --git a/usr/src/lib/libcurses/curses.h b/usr/src/lib/libcurses/curses.h
index 6b3cfaf..7923aeb 100644 (file)
--- a/usr/src/lib/libcurses/curses.h
+++ b/usr/src/lib/libcurses/curses.h
@@ -4,188 +4,255 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)curses.h    5.11 (Berkeley) %G%
+ *     @(#)curses.h    5.10 (Berkeley) %G%

  */
 
  */
 

-#ifndef WINDOW
+#ifndef _CURSES_H_
+#define        _CURSES_H_

 
 

-#include       <stdio.h>
- 
-#define USE_OLD_TTY
-#include       <sys/ioctl.h>
-#undef USE_OLD_TTY
+#include <stdio.h>

 
 

+/*
+ * The following #defines and #includes are present for backward
+ * compatibility only.  They should not be used in future code.
+ *
+ * START BACKWARD COMPATIBILITY ONLY.
+ */
+#ifndef _CURSES_PRIVATE

 #define        bool    char
 #define        reg     register
 
 #define        bool    char
 #define        reg     register
 

+#ifndef TRUE

 #define        TRUE    (1)
 #define        TRUE    (1)

+#endif
+#ifndef FALSE

 #define        FALSE   (0)
 #define        FALSE   (0)

-#define        ERR     (0)
-#define        OK      (1)
-
-#define        _ENDLINE        001
-#define        _FULLWIN        002
-#define        _SCROLLWIN      004
-#define        _FLUSH          010
-#define        _FULLLINE       020
-#define        _IDLINE         040
-#define        _STANDOUT       0200
-#define        _NOCHANGE       -1
+#endif

 
 #define        _puts(s)        tputs(s, 0, _putchar)
 
 #define        _puts(s)        tputs(s, 0, _putchar)

+#define        _putchar(c)     __cputchar(c)

 
 

-typedef        struct sgttyb   SGTTY;
+/* Old-style terminal modes access. */
+#define        baudrate()      (cfgetospeed(origtermio))
+#define        crmode()        cbreak()
+#define        erasechar()     (origtermio.c_cc[VERASE])
+#define        killchar()      (origtermio.c_cc[VKILL])
+#define        nocrmode()      nocbreak()
+#define        ospeed          (cfgetospeed(origtermio))
+#endif /* _CURSES_PRIVATE */

 
 

-/*
- * Capabilities from termcap
+extern int      My_term;               /* Use Def_term regardless. */
+extern char    *Def_term;              /* Default terminal type. */
+
+/* END BACKWARD COMPATIBILITY ONLY. */
+
+/* 7-bit ASCII characters. */
+#define        unctrl(c)               __unctrl[(c) & 0x7f]
+#define        unctrllen(ch)           __unctrllen[(ch) & 0x7f]
+
+typedef struct _win_st {               /* Window structure. */
+       short           _cury, _curx;   /* Current x, y coordinates. */
+       short           _maxy, _maxx;   /* Maximum values for curx, cury. */
+       short           _begy, _begx;   /* Window home. */
+
+#define        _ENDLINE        0x001           /* End of screen. */
+#define        _FLUSH          0x002           /* fflush(stdout) after refresh. */
+#define        _FULLLINE       0x004           /* Line width = terminal width. */
+#define        _FULLWIN        0x008           /* Window is a screen. */
+#define        _IDLINE         0x010           /* Insert/delete sequences. */
+#define        _SCROLLWIN      0x020           /* Last char will scroll window. */
+/* 
+ * XXX
+ * _STANDOUT is the 8th bit, characters themselves are encoded.

  */
  */

+#define        _STANDOUT       0x080           /* Added characters are standout. */
+       unsigned short  _flags;

 
 

-extern bool     AM, BS, CA, DA, DB, EO, HC, HZ, IN, MI, MS, NC, NS, OS, UL,
-               XB, XN, XT, XS, XX;
+       short           scroll;         /* Scrolling offset. */
+       short           _ch_off;        /* x offset for firstch/lastch. */
+       char            _clear;         /* If clear on next refresh. */
+       char            _leave;         /* If cursor left. */
+       char            _scroll;        /* If scrolling permitted. */
+       char            **_y;           /* Line describing the window. */
+
+#define        _NOCHANGE       -1              /* No change since last refresh. */
+       short           *_firstch;      /* First and last changed in line. */
+       short           *_lastch;
+       struct _win_st  *_nextp, *_orig;/* Subwindows list and parent. */
+} WINDOW;
+
+/* Termcap capabilities. */
+extern char    AM, BS, CA, DA, EO, HC, HZ, IN, MI, MS, NC, NS, OS,
+               PC, UL, XB, XN, XT, XS, XX;

 extern char    *AL, *BC, *BT, *CD, *CE, *CL, *CM, *CR, *CS, *DC, *DL,
                *DM, *DO, *ED, *EI, *K0, *K1, *K2, *K3, *K4, *K5, *K6,
                *K7, *K8, *K9, *HO, *IC, *IM, *IP, *KD, *KE, *KH, *KL,
                *KR, *KS, *KU, *LL, *MA, *ND, *NL, *RC, *SC, *SE, *SF,
                *SO, *SR, *TA, *TE, *TI, *UC, *UE, *UP, *US, *VB, *VS,
 extern char    *AL, *BC, *BT, *CD, *CE, *CL, *CM, *CR, *CS, *DC, *DL,
                *DM, *DO, *ED, *EI, *K0, *K1, *K2, *K3, *K4, *K5, *K6,
                *K7, *K8, *K9, *HO, *IC, *IM, *IP, *KD, *KE, *KH, *KL,
                *KR, *KS, *KU, *LL, *MA, *ND, *NL, *RC, *SC, *SE, *SF,
                *SO, *SR, *TA, *TE, *TI, *UC, *UE, *UP, *US, *VB, *VS,

-               *VE, *AL_PARM, *DL_PARM, *UP_PARM, *DOWN_PARM,
-               *LEFT_PARM, *RIGHT_PARM;
-extern char    PC;
+               *VE,
+               *AL_PARM, *DL_PARM, *UP_PARM, *DOWN_PARM, *LEFT_PARM,
+               *RIGHT_PARM;

 
 

-/*
- * From the tty modes...
- */
+/* Curses external declarations. */
+extern WINDOW  *curscr;                /* Current screen. */
+extern WINDOW  *stdscr;                /* Standard screen. */

 
 

-extern bool    GT, NONL, UPPERCASE, normtty, _pfast;
-
-struct _win_st {
-       short           _cury, _curx;
-       short           _maxy, _maxx;
-       short           _begy, _begx;
-       short           _flags;
-       short           _ch_off;
-       bool            _clear;
-       bool            _leave;
-       bool            _scroll;
-       char            **_y;
-       short           *_firstch;
-       short           *_lastch;
-       struct _win_st  *_nextp, *_orig;
-};
+extern struct termios origtermio;      /* Original terminal modes. */

 
 

-#define        WINDOW  struct _win_st
+extern int      COLS;                  /* Columns on the screen. */
+extern int      LINES;                 /* Lines on the screen. */

 
 

-extern bool    My_term, _echoit, _rawmode, _endwin;
+extern char     GT;                    /* Gtty indicates tabs. */
+extern char     NONL;                  /* Term can't hack LF doing a CR. */
+extern char     UPPERCASE;             /* Terminal is uppercase only. */
+extern char    *ttytype;               /* Full name of current terminal. */
+extern char    *__unctrl[0x80];        /* Control strings. */
+extern char     __unctrllen[0x80];     /* Control strings length. */

 
 

-extern char    *Def_term, ttytype[];
+#define        ERR     (0)                     /* Error return. */
+#define        OK      (1)                     /* Success return. */

 
 

-extern int     LINES, COLS, _tty_ch, _res_flg;
+/* Standard screen pseudo functions. */
+#define        addbytes(da, co)        waddbytes(stdscr, da, co)
+#define        addch(ch)               waddch(stdscr, ch)
+#define        addstr(str)             waddbytes(stdscr, str, strlen(str))
+#define        clear()                 wclear(stdscr)
+#define        clrtobot()              wclrtobot(stdscr)
+#define        clrtoeol()              wclrtoeol(stdscr)
+#define        delch()                 wdelch(stdscr)
+#define        deleteln()              wdeleteln(stdscr)
+#define        erase()                 werase(stdscr)
+#define        getch()                 wgetch(stdscr)
+#define        getstr(str)             wgetstr(stdscr, str)
+#define        inch()                  winch(stdscr)
+#define        insch(ch))              winsch(stdscr, ch)
+#define        insertln()              winsertln(stdscr)
+#define        move(y, x)              wmove(stdscr, y, x)
+#define        refresh()               wrefresh(stdscr)
+#define        standend()              wstandend(stdscr)
+#define        standout()              wstandout(stdscr)

 
 

-extern SGTTY   _tty;
+/* Standard screen plus movement pseudo functions. */
+#define        mvaddbytes(y, x, da, co) \
+                               mvwaddbytes(stdscr, y, x, da, co)
+#define        mvaddch(y, x, ch)       mvwaddch(stdscr, y, x, ch)
+#define        mvaddstr(y, x, str)     mvwaddstr(stdscr, y, x, str)
+#define        mvdelch(y, x)           mvwdelch(stdscr, y, x)
+#define        mvgetch(y, x)           mvwgetch(stdscr, y, x)
+#define        mvgetstr(y, x, str)     mvwgetstr(stdscr, y, x, str)
+#define        mvinch(y, x)            mvwinch(stdscr, y, x)
+#define        mvinsch(y, x, c)        mvwinsch(stdscr, y, x, c)
+#define        mvwaddbytes(win, y, x, da, co) \
+                               (wmove(win, y, x) == ERR ? \
+                                   ERR : waddbytes(win, da, co))
+#define        mvwaddch(win, y, x, ch) (wmove(win, y, x) == ERR ? \
+                                   ERR : waddch(win, ch))
+#define        mvwaddstr(win, y, x, str) \
+                               (wmove(win, y, x) == ERR ? \
+                                   ERR : waddbytes(win, str, strlen(str)))
+#define        mvwdelch(win, y, x)     (wmove(win, y, x) == ERR ? ERR : wdelch(win))
+#define        mvwgetch(win, y, x)     (wmove(win, y, x) == ERR ? ERR : wgetch(win))
+#define        mvwgetstr(win, y, x, str) \
+                               (wmove(win, y, x) == ERR ? \
+                                   ERR : wgetstr(win, str))
+#define        mvwinch(win, y, x)      (wmove(win, y, x) == ERR ? ERR : winch(win))
+#define        mvwinsch(win, y, x, c)  (wmove(win, y, x) == ERR ? ERR : winsch(win, c))

 
 

-extern WINDOW  *stdscr, *curscr;
+/* Random psuedo functions. */
+#define        clearok(win, bf)        (win->_clear = (bf))
+#define        flushok(win, bf)        ((bf) ? (win->_flags |= _FLUSH) : \
+                                   (win->_flags &= ~_FLUSH))
+#define        getyx(win, y, x)        (y) = win->_cury, (x) = win->_curx
+#define        leaveok(win, bf)        (win->_leave = (bf))
+#define        scrollok(win, bf)       (win->_scroll = (bf))
+#define        winch(win)              (win->_y[win->_cury][win->_curx] & 0177)

 
 

-/*
- *     Define VOID to stop lint from generating "null effect"
- * comments.
- */
-#ifdef lint
-int    __void__;
-#define        VOID(x) (__void__ = (int) (x))
-#else
-#define        VOID(x) (x)
-#endif
+/* Public function prototypes. */
+void    __cputchar __P((int));
+int     _sprintw __P((WINDOW *, const char *, _BSD_VA_LIST_));
+int     box __P((WINDOW *, int, int));
+int     cbreak __P((void));
+int     delwin __P((WINDOW *));
+int     echo __P((void));
+int     endwin __P((void));
+char   *fullname __P((char *, char *));
+char   *getcap __P((char *));
+int     gettmode __P((void));
+void    idlok __P((WINDOW *, int));
+WINDOW *initscr __P((void));
+char   *longname __P((char *, char *));
+int     mvcur __P((int, int, int, int));
+int     mvprintw __P((int, int, const char *, ...));
+int     mvscanw __P((int, int, const char *, ...));
+int     mvwin __P((WINDOW *, int, int));
+int     mvwprintw __P((WINDOW *, int, int, const char *, ...));
+int     mvwscanw __P((WINDOW *, int, int, const char *, ...));
+WINDOW *newwin __P((int, int, int, int));
+int     nl __P((void));
+int     nocbreak __P((void));
+int     noecho __P((void));
+int     nonl __P((void));
+int     noraw __P((void));
+int     overlay __P((WINDOW *, WINDOW *));
+int     overwrite __P((WINDOW *, WINDOW *));
+int     printw __P((const char *, ...));
+int     raw __P((void));
+int     resetty __P((void));
+int     savetty __P((void));
+int     scanw __P((const char *, ...));
+int     scroll __P((WINDOW *));
+int     setterm __P((char *));
+int     sscans __P((WINDOW *, const char *, _BSD_VA_LIST_));
+WINDOW *subwin __P((WINDOW *, int, int, int, int));
+int     suspendwin __P((void));
+int     touchline __P((WINDOW *, int, int, int));
+int     touchoverlap __P((WINDOW *, WINDOW *));
+int     touchwin __P((WINDOW *));
+void    tstp __P((int));
+int     waddch __P((WINDOW *, int));
+int     waddstr __P((WINDOW *, char *));
+int     wclear __P((WINDOW *));
+int     wclrtobot __P((WINDOW *));
+int     wclrtoeol __P((WINDOW *));
+int     wdelch __P((WINDOW *));
+int     wdeleteln __P((WINDOW *));
+int     werase __P((WINDOW *));
+int     wgetch __P((WINDOW *));
+int     wgetstr __P((WINDOW *, char *));
+int     winsch __P((WINDOW *, int));
+int     winsertln __P((WINDOW *));
+int     wmove __P((WINDOW *, int, int));
+int     wprintw __P((WINDOW *, const char *, ...));
+int     wrefresh __P((WINDOW *));
+int     wscanw __P((WINDOW *, const char *, ...));
+char   *wstandend __P((WINDOW *));
+char   *wstandout __P((WINDOW *));

 
 

-/*
- * psuedo functions for standard screen
- */
-#define        addch(ch)       VOID(waddch(stdscr, ch))
-#define        getch()         VOID(wgetch(stdscr))
-#define        addbytes(da,co) VOID(waddbytes(stdscr, da,co))
-#define        addstr(str)     VOID(waddbytes(stdscr, str, strlen(str)))
-#define        getstr(str)     VOID(wgetstr(stdscr, str))
-#define        move(y, x)      VOID(wmove(stdscr, y, x))
-#define        clear()         VOID(wclear(stdscr))
-#define        erase()         VOID(werase(stdscr))
-#define        clrtobot()      VOID(wclrtobot(stdscr))
-#define        clrtoeol()      VOID(wclrtoeol(stdscr))
-#define        insertln()      VOID(winsertln(stdscr))
-#define        deleteln()      VOID(wdeleteln(stdscr))
-#define        refresh()       VOID(wrefresh(stdscr))
-#define        inch()          VOID(winch(stdscr))
-#define        insch(c)        VOID(winsch(stdscr,c))
-#define        delch()         VOID(wdelch(stdscr))
-#define        standout()      VOID(wstandout(stdscr))
-#define        standend()      VOID(wstandend(stdscr))
+#ifdef _CURSES_PRIVATE
+/* Private function prototypes. */
+void    __id_subwins __P((WINDOW *));
+void    __set_subwin __P((WINDOW *, WINDOW *));
+void    __swflags __P((WINDOW *));
+void    __TRACE __P((const char *, ...));
+int     waddbytes __P((WINDOW *, char *, int));

 
 

-/*
- * mv functions
- */
-#define        mvwaddch(win,y,x,ch)    VOID(wmove(win,y,x)==ERR?ERR:waddch(win,ch))
-#define        mvwgetch(win,y,x)       VOID(wmove(win,y,x)==ERR?ERR:wgetch(win))
-#define        mvwaddbytes(win,y,x,da,co) \
-               VOID(wmove(win,y,x)==ERR?ERR:waddbytes(win,da,co))
-#define        mvwaddstr(win,y,x,str) \
-               VOID(wmove(win,y,x)==ERR?ERR:waddbytes(win,str,strlen(str)))
-#define mvwgetstr(win,y,x,str)  VOID(wmove(win,y,x)==ERR?ERR:wgetstr(win,str))
-#define        mvwinch(win,y,x)        VOID(wmove(win,y,x) == ERR ? ERR : winch(win))
-#define        mvwdelch(win,y,x)       VOID(wmove(win,y,x) == ERR ? ERR : wdelch(win))
-#define        mvwinsch(win,y,x,c)     VOID(wmove(win,y,x) == ERR ? ERR:winsch(win,c))
-#define        mvaddch(y,x,ch)         mvwaddch(stdscr,y,x,ch)
-#define        mvgetch(y,x)            mvwgetch(stdscr,y,x)
-#define        mvaddbytes(y,x,da,co)   mvwaddbytes(stdscr,y,x,da,co)
-#define        mvaddstr(y,x,str)       mvwaddstr(stdscr,y,x,str)
-#define mvgetstr(y,x,str)       mvwgetstr(stdscr,y,x,str)
-#define        mvinch(y,x)             mvwinch(stdscr,y,x)
-#define        mvdelch(y,x)            mvwdelch(stdscr,y,x)
-#define        mvinsch(y,x,c)          mvwinsch(stdscr,y,x,c)
+/* Private #defines. */
+#define        min(a,b)        (a < b ? a : b)
+#define        max(a,b)        (a > b ? a : b)

 
 

-/*
- * psuedo functions
- */
+/* Private externs. */
+extern int      __echoit;
+extern int      __endwin;
+extern int      __pfast;
+extern int      __rawmode;
+#endif

 
 

-#define        clearok(win,bf)  (win->_clear = bf)
-#define        leaveok(win,bf)  (win->_leave = bf)
-#define        scrollok(win,bf) (win->_scroll = bf)
-#define flushok(win,bf)         (bf ? (win->_flags |= _FLUSH):(win->_flags &= ~_FLUSH))
-#define        getyx(win,y,x)   y = win->_cury, x = win->_curx
-#define        winch(win)       (win->_y[win->_cury][win->_curx] & 0177)
-
-#define raw()   (_tty.sg_flags|=RAW, _pfast=_rawmode=TRUE, \
-       ioctl(_tty_ch, TIOCSETP, &_tty))
-#define noraw()         (_tty.sg_flags&=~RAW,_rawmode=FALSE,\
-       _pfast=!(_tty.sg_flags&CRMOD),ioctl(_tty_ch, TIOCSETP, &_tty))
-#define cbreak() (_tty.sg_flags |= CBREAK, _rawmode = TRUE, \
-       ioctl(_tty_ch, TIOCSETP, &_tty))
-#define nocbreak() (_tty.sg_flags &= ~CBREAK,_rawmode=FALSE, \
-       ioctl(_tty_ch, TIOCSETP, &_tty))
-#define crmode() cbreak()      /* backwards compatability */
-#define nocrmode() nocbreak()  /* backwards compatability */
-#define echo()  (_tty.sg_flags |= ECHO, _echoit = TRUE, \
-       ioctl(_tty_ch, TIOCSETP, &_tty))
-#define noecho() (_tty.sg_flags &= ~ECHO, _echoit = FALSE, \
-       ioctl(_tty_ch, TIOCSETP, &_tty))
-#define nl()    (_tty.sg_flags |= CRMOD,_pfast = _rawmode, \
-       ioctl(_tty_ch, TIOCSETP, &_tty))
-#define nonl()  (_tty.sg_flags &= ~CRMOD, _pfast = TRUE, \
-       ioctl(_tty_ch, TIOCSETP, &_tty))
-#define        savetty() ((void) ioctl(_tty_ch, TIOCGETP, &_tty), \
-       _res_flg = _tty.sg_flags)
-#define        resetty() (_tty.sg_flags = _res_flg, \
-       _echoit = ((_res_flg & ECHO) == ECHO), \
-       _rawmode = ((_res_flg & (CBREAK|RAW)) != 0), \
-       _pfast = ((_res_flg & CRMOD) ? _rawmode : TRUE), \
-       (void) ioctl(_tty_ch, TIOCSETP, &_tty))
-
-#define        erasechar()     (_tty.sg_erase)
-#define        killchar()      (_tty.sg_kill)
-#define baudrate()     (_tty.sg_ospeed)
-
-WINDOW *initscr(), *newwin(), *subwin();
-char   *longname(), *getcap();
+/* Termcap functions. */
+int     tgetent __P((char *, char *));
+int     tgetnum __P((char *));
+int     tgetflag __P((char *));
+char   *tgetstr __P((char *, char **));
+char   *tgoto __P((char *, int, int));
+int     tputs __P((char *, int, void (*)(int)));

 
 

-/*
- * Used to be in unctrl.h.
- */
-#define        unctrl(c)       _unctrl[(c) & 0177]
-extern char *_unctrl[];
-#endif
+#endif /* !_CURSES_H_ */