ncurses 5.9 - patch 20140823

[ncurses.git] / include / curses.h.in

diff --git a/include/curses.h.in b/include/curses.h.in
index 15c9f7f24375f1cb7b162602297579346073289a..65eedaa886700940e9ff55da2e56b84085f154ef 100644 (file)
--- a/include/curses.h.in
+++ b/include/curses.h.in
@@ -32,7 +32,7 @@
  *     and: Thomas E. Dickey                        1996-on                 *
  ****************************************************************************/
 
  *     and: Thomas E. Dickey                        1996-on                 *
  ****************************************************************************/
 

-/* $Id: curses.h.in,v 1.237 2014/02/01 22:08:12 tom Exp $ */
+/* $Id: curses.h.in,v 1.241 2014/08/09 20:39:44 tom Exp $ */

 
 #ifndef __NCURSES_H
 #define __NCURSES_H
 
 #ifndef __NCURSES_H
 #define __NCURSES_H


@@ -59,6 +59,10 @@
  */
 #include <ncurses_dll.h>
 
  */
 #include <ncurses_dll.h>
 

+#if @HAVE_STDINT_H@
+#include <stdint.h>
+#endif
+

 /*
  * User-definable tweak to disable the include of <stdbool.h>.
  */
 /*
  * User-definable tweak to disable the include of <stdbool.h>.
  */


@@ -70,12 +74,6 @@
  * NCURSES_ATTR_T is used to quiet compiler warnings when building ncurses
  * configured using --disable-macros.
  */
  * NCURSES_ATTR_T is used to quiet compiler warnings when building ncurses
  * configured using --disable-macros.
  */

-#ifdef NCURSES_NOMACROS
-#ifndef NCURSES_ATTR_T
-#define NCURSES_ATTR_T attr_t
-#endif
-#endif /* NCURSES_NOMACROS */
-

 #ifndef NCURSES_ATTR_T
 #define NCURSES_ATTR_T int
 #endif
 #ifndef NCURSES_ATTR_T
 #define NCURSES_ATTR_T int
 #endif


@@ -156,8 +154,8 @@
 typedef unsigned chtype;
 typedef unsigned mmask_t;
 #else
 typedef unsigned chtype;
 typedef unsigned mmask_t;
 #else

-typedef unsigned @cf_cv_typeof_chtype@ chtype;
-typedef unsigned @cf_cv_typeof_mmask_t@ mmask_t;
+typedef @cf_cv_typeof_chtype@ chtype;
+typedef @cf_cv_typeof_mmask_t@ mmask_t;

 #endif
 
 /*
 #endif
 
 /*


@@ -930,6 +928,7 @@ extern NCURSES_EXPORT(bool) is_pad (const WINDOW *);                /* @GENERATED_EXT_FUNCS@ *
 extern NCURSES_EXPORT(bool) is_scrollok (const WINDOW *);      /* @GENERATED_EXT_FUNCS@ */
 extern NCURSES_EXPORT(bool) is_subwin (const WINDOW *);                /* @GENERATED_EXT_FUNCS@ */
 extern NCURSES_EXPORT(bool) is_syncok (const WINDOW *);                /* @GENERATED_EXT_FUNCS@ */
 extern NCURSES_EXPORT(bool) is_scrollok (const WINDOW *);      /* @GENERATED_EXT_FUNCS@ */
 extern NCURSES_EXPORT(bool) is_subwin (const WINDOW *);                /* @GENERATED_EXT_FUNCS@ */
 extern NCURSES_EXPORT(bool) is_syncok (const WINDOW *);                /* @GENERATED_EXT_FUNCS@ */

+extern NCURSES_EXPORT(int) wgetdelay (const WINDOW *);         /* @GENERATED_EXT_FUNCS@ */

 extern NCURSES_EXPORT(int) wgetscrreg (const WINDOW *, int *, int *); /* @GENERATED_EXT_FUNCS@ */
 
 #else
 extern NCURSES_EXPORT(int) wgetscrreg (const WINDOW *, int *, int *); /* @GENERATED_EXT_FUNCS@ */
 
 #else


@@ -1149,7 +1148,7 @@ extern NCURSES_EXPORT(int) NCURSES_SP_NAME(use_legacy_coding) (SCREEN*, int);     /*
 #if !NCURSES_OPAQUE
 #if NCURSES_WIDECHAR && @NCURSES_EXT_COLORS@
 #define wattrset(win,at)       ((win) \
 #if !NCURSES_OPAQUE
 #if NCURSES_WIDECHAR && @NCURSES_EXT_COLORS@
 #define wattrset(win,at)       ((win) \

-                                 ? ((win)->_color = PAIR_NUMBER(at), \
+                                 ? ((win)->_color = NCURSES_CAST(int, PAIR_NUMBER(at)), \

                                      (win)->_attrs = NCURSES_CAST(attr_t, at), \
                                      OK) \
                                  : ERR)
                                      (win)->_attrs = NCURSES_CAST(attr_t, at), \
                                      OK) \
                                  : ERR)


@@ -1349,6 +1348,7 @@ NCURSES_EXPORT(int) vsscanf(const char *, const char *, va_list);
 #define is_scrollok(win)       ((win) ? (win)->_scroll : FALSE)
 #define is_subwin(win)         ((win) ? ((win)->_flags & _SUBWIN) != 0 : FALSE)
 #define is_syncok(win)         ((win) ? (win)->_sync : FALSE)
 #define is_scrollok(win)       ((win) ? (win)->_scroll : FALSE)
 #define is_subwin(win)         ((win) ? ((win)->_flags & _SUBWIN) != 0 : FALSE)
 #define is_syncok(win)         ((win) ? (win)->_sync : FALSE)

+#define wgetdelay(win)         ((win) ? (win)->_delay : 0)

 #define wgetparent(win)                ((win) ? (win)->_parent : 0)
 #define wgetscrreg(win,t,b)    ((win) ? (*(t) = (win)->_regtop, *(b) = (win)->_regbottom, OK) : ERR)
 #endif
 #define wgetparent(win)                ((win) ? (win)->_parent : 0)
 #define wgetscrreg(win,t,b)    ((win) ? (*(t) = (win)->_regtop, *(b) = (win)->_regbottom, OK) : ERR)
 #endif