diff options
Diffstat (limited to 'progs/progs.priv.h')
| -rw-r--r-- | progs/progs.priv.h | 153 |
1 files changed, 23 insertions, 130 deletions
diff --git a/progs/progs.priv.h b/progs/progs.priv.h index 3dc177d0a866..fea18b8d72c3 100644 --- a/progs/progs.priv.h +++ b/progs/progs.priv.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 2019-2022,2024 Thomas E. Dickey * * Copyright 1998-2015,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -31,7 +31,7 @@ * Author: Thomas E. Dickey 1997-on * ****************************************************************************/ /* - * $Id: progs.priv.h,v 1.52 2020/09/05 19:35:06 tom Exp $ + * $Id: progs.priv.h,v 1.62 2024/04/08 17:28:28 tom Exp $ * * progs.priv.h * @@ -41,28 +41,9 @@ #ifndef PROGS_PRIV_H #define PROGS_PRIV_H 1 -#include <ncurses_cfg.h> +#include <curses.priv.h> -#if USE_RCS_IDS -#define MODULE_ID(id) static const char Ident[] = id; -#else -#define MODULE_ID(id) /*nothing */ -#endif - -#include <stdlib.h> #include <ctype.h> -#include <string.h> -#include <sys/types.h> - -#if HAVE_UNISTD_H -#include <unistd.h> -#endif - -#if HAVE_LIMITS_H -# include <limits.h> -#elif HAVE_SYS_PARAM_H -# include <sys/param.h> -#endif #if HAVE_DIRENT_H # include <dirent.h> @@ -90,21 +71,6 @@ # endif #endif -#if HAVE_INTTYPES_H -# include <inttypes.h> -#else -# if HAVE_STDINT_H -# include <stdint.h> -# endif -#endif - -#include <assert.h> -#include <errno.h> - -#if DECL_ERRNO -extern int errno; -#endif - #if HAVE_GETOPT_H #include <getopt.h> #elif !defined(HAVE_GETOPT_HEADER) @@ -115,27 +81,7 @@ extern char *optarg; extern int optind; #endif /* HAVE_GETOPT_H */ -#undef _NC_WINDOWS -#if (defined(_WIN32) || defined(_WIN64)) -#define _NC_WINDOWS 1 -#endif - -#define NCURSES_INTERNALS 1 -#define NCURSES_OPAQUE 0 - -#include <curses.h> - -#if !(defined(NCURSES_WGETCH_EVENTS) && defined(NEED_KEY_EVENT)) -#undef KEY_EVENT /* reduce compiler-warnings with Visual C++ */ -#endif - -#include <term_entry.h> -#include <nc_termios.h> #include <tic.h> -#include <nc_tparm.h> - -#include <nc_string.h> -#include <nc_alloc.h> #if HAVE_NC_FREEALL #undef ExitProgram @@ -146,77 +92,12 @@ extern int optind; #endif #endif -#define VtoTrace(opt) (unsigned) ((opt > 0) ? opt : (opt == 0)) - /* error-returns for tput */ #define ErrUsage 2 #define ErrTermType 3 #define ErrCapName 4 #define ErrSystem(n) (4 + (n)) -#if defined(__GNUC__) && defined(_FORTIFY_SOURCE) -#define IGNORE_RC(func) errno = (int) func -#else -#define IGNORE_RC(func) (void) func -#endif /* gcc workarounds */ - -/* usually in <unistd.h> */ -#ifndef STDIN_FILENO -#define STDIN_FILENO 0 -#endif - -#ifndef STDOUT_FILENO -#define STDOUT_FILENO 1 -#endif - -#ifndef STDERR_FILENO -#define STDERR_FILENO 2 -#endif - -#ifndef EXIT_SUCCESS -#define EXIT_SUCCESS 0 -#endif - -#ifndef EXIT_FAILURE -#define EXIT_FAILURE 1 -#endif - -#ifndef R_OK -#define R_OK 4 /* Test for readable. */ -#endif - -#ifndef W_OK -#define W_OK 2 /* Test for writable. */ -#endif - -#ifndef X_OK -#define X_OK 1 /* Test for executable. */ -#endif - -#ifndef F_OK -#define F_OK 0 /* Test for existence. */ -#endif - -/* usually in <unistd.h> */ -#ifndef STDOUT_FILENO -#define STDOUT_FILENO 1 -#endif - -#ifndef STDERR_FILENO -#define STDERR_FILENO 2 -#endif - -/* may be in limits.h, included from various places */ -#ifndef PATH_MAX -# if defined(_POSIX_PATH_MAX) -# define PATH_MAX _POSIX_PATH_MAX -# elif defined(MAXPATHLEN) -# define PATH_MAX MAXPATHLEN -# else -# define PATH_MAX 255 /* the Posix minimum pathsize */ -# endif -#endif - /* We use isascii only to guard against use of 7-bit ctype tables in the * isprint test in infocmp. */ @@ -229,16 +110,28 @@ extern int optind; # endif #endif -#define UChar(c) ((unsigned char)(c)) - -#define SIZEOF(v) (sizeof(v)/sizeof(v[0])) - -#define NCURSES_EXT_NUMBERS (NCURSES_EXT_COLORS && HAVE_INIT_EXTENDED_COLOR) +#define VtoTrace(opt) (unsigned) ((opt > 0) ? opt : (opt == 0)) -#if NCURSES_EXT_NUMBERS +/* + * If configured for tracing, the debug- and trace-output are merged together + * in the trace file for "upper" levels of the verbose option. + */ +#ifdef TRACE +#define use_verbosity(level) do { \ + set_trace_level(level); \ + if (_nc_tracing > DEBUG_LEVEL(2)) \ + _nc_tracing |= TRACE_MAXIMUM; \ + else if (_nc_tracing == DEBUG_LEVEL(2)) \ + _nc_tracing |= TRACE_ORDINARY; \ + if (level >= 2) \ + curses_trace(_nc_tracing); \ + } while (0) #else -#define _nc_free_termtype2(t) _nc_free_termtype(t) -#define _nc_read_entry2(n,f,t) _nc_read_entry(n,f,t) +#define use_verbosity(level) do { set_trace_level(level); } while (0) +#endif + +#ifndef CUR +#define CUR ((TERMTYPE *)(cur_term))-> #endif #endif /* PROGS_PRIV_H */ |