| curses.h | | curses.h | |
| | | | |
| skipping to change at line 45 | | skipping to change at line 45 | |
| /* $Id: curses.h.in,v 1.220 2011/01/22 19:47:20 tom Exp $ */ | | /* $Id: curses.h.in,v 1.220 2011/01/22 19:47:20 tom Exp $ */ | |
| | | | |
| #ifndef __NCURSES_H | | #ifndef __NCURSES_H | |
| #define __NCURSES_H | | #define __NCURSES_H | |
| | | | |
| #define CURSES 1 | | #define CURSES 1 | |
| #define CURSES_H 1 | | #define CURSES_H 1 | |
| | | | |
| /* These are defined only in curses.h, and are used for conditional compile
s */ | | /* These are defined only in curses.h, and are used for conditional compile
s */ | |
| #define NCURSES_VERSION_MAJOR 5 | | #define NCURSES_VERSION_MAJOR 5 | |
|
| #define NCURSES_VERSION_MINOR 8 | | #define NCURSES_VERSION_MINOR 9 | |
| #define NCURSES_VERSION_PATCH 20110226 | | #define NCURSES_VERSION_PATCH 20110404 | |
| | | | |
| /* This is defined in more than one ncurses header, for identification */ | | /* This is defined in more than one ncurses header, for identification */ | |
| #undef NCURSES_VERSION | | #undef NCURSES_VERSION | |
|
| #define NCURSES_VERSION "5.8" | | #define NCURSES_VERSION "5.9" | |
| | | | |
| /* | | /* | |
| * Identify the mouse encoding version. | | * Identify the mouse encoding version. | |
| */ | | */ | |
| #define NCURSES_MOUSE_VERSION 1 | | #define NCURSES_MOUSE_VERSION 1 | |
| | | | |
| /* | | /* | |
| * Definitions to facilitate DLL's. | | * Definitions to facilitate DLL's. | |
| */ | | */ | |
|
| #include <ncurses/ncurses_dll.h> | | #include <ncurses_dll.h> | |
| | | | |
| /* | | /* | |
| * User-definable tweak to disable the include of <stdbool.h>. | | * User-definable tweak to disable the include of <stdbool.h>. | |
| */ | | */ | |
| #ifndef NCURSES_ENABLE_STDBOOL_H | | #ifndef NCURSES_ENABLE_STDBOOL_H | |
| #define NCURSES_ENABLE_STDBOOL_H 1 | | #define NCURSES_ENABLE_STDBOOL_H 1 | |
| #endif | | #endif | |
| | | | |
| /* | | /* | |
| * NCURSES_ATTR_T is used to quiet compiler warnings when building ncurses | | * NCURSES_ATTR_T is used to quiet compiler warnings when building ncurses | |
| | | | |
| skipping to change at line 379 | | skipping to change at line 379 | |
| * (spacing and nonspacing) do not fill the array, a null L'\0' follows. | | * (spacing and nonspacing) do not fill the array, a null L'\0' follows. | |
| * Otherwise, a null is assumed to follow when extracting via getcchar(). | | * Otherwise, a null is assumed to follow when extracting via getcchar(). | |
| */ | | */ | |
| #define CCHARW_MAX 5 | | #define CCHARW_MAX 5 | |
| typedef struct | | typedef struct | |
| { | | { | |
| attr_t attr; | | attr_t attr; | |
| wchar_t chars[CCHARW_MAX]; | | wchar_t chars[CCHARW_MAX]; | |
| #if 0 | | #if 0 | |
| #undef NCURSES_EXT_COLORS | | #undef NCURSES_EXT_COLORS | |
|
| #define NCURSES_EXT_COLORS 20110226 | | #define NCURSES_EXT_COLORS 20110404 | |
| int ext_color; /* color pair, must be more than 16-
bits */ | | int ext_color; /* color pair, must be more than 16-
bits */ | |
| #endif | | #endif | |
| } | | } | |
| cchar_t; | | cchar_t; | |
| | | | |
| #endif /* NCURSES_WIDECHAR */ | | #endif /* NCURSES_WIDECHAR */ | |
| | | | |
| #if !NCURSES_OPAQUE | | #if !NCURSES_OPAQUE | |
| struct ldat; | | struct ldat; | |
| | | | |
| | | | |
| skipping to change at line 825 | | skipping to change at line 825 | |
| extern NCURSES_EXPORT(int) wsetscrreg (WINDOW *,int,int); /* i
mplemented */ | | extern NCURSES_EXPORT(int) wsetscrreg (WINDOW *,int,int); /* i
mplemented */ | |
| extern NCURSES_EXPORT(int) wstandout (WINDOW *); /* g
enerated */ | | extern NCURSES_EXPORT(int) wstandout (WINDOW *); /* g
enerated */ | |
| extern NCURSES_EXPORT(int) wstandend (WINDOW *); /* g
enerated */ | | extern NCURSES_EXPORT(int) wstandend (WINDOW *); /* g
enerated */ | |
| extern NCURSES_EXPORT(void) wsyncdown (WINDOW *); /* i
mplemented */ | | extern NCURSES_EXPORT(void) wsyncdown (WINDOW *); /* i
mplemented */ | |
| extern NCURSES_EXPORT(void) wsyncup (WINDOW *);
/* implemented */ | | extern NCURSES_EXPORT(void) wsyncup (WINDOW *);
/* implemented */ | |
| extern NCURSES_EXPORT(void) wtimeout (WINDOW *,int); /* i
mplemented */ | | extern NCURSES_EXPORT(void) wtimeout (WINDOW *,int); /* i
mplemented */ | |
| extern NCURSES_EXPORT(int) wtouchln (WINDOW *,int,int,int); /* i
mplemented */ | | extern NCURSES_EXPORT(int) wtouchln (WINDOW *,int,int,int); /* i
mplemented */ | |
| extern NCURSES_EXPORT(int) wvline (WINDOW *,chtype,int); /* i
mplemented */ | | extern NCURSES_EXPORT(int) wvline (WINDOW *,chtype,int); /* i
mplemented */ | |
| | | | |
| /* | | /* | |
|
| * These are also declared in <ncurses/term.h>: | | * These are also declared in <term.h>: | |
| */ | | */ | |
| extern NCURSES_EXPORT(int) tigetflag (NCURSES_CONST char *); /* i
mplemented */ | | extern NCURSES_EXPORT(int) tigetflag (NCURSES_CONST char *); /* i
mplemented */ | |
| extern NCURSES_EXPORT(int) tigetnum (NCURSES_CONST char *); /* i
mplemented */ | | extern NCURSES_EXPORT(int) tigetnum (NCURSES_CONST char *); /* i
mplemented */ | |
| extern NCURSES_EXPORT(char *) tigetstr (NCURSES_CONST char *); /* i
mplemented */ | | extern NCURSES_EXPORT(char *) tigetstr (NCURSES_CONST char *); /* i
mplemented */ | |
| extern NCURSES_EXPORT(int) putp (const char *);
/* implemented */ | | extern NCURSES_EXPORT(int) putp (const char *);
/* implemented */ | |
| | | | |
| #if NCURSES_TPARM_VARARGS | | #if NCURSES_TPARM_VARARGS | |
| extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, ...); /* s
pecial */ | | extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, ...); /* s
pecial */ | |
| #else | | #else | |
| extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, long,long,long,l
ong,long,long,long,long,long); /* special */ | | extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, long,long,long,l
ong,long,long,long,long,long); /* special */ | |
| | | | |
| skipping to change at line 866 | | skipping to change at line 866 | |
| */ | | */ | |
| #ifndef NCURSES_WIDECHAR | | #ifndef NCURSES_WIDECHAR | |
| #define vid_attr(a,pair,opts) vidattr(a) | | #define vid_attr(a,pair,opts) vidattr(a) | |
| #endif | | #endif | |
| | | | |
| /* | | /* | |
| * These functions are extensions - not in X/Open Curses. | | * These functions are extensions - not in X/Open Curses. | |
| */ | | */ | |
| #if 1 | | #if 1 | |
| #undef NCURSES_EXT_FUNCS | | #undef NCURSES_EXT_FUNCS | |
|
| #define NCURSES_EXT_FUNCS 20110226 | | #define NCURSES_EXT_FUNCS 20110404 | |
| typedef int (*NCURSES_WINDOW_CB)(WINDOW *, void *); | | typedef int (*NCURSES_WINDOW_CB)(WINDOW *, void *); | |
| typedef int (*NCURSES_SCREEN_CB)(SCREEN *, void *); | | typedef int (*NCURSES_SCREEN_CB)(SCREEN *, void *); | |
| extern NCURSES_EXPORT(bool) is_term_resized (int, int); | | extern NCURSES_EXPORT(bool) is_term_resized (int, int); | |
| extern NCURSES_EXPORT(char *) keybound (int, int); | | extern NCURSES_EXPORT(char *) keybound (int, int); | |
| extern NCURSES_EXPORT(const char *) curses_version (void); | | extern NCURSES_EXPORT(const char *) curses_version (void); | |
| extern NCURSES_EXPORT(int) assume_default_colors (int, int); | | extern NCURSES_EXPORT(int) assume_default_colors (int, int); | |
| extern NCURSES_EXPORT(int) define_key (const char *, int); | | extern NCURSES_EXPORT(int) define_key (const char *, int); | |
| extern NCURSES_EXPORT(int) get_escdelay (void); | | extern NCURSES_EXPORT(int) get_escdelay (void); | |
| extern NCURSES_EXPORT(int) key_defined (const char *); | | extern NCURSES_EXPORT(int) key_defined (const char *); | |
| extern NCURSES_EXPORT(int) keyok (int, bool); | | extern NCURSES_EXPORT(int) keyok (int, bool); | |
| | | | |
| skipping to change at line 918 | | skipping to change at line 918 | |
| #else | | #else | |
| #define curses_version() NCURSES_VERSION | | #define curses_version() NCURSES_VERSION | |
| #endif | | #endif | |
| | | | |
| /* | | /* | |
| * Extra extension-functions, which pass a SCREEN pointer rather than using | | * Extra extension-functions, which pass a SCREEN pointer rather than using | |
| * a global variable SP. | | * a global variable SP. | |
| */ | | */ | |
| #if 0 | | #if 0 | |
| #undef NCURSES_SP_FUNCS | | #undef NCURSES_SP_FUNCS | |
|
| #define NCURSES_SP_FUNCS 20110226 | | #define NCURSES_SP_FUNCS 20110404 | |
| #define NCURSES_SP_NAME(name) name##_sp | | #define NCURSES_SP_NAME(name) name##_sp | |
| | | | |
| /* Define the sp-funcs helper function */ | | /* Define the sp-funcs helper function */ | |
| #define NCURSES_SP_OUTC NCURSES_SP_NAME(NCURSES_OUTC) | | #define NCURSES_SP_OUTC NCURSES_SP_NAME(NCURSES_OUTC) | |
| typedef int (*NCURSES_SP_OUTC)(SCREEN*, int); | | typedef int (*NCURSES_SP_OUTC)(SCREEN*, int); | |
| | | | |
| extern NCURSES_EXPORT(SCREEN *) new_prescr (void); /* implemented:SP_FUNC *
/ | | extern NCURSES_EXPORT(SCREEN *) new_prescr (void); /* implemented:SP_FUNC *
/ | |
| | | | |
| extern NCURSES_EXPORT(int) NCURSES_SP_NAME(baudrate) (SCREEN*); /* implemen
ted:SP_FUNC */ | | extern NCURSES_EXPORT(int) NCURSES_SP_NAME(baudrate) (SCREEN*); /* implemen
ted:SP_FUNC */ | |
| extern NCURSES_EXPORT(int) NCURSES_SP_NAME(beep) (SCREEN*); /* implemented:
SP_FUNC */ | | extern NCURSES_EXPORT(int) NCURSES_SP_NAME(beep) (SCREEN*); /* implemented:
SP_FUNC */ | |
| | | | |
| skipping to change at line 1657 | | skipping to change at line 1657 | |
| | | | |
| #if defined(TRACE) || defined(NCURSES_TEST) | | #if defined(TRACE) || defined(NCURSES_TEST) | |
| extern NCURSES_EXPORT_VAR(int) _nc_optimize_enable; /* enable op
timizations */ | | extern NCURSES_EXPORT_VAR(int) _nc_optimize_enable; /* enable op
timizations */ | |
| extern NCURSES_EXPORT(const char *) _nc_visbuf (const char *); | | extern NCURSES_EXPORT(const char *) _nc_visbuf (const char *); | |
| #define OPTIMIZE_MVCUR 0x01 /* cursor movement optimization */ | | #define OPTIMIZE_MVCUR 0x01 /* cursor movement optimization */ | |
| #define OPTIMIZE_HASHMAP 0x02 /* diff hashing to detect scrolls */ | | #define OPTIMIZE_HASHMAP 0x02 /* diff hashing to detect scrolls */ | |
| #define OPTIMIZE_SCROLL 0x04 /* scroll optimization */ | | #define OPTIMIZE_SCROLL 0x04 /* scroll optimization */ | |
| #define OPTIMIZE_ALL 0xff /* enable all optimizations (dflt) *
/ | | #define OPTIMIZE_ALL 0xff /* enable all optimizations (dflt) *
/ | |
| #endif | | #endif | |
| | | | |
|
| #include <ncurses/unctrl.h> | | #include <unctrl.h> | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| | | | |
| #ifndef NCURSES_NOMACROS | | #ifndef NCURSES_NOMACROS | |
| | | | |
| /* these names conflict with STL */ | | /* these names conflict with STL */ | |
| #undef box | | #undef box | |
| #undef clear | | #undef clear | |
| #undef erase | | #undef erase | |
| #undef move | | #undef move | |
| | | | |
End of changes. 8 change blocks. |
| 9 lines changed or deleted | | 9 lines changed or added | |
|