--- /usr/include/ncurses.h 2016-03-11 16:29:08.000000000 +0100 +++ /usr/local/include/ncurses/ncurses.h 2016-02-07 00:34:13.000000000 +0100 @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2015,2016 Free Software Foundation, Inc. * + * Copyright (c) 1998-2013,2014 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -32,7 +32,7 @@ * and: Thomas E. Dickey 1996-on * ****************************************************************************/ -/* $Id: curses.h.in,v 1.243 2016/01/23 22:20:31 tom Exp $ */ +/* $Id: curses.h.in,v 1.241 2014/08/09 20:39:44 tom Exp $ */ #ifndef __NCURSES_H #define __NCURSES_H @@ -43,7 +43,7 @@ /* These are defined only in curses.h, and are used for conditional compiles */ #define NCURSES_VERSION_MAJOR 6 #define NCURSES_VERSION_MINOR 0 -#define NCURSES_VERSION_PATCH 20160305 +#define NCURSES_VERSION_PATCH 20150808 /* This is defined in more than one ncurses header, for identification */ #undef NCURSES_VERSION @@ -57,7 +57,7 @@ /* * Definitions to facilitate DLL's. */ -#include +#include #if 1 #include @@ -143,13 +143,6 @@ #define NCURSES_TPARM_ARG intptr_t /* - * Control whether ncurses uses wcwidth() for checking width of line-drawing - * characters. - */ -#undef NCURSES_WCWIDTH_GRAPHICS -#define NCURSES_WCWIDTH_GRAPHICS 1 - -/* * NCURSES_CH_T is used in building the library, but not used otherwise in * this header file, since that would make the normal/wide-character versions * of the header incompatible. @@ -384,8 +377,6 @@ #if 1 #include /* ...to get mbstate_t, etc. */ -#else -typedef int wint_t; #endif #if 0 @@ -409,7 +400,7 @@ wchar_t chars[CCHARW_MAX]; #if 1 #undef NCURSES_EXT_COLORS -#define NCURSES_EXT_COLORS 20160305 +#define NCURSES_EXT_COLORS 20150808 int ext_color; /* color pair, must be more than 16-bits */ #endif } @@ -856,7 +847,7 @@ extern NCURSES_EXPORT(int) wvline (WINDOW *,chtype,int); /* implemented */ /* - * These are also declared in : + * These are also declared in : */ extern NCURSES_EXPORT(int) tigetflag (NCURSES_CONST char *); /* implemented */ extern NCURSES_EXPORT(int) tigetnum (NCURSES_CONST char *); /* implemented */ @@ -897,7 +888,7 @@ */ #if 1 #undef NCURSES_EXT_FUNCS -#define NCURSES_EXT_FUNCS 20160305 +#define NCURSES_EXT_FUNCS 20150808 typedef int (*NCURSES_WINDOW_CB)(WINDOW *, void *); typedef int (*NCURSES_SCREEN_CB)(SCREEN *, void *); extern NCURSES_EXPORT(bool) is_term_resized (int, int); @@ -950,7 +941,7 @@ */ #if 1 #undef NCURSES_SP_FUNCS -#define NCURSES_SP_FUNCS 20160305 +#define NCURSES_SP_FUNCS 20150808 #define NCURSES_SP_NAME(name) name##_sp /* Define the sp-funcs helper function */ @@ -1206,13 +1197,13 @@ #define addchstr(str) waddchstr(stdscr,(str)) #define addnstr(str,n) waddnstr(stdscr,(str),(n)) #define addstr(str) waddnstr(stdscr,(str),-1) +#define attroff(at) wattroff(stdscr,(at)) +#define attron(at) wattron(stdscr,(at)) +#define attrset(at) wattrset(stdscr,(at)) #define attr_get(ap,cp,o) wattr_get(stdscr,(ap),(cp),(o)) #define attr_off(a,o) wattr_off(stdscr,(a),(o)) #define attr_on(a,o) wattr_on(stdscr,(a),(o)) #define attr_set(a,c,o) wattr_set(stdscr,(a),(c),(o)) -#define attroff(at) wattroff(stdscr,(at)) -#define attron(at) wattron(stdscr,(at)) -#define attrset(at) wattrset(stdscr,(at)) #define bkgd(ch) wbkgd(stdscr,(ch)) #define bkgdset(ch) wbkgdset(stdscr,(ch)) #define chgat(n,a,c,o) wchgat(stdscr,(n),(a),(c),(o)) @@ -1255,8 +1246,8 @@ #define mvwaddchstr(win,y,x,str) (wmove((win),(y),(x)) == ERR ? ERR : waddchnstr((win),(str),-1)) #define mvwaddnstr(win,y,x,str,n) (wmove((win),(y),(x)) == ERR ? ERR : waddnstr((win),(str),(n))) #define mvwaddstr(win,y,x,str) (wmove((win),(y),(x)) == ERR ? ERR : waddnstr((win),(str),-1)) -#define mvwchgat(win,y,x,n,a,c,o) (wmove((win),(y),(x)) == ERR ? ERR : wchgat((win),(n),(a),(c),(o))) #define mvwdelch(win,y,x) (wmove((win),(y),(x)) == ERR ? ERR : wdelch(win)) +#define mvwchgat(win,y,x,n,a,c,o) (wmove((win),(y),(x)) == ERR ? ERR : wchgat((win),(n),(a),(c),(o))) #define mvwgetch(win,y,x) (wmove((win),(y),(x)) == ERR ? ERR : wgetch(win)) #define mvwgetnstr(win,y,x,str,n) (wmove((win),(y),(x)) == ERR ? ERR : wgetnstr((win),(str),(n))) #define mvwgetstr(win,y,x,str) (wmove((win),(y),(x)) == ERR ? ERR : wgetstr((win),(str))) @@ -1836,7 +1827,7 @@ #endif #endif /* NCURSES_WIDECHAR */ -/* $Id: curses.tail,v 1.23 2016/02/13 16:37:45 tom Exp $ */ +/* $Id: curses.tail,v 1.21 2011/10/29 20:03:22 tom Exp $ */ /* * vile:cmode: * This file is part of ncurses, designed to be appended after curses.h.in @@ -1949,9 +1940,7 @@ extern NCURSES_EXPORT(int) NCURSES_SP_NAME(mouseinterval) (SCREEN*, int); #endif -#ifndef NCURSES_NOMACROS #define mouse_trafo(y,x,to_screen) wmouse_trafo(stdscr,y,x,to_screen) -#endif /* other non-XSI functions */ @@ -1966,8 +1955,10 @@ /* Debugging : use with libncurses_g.a */ extern NCURSES_EXPORT(void) _tracef (const char *, ...) GCC_PRINTFLIKE(1,2); +extern NCURSES_EXPORT(void) _tracedump (const char *, WINDOW *); extern NCURSES_EXPORT(char *) _traceattr (attr_t); extern NCURSES_EXPORT(char *) _traceattr2 (int, chtype); +extern NCURSES_EXPORT(char *) _nc_tracebits (void); extern NCURSES_EXPORT(char *) _tracechar (int); extern NCURSES_EXPORT(char *) _tracechtype (chtype); extern NCURSES_EXPORT(char *) _tracechtype2 (int, chtype); @@ -1980,6 +1971,7 @@ #define _tracech_t _tracechtype #define _tracech_t2 _tracechtype2 #endif +extern NCURSES_EXPORT(char *) _tracemouse (const MEVENT *); extern NCURSES_EXPORT(void) trace (const unsigned int); /* trace masks */ @@ -2011,7 +2003,7 @@ #define OPTIMIZE_ALL 0xff /* enable all optimizations (dflt) */ #endif -#include +#include #ifdef __cplusplus