ncurses 5.7 - patch 20090419

[ncurses.git] / include / curses.wide

diff --git a/include/curses.wide b/include/curses.wide
index 896ecd2654359e12a380e98c7e9083e6ad85cce0..520875e7cebce936ff1a4d4daedc695c4eab1a9c 100644 (file)
--- a/include/curses.wide
+++ b/include/curses.wide
@@ -1,10 +1,12 @@
+/* $Id: curses.wide,v 1.37 2009/04/18 21:34:06 tom Exp $ */

 /*
 /*

+ * vile:cmode:

  * This file is part of ncurses, designed to be appended after curses.h.in
  * (see that file for the relevant copyright).
  */
  * This file is part of ncurses, designed to be appended after curses.h.in
  * (see that file for the relevant copyright).
  */

-#ifdef _XOPEN_SOURCE_EXTENDED
+#define _XOPEN_CURSES 1

 
 

-/* $Id: curses.wide,v 1.32 2006/05/27 19:44:23 tom Exp $ */
+#ifdef _XOPEN_SOURCE_EXTENDED

 
 extern NCURSES_EXPORT_VAR(cchar_t *) _nc_wacs;
 
 
 extern NCURSES_EXPORT_VAR(cchar_t *) _nc_wacs;
 


@@ -165,6 +167,12 @@ extern NCURSES_EXPORT(int) winwstr (WINDOW *, wchar_t *);          /* implemented */
 extern NCURSES_EXPORT(wchar_t*) wunctrl (cchar_t *);                   /* implemented */
 extern NCURSES_EXPORT(int) wvline_set (WINDOW *, const cchar_t *, int);        /* implemented */
 
 extern NCURSES_EXPORT(wchar_t*) wunctrl (cchar_t *);                   /* implemented */
 extern NCURSES_EXPORT(int) wvline_set (WINDOW *, const cchar_t *, int);        /* implemented */
 

+#if NCURSES_SP_FUNCS
+extern NCURSES_EXPORT(attr_t) NCURSES_SP_NAME(term_attrs) (SCREEN*);           /* implemented */
+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(unget_wch) (SCREEN*, const wchar_t);        /* implemented */
+extern NCURSES_EXPORT(wchar_t*) NCURSES_SP_NAME(wunctrl) (SCREEN*, cchar_t *); /* implemented */
+#endif
+

 #ifndef NCURSES_NOMACROS
 
 /*
 #ifndef NCURSES_NOMACROS
 
 /*


@@ -197,10 +205,13 @@ extern NCURSES_EXPORT(int) wvline_set (WINDOW *, const cchar_t *, int);   /* imple
 #define wadd_wchstr(win,str)           wadd_wchnstr(win,str,-1)
 #define waddwstr(win,wstr)             waddnwstr(win,wstr,-1)
 #define wget_wstr(w,t)                 wgetn_wstr(w,t,-1)
 #define wadd_wchstr(win,str)           wadd_wchnstr(win,str,-1)
 #define waddwstr(win,wstr)             waddnwstr(win,wstr,-1)
 #define wget_wstr(w,t)                 wgetn_wstr(w,t,-1)

-#define wgetbkgrnd(win,wch)            (*wch = win->_bkgrnd, OK)

 #define win_wchstr(w,c)                        win_wchnstr(w,c,-1)
 #define wins_wstr(w,t)                 wins_nwstr(w,t,-1)
 
 #define win_wchstr(w,c)                        win_wchnstr(w,c,-1)
 #define wins_wstr(w,t)                 wins_nwstr(w,t,-1)
 

+#if !NCURSES_OPAQUE
+#define wgetbkgrnd(win,wch)            (*wch = win->_bkgrnd, OK)
+#endif
+

 #define mvadd_wch(y,x,c)               mvwadd_wch(stdscr,y,x,c)
 #define mvadd_wchnstr(y,x,s,n)         mvwadd_wchnstr(stdscr,y,x,s,n)
 #define mvadd_wchstr(y,x,s)            mvwadd_wchstr(stdscr,y,x,s)
 #define mvadd_wch(y,x,c)               mvwadd_wch(stdscr,y,x,c)
 #define mvadd_wchnstr(y,x,s,n)         mvwadd_wchnstr(stdscr,y,x,s,n)
 #define mvadd_wchstr(y,x,s)            mvwadd_wchstr(stdscr,y,x,s)