diff options
author | rafan <rafan@FreeBSD.org> | 2008-11-09 14:08:54 +0000 |
---|---|---|
committer | rafan <rafan@FreeBSD.org> | 2008-11-09 14:08:54 +0000 |
commit | d078158b4620b1f1230c46d47fefc1263619ac98 (patch) | |
tree | c963ba08ac935d7f048b78517309fe6fc2f496e6 /include | |
parent | 89e0e9f76c2cac3b5b27564adfbbffdb2afc54a2 (diff) | |
download | FreeBSD-src-d078158b4620b1f1230c46d47fefc1263619ac98.zip FreeBSD-src-d078158b4620b1f1230c46d47fefc1263619ac98.tar.gz |
- Import ncurses 5.7-20081102 (5.7 release) onto vendor branch
Diffstat (limited to 'include')
-rw-r--r-- | include/MKterm.h.awk.in | 10 | ||||
-rw-r--r-- | include/capdefaults.c | 14 | ||||
-rw-r--r-- | include/curses.h.in | 5 | ||||
-rw-r--r-- | include/curses.tail | 14 | ||||
-rw-r--r-- | include/nc_alloc.h | 8 | ||||
-rw-r--r-- | include/nc_panel.h | 11 | ||||
-rw-r--r-- | include/ncurses_defs | 9 | ||||
-rw-r--r-- | include/term_entry.h | 8 |
8 files changed, 47 insertions, 32 deletions
diff --git a/include/MKterm.h.awk.in b/include/MKterm.h.awk.in index 6f0fca3..5fc2052 100644 --- a/include/MKterm.h.awk.in +++ b/include/MKterm.h.awk.in @@ -1,7 +1,7 @@ # vile:awkmode BEGIN { print "/****************************************************************************" - print " * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. *" + print " * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. *" print " * *" print " * Permission is hereby granted, free of charge, to any person obtaining a *" print " * copy of this software and associated documentation files (the *" @@ -34,7 +34,7 @@ BEGIN { print "/* and: Thomas E. Dickey 1995-on */" print "/****************************************************************************/" print "" - print "/* $Id: MKterm.h.awk.in,v 1.49 2007/08/18 11:44:26 tom Exp $ */" + print "/* $Id: MKterm.h.awk.in,v 1.50 2008/05/24 23:13:59 tom Exp $ */" print "" print "/*" print "** term.h -- Definition of struct term" @@ -228,9 +228,8 @@ END { print " char * _termname; /* used for termname() */" print "} TERMINAL;" print "" - print "extern NCURSES_EXPORT_VAR(TERMINAL *) cur_term;" - print "" print "#if @BROKEN_LINKER@ || @cf_cv_enable_reentrant@" + print "NCURSES_WRAPPED_VAR(TERMINAL *, cur_term);" print "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, boolnames);" print "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, boolcodes);" print "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, boolfnames);" @@ -241,6 +240,7 @@ END { print "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, strcodes);" print "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, strfnames);" print "" + print "#define cur_term NCURSES_PUBLIC_VAR(cur_term())" print "#define boolnames NCURSES_PUBLIC_VAR(boolnames())" print "#define boolcodes NCURSES_PUBLIC_VAR(boolcodes())" print "#define boolfnames NCURSES_PUBLIC_VAR(boolfnames())" @@ -253,6 +253,8 @@ END { print "" print "#else" print "" + print "extern NCURSES_EXPORT_VAR(TERMINAL *) cur_term;" + print "" print "extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolnames[];" print "extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolcodes[];" print "extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolfnames[];" diff --git a/include/capdefaults.c b/include/capdefaults.c index 071f9e1..33f2fe8 100644 --- a/include/capdefaults.c +++ b/include/capdefaults.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2000 Free Software Foundation, Inc. * + * Copyright (c) 1998-2000,2008 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 * @@ -29,9 +29,10 @@ /**************************************************************************** * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * * and: Eric S. Raymond <esr@snark.thyrsus.com> * + * and: Thomas E. Dickey 1996-on * ****************************************************************************/ -/* $Id: capdefaults.c,v 1.12 2000/01/02 02:34:56 tom Exp $ */ +/* $Id: capdefaults.c,v 1.13 2008/08/04 12:33:42 tom Exp $ */ /* * Compute obsolete capabilities. The reason this is an include file is @@ -44,9 +45,10 @@ */ { char *sp; - int capval; + short capval; -#define EXTRACT_DELAY(str) (sp = strchr(str, '*'), sp ? atoi(sp+1) : 0) +#define EXTRACT_DELAY(str) \ + (short) (sp = strchr(str, '*'), sp ? atoi(sp+1) : 0) /* current (4.4BSD) capabilities marked obsolete */ if (VALID_STRING(carriage_return) @@ -73,8 +75,8 @@ magic_cookie_glitch_ul = magic_cookie_glitch; /* totally obsolete capabilities */ - linefeed_is_newline = VALID_STRING(newline) - && (strcmp("\n", newline) == 0); + linefeed_is_newline = (char) (VALID_STRING(newline) + && (strcmp("\n", newline) == 0)); if (VALID_STRING(cursor_left) && (capval = EXTRACT_DELAY(cursor_left))) backspace_delay = capval; diff --git a/include/curses.h.in b/include/curses.h.in index deb63e3..53da9a5 100644 --- a/include/curses.h.in +++ b/include/curses.h.in @@ -32,7 +32,7 @@ * and: Thomas E. Dickey 1996-on * ****************************************************************************/ -/* $Id: curses.h.in,v 1.186 2008/04/05 15:30:28 tom Exp $ */ +/* $Id: curses.h.in,v 1.187 2008/08/30 20:11:29 tom Exp $ */ #ifndef __NCURSES_H #define __NCURSES_H @@ -423,7 +423,8 @@ struct _win_st */ #if @NCURSES_EXT_FUNCS@ #ifdef NCURSES_WGETCH_EVENTS -#if !defined(__BEOS__) /* Fix _nc_timed_wait() on BEOS... */ +#if !defined(__BEOS__) || defined(__HAIKU__) + /* Fix _nc_timed_wait() on BEOS... */ # define NCURSES_EVENT_VERSION 1 #endif /* !defined(__BEOS__) */ diff --git a/include/curses.tail b/include/curses.tail index dd38ed4..aef7c37 100644 --- a/include/curses.tail +++ b/include/curses.tail @@ -1,4 +1,4 @@ -/* $Id: curses.tail,v 1.15 2007/03/10 17:51:24 tom Exp $ */ +/* $Id: curses.tail,v 1.16 2008/07/05 20:20:38 tom Exp $ */ /* * vile:cmode: * This file is part of ncurses, designed to be appended after curses.h.in @@ -79,12 +79,12 @@ #define ALL_MOUSE_EVENTS (REPORT_MOUSE_POSITION - 1) /* macros to extract single event-bits from masks */ -#define BUTTON_RELEASE(e, x) ((e) & (001 << (6 * ((x) - 1)))) -#define BUTTON_PRESS(e, x) ((e) & (002 << (6 * ((x) - 1)))) -#define BUTTON_CLICK(e, x) ((e) & (004 << (6 * ((x) - 1)))) -#define BUTTON_DOUBLE_CLICK(e, x) ((e) & (010 << (6 * ((x) - 1)))) -#define BUTTON_TRIPLE_CLICK(e, x) ((e) & (020 << (6 * ((x) - 1)))) -#define BUTTON_RESERVED_EVENT(e, x) ((e) & (040 << (6 * ((x) - 1)))) +#define BUTTON_RELEASE(e, x) ((e) & NCURSES_MOUSE_MASK(x, 001)) +#define BUTTON_PRESS(e, x) ((e) & NCURSES_MOUSE_MASK(x, 002)) +#define BUTTON_CLICK(e, x) ((e) & NCURSES_MOUSE_MASK(x, 004)) +#define BUTTON_DOUBLE_CLICK(e, x) ((e) & NCURSES_MOUSE_MASK(x, 010)) +#define BUTTON_TRIPLE_CLICK(e, x) ((e) & NCURSES_MOUSE_MASK(x, 020)) +#define BUTTON_RESERVED_EVENT(e, x) ((e) & NCURSES_MOUSE_MASK(x, 040)) typedef struct { diff --git a/include/nc_alloc.h b/include/nc_alloc.h index 9b5751d..f521bff 100644 --- a/include/nc_alloc.h +++ b/include/nc_alloc.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc. * + * Copyright (c) 1998-2007,2008 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 * @@ -27,9 +27,9 @@ ****************************************************************************/ /**************************************************************************** - * Author: Thomas E. Dickey <dickey@clark.net> 1996,1997 * + * Author: Thomas E. Dickey 1996-on * ****************************************************************************/ -/* $Id: nc_alloc.h,v 1.15 2007/02/03 18:40:23 tom Exp $ */ +/* $Id: nc_alloc.h,v 1.16 2008/09/27 22:30:33 tom Exp $ */ #ifndef NC_ALLOC_included #define NC_ALLOC_included 1 @@ -39,6 +39,8 @@ extern "C" { #endif #if HAVE_LIBDMALLOC +#include <string.h> +#undef strndup /* workaround for #define in GLIBC 2.7 */ #include <dmalloc.h> /* Gray Watson's library */ #else #undef HAVE_LIBDMALLOC diff --git a/include/nc_panel.h b/include/nc_panel.h index bb1f674..6578577 100644 --- a/include/nc_panel.h +++ b/include/nc_panel.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998,2000 Free Software Foundation, Inc. * + * Copyright (c) 1998-2000,2008 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 * @@ -27,13 +27,13 @@ ****************************************************************************/ /**************************************************************************** - * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * - * and: Eric S. Raymond <esr@snark.thyrsus.com> * + * Author: Juergen Pfeifer 1997 * + * and: Thomas E. Dickey * ****************************************************************************/ /* - * $Id: nc_panel.h,v 1.3 2000/12/10 02:04:35 tom Exp $ + * $Id: nc_panel.h,v 1.5 2008/08/04 18:26:46 tom Exp $ * * nc_panel.h * @@ -54,6 +54,9 @@ struct panelhook { struct panel* top_panel; struct panel* bottom_panel; struct panel* stdscr_pseudo_panel; +#if NO_LEAKS + int (*destroy)(struct panel *); +#endif }; /* Retrieve the panelhook of the current screen */ diff --git a/include/ncurses_defs b/include/ncurses_defs index 924c75e..97a377d 100644 --- a/include/ncurses_defs +++ b/include/ncurses_defs @@ -1,4 +1,4 @@ -# $Id: ncurses_defs,v 1.38 2008/02/10 00:12:03 tom Exp $ +# $Id: ncurses_defs,v 1.40 2008/09/06 15:57:41 tom Exp $ ############################################################################## # Copyright (c) 2000-2007,2008 Free Software Foundation, Inc. # # # @@ -60,8 +60,8 @@ HAVE_GETEGID HAVE_GETEUID HAVE_GETMAXX 1 HAVE_GETNSTR -HAVE_GETPARX 1 HAVE_GETOPT_H +HAVE_GETPARX 1 HAVE_GETTIMEOFDAY HAVE_GETTTYNAM HAVE_GETWIN 1 @@ -88,6 +88,8 @@ HAVE_LONG_FILE_NAMES HAVE_MBLEN HAVE_MBRLEN HAVE_MBRTOWC +HAVE_MBSRTOWCS +HAVE_MBSTOWCS HAVE_MBTOWC HAVE_MENU_H HAVE_MKSTEMP @@ -153,6 +155,8 @@ HAVE_USE_DEFAULT_COLORS HAVE_VFSCANF HAVE_VSNPRINTF HAVE_VSSCANF +HAVE_WCSRTOMBS +HAVE_WCSTOMBS HAVE_WCTOB HAVE_WCTOMB HAVE_WCTYPE_H @@ -199,5 +203,6 @@ USE_SIGWINCH USE_SYMLINKS USE_SYSMOUSE USE_TERMCAP +USE_WEAK_SYMBOLS USE_WIDEC_SUPPORT USE_XMC_SUPPORT diff --git a/include/term_entry.h b/include/term_entry.h index c880c3a..fb87540 100644 --- a/include/term_entry.h +++ b/include/term_entry.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2001,2004 Free Software Foundation, Inc. * + * Copyright (c) 1998-2005,2008 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 * @@ -29,10 +29,10 @@ /**************************************************************************** * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * * and: Eric S. Raymond <esr@snark.thyrsus.com> * - * and: Thomas E. Dickey 1998-2004 * + * and: Thomas E. Dickey 1998-on * ****************************************************************************/ -/* $Id: term_entry.h,v 1.34 2005/07/16 21:15:07 tom Exp $ */ +/* $Id: term_entry.h,v 1.35 2008/08/16 16:16:03 tom Exp $ */ /* * term_entry.h -- interface to entry-manipulation code @@ -52,7 +52,7 @@ extern "C" { typedef struct entry { TERMTYPE tterm; - int nuses; + unsigned nuses; struct { char *name; |