BSD 4_3_Tahoe release

[unix-history] / usr / src / usr.lib / libcurses / curses.h

diff --git a/usr/src/usr.lib/libcurses/curses.h b/usr/src/usr.lib/libcurses/curses.h
index f33cf8f..7b49587 100644 (file)
--- a/usr/src/usr.lib/libcurses/curses.h
+++ b/usr/src/usr.lib/libcurses/curses.h
@@ -1,9 +1,20 @@
 /*
 /*

- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1981 Regents of the University of California.
+ * All rights reserved.

  *
  *

- *     @(#)curses.h    5.1 (Berkeley) 6/7/85
+ * 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.
+ *
+ *     @(#)curses.h    5.4 (Berkeley) 6/30/88

  */
 
 # ifndef WINDOW
  */
 
 # ifndef WINDOW


@@ -97,7 +108,8 @@ int  __void__;
  */
 # define       addch(ch)       VOID(waddch(stdscr, ch))
 # define       getch()         VOID(wgetch(stdscr))
  */
 # define       addch(ch)       VOID(waddch(stdscr, ch))
 # define       getch()         VOID(wgetch(stdscr))

-# define       addstr(str)     VOID(waddstr(stdscr, str))
+# 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       getstr(str)     VOID(wgetstr(stdscr, str))
 # define       move(y, x)      VOID(wmove(stdscr, y, x))
 # define       clear()         VOID(wclear(stdscr))


@@ -118,13 +130,17 @@ int       __void__;
  */
 #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        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        mvwaddstr(win,y,x,str)  VOID(wmove(win,y,x)==ERR?ERR:waddstr(win,str))
+#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 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        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)